Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175299 => 175300)
--- 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)
@@ -1,5 +1,27 @@
2014-10-28 Dana Burkart <dburk...@apple.com>
+ Merge r174525. <rdar://problem/18640876>
+
+ 2014-10-09 Tim Horton <timothy_hor...@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 <dburk...@apple.com>
+
Merge r174231. <rdar://problem/18640833>
2014-10-02 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (175299 => 175300)
--- 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)
@@ -147,6 +147,7 @@
#define WebKitShouldConvertPositionStyleOnCopyPreferenceKey @"WebKitShouldConvertPositionStyleOnCopy"
#define WebKitImageControlsEnabledPreferenceKey @"WebKitImageControlsEnabled"
#define WebKitGamepadsEnabledPreferenceKey @"WebKitGamepadsEnabled"
+#define WebKitServiceControlsEnabledPreferenceKey @"WebKitServiceControlsEnabled"
#if !TARGET_OS_IPHONE
// These are private both because callers should be using the cover methods and because the
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferences.mm (175299 => 175300)
--- 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)
@@ -588,6 +588,7 @@
#endif
#if ENABLE(SERVICE_CONTROLS)
[NSNumber numberWithBool:NO], WebKitImageControlsEnabledPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitServiceControlsEnabledPreferenceKey,
#endif
[NSNumber numberWithBool:NO], WebKitEnableInheritURIQueryComponentPreferenceKey,
nil];
@@ -2512,6 +2513,16 @@
[self _setBoolValue:enabled forKey:WebKitImageControlsEnabledPreferenceKey];
}
+- (BOOL)serviceControlsEnabled
+{
+ return [self _boolValueForKey:WebKitServiceControlsEnabledPreferenceKey];
+}
+
+- (void)setServiceControlsEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitServiceControlsEnabledPreferenceKey];
+}
+
- (BOOL)gamepadsEnabled
{
return [self _boolValueForKey:WebKitGamepadsEnabledPreferenceKey];
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (175299 => 175300)
--- 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)
@@ -432,6 +432,9 @@
- (void)setImageControlsEnabled:(BOOL)flag;
- (BOOL)imageControlsEnabled;
+- (void)setServiceControlsEnabled:(BOOL)flag;
+- (BOOL)serviceControlsEnabled;
+
- (void)setGamepadsEnabled:(BOOL)flag;
- (BOOL)gamepadsEnabled;
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm (175299 => 175300)
--- 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)
@@ -2362,6 +2362,7 @@
#if ENABLE(SERVICE_CONTROLS)
settings.setImageControlsEnabled([preferences imageControlsEnabled]);
+ settings.setServiceControlsEnabled([preferences serviceControlsEnabled]);
#endif
#if ENABLE(VIDEO_TRACK)
Modified: branches/safari-600.3-branch/Tools/ChangeLog (175299 => 175300)
--- 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)
@@ -1,3 +1,19 @@
+2014-10-28 Dana Burkart <dburk...@apple.com>
+
+ Merge r174525. <rdar://problem/18640876>
+
+ 2014-10-09 Tim Horton <timothy_hor...@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.
+
2014-08-26 Dana Burkart <dburk...@apple.com>
Merge r172982. <rdar://problem/18141695>
Modified: branches/safari-600.3-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (175299 => 175300)
--- 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)
@@ -48,6 +48,9 @@
[_webView setResourceLoadDelegate:self];
[_webView setPolicyDelegate:self];
+ [[WebPreferences standardPreferences] setImageControlsEnabled:YES];
+ [[WebPreferences standardPreferences] setServiceControlsEnabled:YES];
+
[containerView addSubview:_webView];
}
