Title: [174525] trunk
- Revision
- 174525
- Author
- [email protected]
- Date
- 2014-10-09 13:56:16 -0700 (Thu, 09 Oct 2014)
Log Message
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.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController awakeFromNib]):
Turn on image and selection services in the Legacy WebKit MiniBrowser.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (174524 => 174525)
--- trunk/Source/WebKit/mac/ChangeLog 2014-10-09 20:53:02 UTC (rev 174524)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-10-09 20:56:16 UTC (rev 174525)
@@ -1,3 +1,21 @@
+2014-10-09 Tim Horton <[email protected]>
+
+ 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-09 Myles C. Maxfield <[email protected]>
Remove second-to-last client of WebFontCache
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (174524 => 174525)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-10-09 20:53:02 UTC (rev 174524)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-10-09 20:56:16 UTC (rev 174525)
@@ -146,6 +146,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: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (174524 => 174525)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-10-09 20:53:02 UTC (rev 174524)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-10-09 20:56:16 UTC (rev 174525)
@@ -577,6 +577,7 @@
#endif
#if ENABLE(SERVICE_CONTROLS)
[NSNumber numberWithBool:NO], WebKitImageControlsEnabledPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitServiceControlsEnabledPreferenceKey,
#endif
[NSNumber numberWithBool:NO], WebKitEnableInheritURIQueryComponentPreferenceKey,
nil];
@@ -2434,6 +2435,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: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (174524 => 174525)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-10-09 20:53:02 UTC (rev 174524)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-10-09 20:56:16 UTC (rev 174525)
@@ -416,6 +416,9 @@
- (void)setImageControlsEnabled:(BOOL)flag;
- (BOOL)imageControlsEnabled;
+- (void)setServiceControlsEnabled:(BOOL)flag;
+- (BOOL)serviceControlsEnabled;
+
- (void)setGamepadsEnabled:(BOOL)flag;
- (BOOL)gamepadsEnabled;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (174524 => 174525)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-10-09 20:53:02 UTC (rev 174524)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-10-09 20:56:16 UTC (rev 174525)
@@ -2345,6 +2345,7 @@
#if ENABLE(SERVICE_CONTROLS)
settings.setImageControlsEnabled([preferences imageControlsEnabled]);
+ settings.setServiceControlsEnabled([preferences serviceControlsEnabled]);
#endif
#if ENABLE(VIDEO_TRACK)
Modified: trunk/Tools/ChangeLog (174524 => 174525)
--- trunk/Tools/ChangeLog 2014-10-09 20:53:02 UTC (rev 174524)
+++ trunk/Tools/ChangeLog 2014-10-09 20:56:16 UTC (rev 174525)
@@ -1,3 +1,15 @@
+2014-10-09 Tim Horton <[email protected]>
+
+ 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-10-09 Adrien Destugues <[email protected]>
Get the patch scripts running on Haiku
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (174524 => 174525)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-10-09 20:53:02 UTC (rev 174524)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-10-09 20:56:16 UTC (rev 174525)
@@ -50,6 +50,8 @@
[[WebPreferences standardPreferences] setFullScreenEnabled:YES];
[[WebPreferences standardPreferences] setDeveloperExtrasEnabled:YES];
+ [[WebPreferences standardPreferences] setImageControlsEnabled:YES];
+ [[WebPreferences standardPreferences] setServiceControlsEnabled:YES];
[self didChangeSettings];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
