Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175119 => 175120)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 15:50:11 UTC (rev 175119)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 15:52:45 UTC (rev 175120)
@@ -1,5 +1,24 @@
2014-10-23 Matthew Hanson <[email protected]>
+ Merge r175061. <rdar://problem/18694470>
+
+ 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-23 Matthew Hanson <[email protected]>
+
Merge r174908. <rdar://problem/18694470>
2014-10-20 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (175119 => 175120)
--- branches/safari-600.3-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-10-23 15:50:11 UTC (rev 175119)
+++ branches/safari-600.3-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-10-23 15:52:45 UTC (rev 175120)
@@ -202,7 +202,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: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (175119 => 175120)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-10-23 15:50:11 UTC (rev 175119)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-10-23 15:52:45 UTC (rev 175120)
@@ -1246,16 +1246,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: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (175119 => 175120)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-10-23 15:50:11 UTC (rev 175119)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-10-23 15:52:45 UTC (rev 175120)
@@ -319,10 +319,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: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (175119 => 175120)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-10-23 15:50:11 UTC (rev 175119)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-10-23 15:52:45 UTC (rev 175120)
@@ -3530,7 +3530,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()];
}
