Modified: trunk/Source/WebKit2/ChangeLog (175060 => 175061)
--- trunk/Source/WebKit2/ChangeLog 2014-10-22 19:12:47 UTC (rev 175060)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-22 19:13:30 UTC (rev 175061)
@@ -1,3 +1,18 @@
+2014-10-22 Beth Dakin <[email protected]>
+
+ Remove action menu web preference
+ https://bugs.webkit.org/show_bug.cgi?id=137975
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetActionMenuSupportEnabled): Deleted.
+ (WKPreferencesGetActionMenuSupportEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:context:configuration:webView:]):
+
2014-10-22 Chris Dumez <[email protected]>
[Mac][WK2] Fix applicationIsSafari() detection
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (175060 => 175061)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-10-22 19:12:47 UTC (rev 175060)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-10-22 19:13:30 UTC (rev 175061)
@@ -195,7 +195,6 @@
macro(ShouldConvertPositionStyleOnCopy, shouldConvertPositionStyleOnCopy, Bool, bool, false) \
macro(Standalone, standalone, Bool, bool, false) \
macro(TelephoneNumberParsingEnabled, telephoneNumberParsingEnabled, Bool, bool, false) \
- macro(ActionMenuSupportEnabled, actionMenuSupportEnabled, Bool, bool, false) \
macro(AlwaysUseBaselineOfPrimaryFont, alwaysUseBaselineOfPrimaryFont, Bool, bool, false) \
macro(AllowMultiElementImplicitSubmission, allowMultiElementImplicitSubmission, Bool, bool, false) \
macro(AlwaysUseAcceleratedOverflowScroll, alwaysUseAcceleratedOverflowScroll, Bool, bool, false) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (175060 => 175061)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-10-22 19:12:47 UTC (rev 175060)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-10-22 19:13:30 UTC (rev 175061)
@@ -1236,16 +1236,6 @@
return toImpl(preferencesRef)->telephoneNumberParsingEnabled();
}
-void WKPreferencesSetActionMenuSupportEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
- toImpl(preferencesRef)->setActionMenuSupportEnabled(enabled);
-}
-
-bool WKPreferencesGetActionMenuSupportEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->actionMenuSupportEnabled();
-}
-
void WKPreferencesSetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef, bool enabled)
{
toImpl(preferencesRef)->setEnableInheritURIQueryComponent(enabled);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (175060 => 175061)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-10-22 19:12:47 UTC (rev 175060)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-10-22 19:13:30 UTC (rev 175061)
@@ -315,10 +315,6 @@
WK_EXPORT bool WKPreferencesGetTelephoneNumberParsingEnabled(WKPreferencesRef preferencesRef);
// Default to false.
-WK_EXPORT void WKPreferencesSetActionMenuSupportEnabled(WKPreferencesRef, bool);
-WK_EXPORT bool WKPreferencesGetActionMenuSupportEnabled(WKPreferencesRef);
-
-// Default to false.
WK_EXPORT void WKPreferencesSetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef, bool enabled);
WK_EXPORT bool WKPreferencesGetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef);
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (175060 => 175061)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-10-22 19:12:47 UTC (rev 175060)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-10-22 19:13:30 UTC (rev 175061)
@@ -3537,7 +3537,7 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:NSApp];
- if (_data->_page->preferences().actionMenuSupportEnabled() && [self respondsToSelector:@selector(setActionMenu:)]) {
+ if ([self respondsToSelector:@selector(setActionMenu:)]) {
RetainPtr<NSMenu> actionMenu = adoptNS([[NSMenu alloc] init]);
[self setActionMenu:actionMenu.get()];
}
