<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175300] branches/safari-600.3-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175300">175300</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-28 21:11:14 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174525">r174525</a>. <rdar://problem/18640876></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKitmacChangeLog">branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebPreferencesmm">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebPreferencesPrivateh">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebViewmm">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari6003branchToolsChangeLog">branches/safari-600.3-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6003branchToolsMiniBrowsermacWK1BrowserWindowControllerm">branches/safari-600.3-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175299 => 175300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog        2014-10-29 04:04:19 UTC (rev 175299)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog        2014-10-29 04:11:14 UTC (rev 175300)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-10-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174525. <rdar://problem/18640876>
+
+ 2014-10-09 Tim Horton <timothy_horton@apple.com>
+
+ Add a WebKit1 preference for selection services
+ https://bugs.webkit.org/show_bug.cgi?id=137498
+ <rdar://problem/18572699>
+
+ Reviewed by Simon Fraser.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences serviceControlsEnabled]):
+ (-[WebPreferences setServiceControlsEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+ Add and plumb the preference.
+
+2014-10-28 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r174231. <rdar://problem/18640833>
</span><span class="cx">
</span><span class="cx"> 2014-10-02 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (175299 => 175300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h        2014-10-29 04:04:19 UTC (rev 175299)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h        2014-10-29 04:11:14 UTC (rev 175300)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx"> #define WebKitShouldConvertPositionStyleOnCopyPreferenceKey @"WebKitShouldConvertPositionStyleOnCopy"
</span><span class="cx"> #define WebKitImageControlsEnabledPreferenceKey @"WebKitImageControlsEnabled"
</span><span class="cx"> #define WebKitGamepadsEnabledPreferenceKey @"WebKitGamepadsEnabled"
</span><ins>+#define WebKitServiceControlsEnabledPreferenceKey @"WebKitServiceControlsEnabled"
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> // These are private both because callers should be using the cover methods and because the
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferences.mm (175299 => 175300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferences.mm        2014-10-29 04:04:19 UTC (rev 175299)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferences.mm        2014-10-29 04:11:14 UTC (rev 175300)
</span><span class="lines">@@ -588,6 +588,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitImageControlsEnabledPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:NO], WebKitServiceControlsEnabledPreferenceKey,
</ins><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitEnableInheritURIQueryComponentPreferenceKey,
</span><span class="cx"> nil];
</span><span class="lines">@@ -2512,6 +2513,16 @@
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitImageControlsEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)serviceControlsEnabled
+{
+ return [self _boolValueForKey:WebKitServiceControlsEnabledPreferenceKey];
+}
+
+- (void)setServiceControlsEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitServiceControlsEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)gamepadsEnabled
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitGamepadsEnabledPreferenceKey];
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (175299 => 175300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h        2014-10-29 04:04:19 UTC (rev 175299)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h        2014-10-29 04:11:14 UTC (rev 175300)
</span><span class="lines">@@ -432,6 +432,9 @@
</span><span class="cx"> - (void)setImageControlsEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)imageControlsEnabled;
</span><span class="cx">
</span><ins>+- (void)setServiceControlsEnabled:(BOOL)flag;
+- (BOOL)serviceControlsEnabled;
+
</ins><span class="cx"> - (void)setGamepadsEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)gamepadsEnabled;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm (175299 => 175300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm        2014-10-29 04:04:19 UTC (rev 175299)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm        2014-10-29 04:11:14 UTC (rev 175300)
</span><span class="lines">@@ -2362,6 +2362,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> settings.setImageControlsEnabled([preferences imageControlsEnabled]);
</span><ins>+ settings.setServiceControlsEnabled([preferences serviceControlsEnabled]);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span></span></pre></div>
<a id="branchessafari6003branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Tools/ChangeLog (175299 => 175300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Tools/ChangeLog        2014-10-29 04:04:19 UTC (rev 175299)
+++ branches/safari-600.3-branch/Tools/ChangeLog        2014-10-29 04:11:14 UTC (rev 175300)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-28 Dana Burkart <dburkart@apple.com>
+
+ Merge r174525. <rdar://problem/18640876>
+
+ 2014-10-09 Tim Horton <timothy_horton@apple.com>
+
+ Add a WebKit1 preference for selection services
+ https://bugs.webkit.org/show_bug.cgi?id=137498
+ <rdar://problem/18572699>
+
+ Reviewed by Simon Fraser.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController awakeFromNib]):
+ Turn on image and selection services in the Legacy WebKit MiniBrowser.
+
</ins><span class="cx"> 2014-08-26 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172982. <rdar://problem/18141695>
</span></span></pre></div>
<a id="branchessafari6003branchToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (175299 => 175300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m        2014-10-29 04:04:19 UTC (rev 175299)
+++ branches/safari-600.3-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m        2014-10-29 04:11:14 UTC (rev 175300)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx"> [_webView setResourceLoadDelegate:self];
</span><span class="cx"> [_webView setPolicyDelegate:self];
</span><span class="cx">
</span><ins>+ [[WebPreferences standardPreferences] setImageControlsEnabled:YES];
+ [[WebPreferences standardPreferences] setServiceControlsEnabled:YES];
+
</ins><span class="cx"> [containerView addSubview:_webView];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>