Title: [183547] trunk/Source
- Revision
- 183547
- Author
- carlo...@webkit.org
- Date
- 2015-04-29 08:49:43 -0700 (Wed, 29 Apr 2015)
Log Message
REGRESSION(r182573): [GTK] The default context menu contains an empty item since r182573
https://bugs.webkit.org/show_bug.cgi?id=144388
Reviewed by Brady Eidson.
Source/WebCore:
There used to be a method in ContextMenuItem to check if share
menu item was supported or not, but since r182573, there's a
method to get the share menu item. If the returned menu item is
null, it's not added to the menu, but we are not returning a null
ContextMenu item even though we don't support share menu item.
* platform/gtk/ContextMenuItemGtk.cpp:
(WebCore::ContextMenuItem::shareMenuItem): Return a null ContextMenuItem.
Source/WebKit2:
Move the WebContextMenuClient::shareMenuItem() implementation to
platform files, since platforms not supporting share menu item
should return a null ContextMenuIem instead.
* WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
(WebKit::WebContextMenuClient::shareMenuItem): Deleted.
* WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp:
(WebKit::WebContextMenuClient::shareMenuItem):
* WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp:
(WebKit::WebContextMenuClient::shareMenuItem):
* WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
(WebKit::WebContextMenuClient::shareMenuItem):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183546 => 183547)
--- trunk/Source/WebCore/ChangeLog 2015-04-29 15:47:25 UTC (rev 183546)
+++ trunk/Source/WebCore/ChangeLog 2015-04-29 15:49:43 UTC (rev 183547)
@@ -1,3 +1,19 @@
+2015-04-29 Carlos Garcia Campos <cgar...@igalia.com>
+
+ REGRESSION(r182573): [GTK] The default context menu contains an empty item since r182573
+ https://bugs.webkit.org/show_bug.cgi?id=144388
+
+ Reviewed by Brady Eidson.
+
+ There used to be a method in ContextMenuItem to check if share
+ menu item was supported or not, but since r182573, there's a
+ method to get the share menu item. If the returned menu item is
+ null, it's not added to the menu, but we are not returning a null
+ ContextMenu item even though we don't support share menu item.
+
+ * platform/gtk/ContextMenuItemGtk.cpp:
+ (WebCore::ContextMenuItem::shareMenuItem): Return a null ContextMenuItem.
+
2015-04-29 Zan Dobersek <zdober...@igalia.com>
Switch to std::function<>, std::bind() in MediaPlayerPrivateAVFoundationObjC
Modified: trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp (183546 => 183547)
--- trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2015-04-29 15:47:25 UTC (rev 183546)
+++ trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2015-04-29 15:49:43 UTC (rev 183547)
@@ -290,7 +290,7 @@
ContextMenuItem ContextMenuItem::shareMenuItem(const URL&, const URL&, Image*, const String&)
{
- return ContextMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
+ return ContextMenuItem();
}
}
Modified: trunk/Source/WebKit2/ChangeLog (183546 => 183547)
--- trunk/Source/WebKit2/ChangeLog 2015-04-29 15:47:25 UTC (rev 183546)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-29 15:49:43 UTC (rev 183547)
@@ -1,5 +1,25 @@
2015-04-29 Carlos Garcia Campos <cgar...@igalia.com>
+ REGRESSION(r182573): [GTK] The default context menu contains an empty item since r182573
+ https://bugs.webkit.org/show_bug.cgi?id=144388
+
+ Reviewed by Brady Eidson.
+
+ Move the WebContextMenuClient::shareMenuItem() implementation to
+ platform files, since platforms not supporting share menu item
+ should return a null ContextMenuIem instead.
+
+ * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+ (WebKit::WebContextMenuClient::shareMenuItem): Deleted.
+ * WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp:
+ (WebKit::WebContextMenuClient::shareMenuItem):
+ * WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp:
+ (WebKit::WebContextMenuClient::shareMenuItem):
+ * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
+ (WebKit::WebContextMenuClient::shareMenuItem):
+
+2015-04-29 Carlos Garcia Campos <cgar...@igalia.com>
+
REGRESSION(r183467): [SOUP] isMainResource is no longer passed as resource load parameters to the network process
https://bugs.webkit.org/show_bug.cgi?id=144381
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp (183546 => 183547)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2015-04-29 15:47:25 UTC (rev 183546)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2015-04-29 15:49:43 UTC (rev 183547)
@@ -74,11 +74,6 @@
ASSERT_NOT_REACHED();
}
-ContextMenuItem WebContextMenuClient::shareMenuItem(const HitTestResult&)
-{
- return ContextMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
-}
-
#if !PLATFORM(COCOA)
void WebContextMenuClient::searchWithGoogle(const Frame* frame)
{
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp (183546 => 183547)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp 2015-04-29 15:47:25 UTC (rev 183546)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp 2015-04-29 15:49:43 UTC (rev 183547)
@@ -56,5 +56,10 @@
notImplemented();
}
+ContextMenuItem WebContextMenuClient::shareMenuItem(const HitTestResult&)
+{
+ return ContextMenuItem();
+}
+
} // namespace WebKit
#endif // ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp (183546 => 183547)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp 2015-04-29 15:47:25 UTC (rev 183546)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp 2015-04-29 15:49:43 UTC (rev 183547)
@@ -56,5 +56,10 @@
notImplemented();
}
+ContextMenuItem WebContextMenuClient::shareMenuItem(const HitTestResult&)
+{
+ return ContextMenuItem();
+}
+
} // namespace WebKit
#endif // ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm (183546 => 183547)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm 2015-04-29 15:47:25 UTC (rev 183546)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm 2015-04-29 15:49:43 UTC (rev 183547)
@@ -94,6 +94,11 @@
m_page->send(Messages::WebPageProxy::SearchWithSpotlight(selectedString));
}
+ContextMenuItem WebContextMenuClient::shareMenuItem(const HitTestResult&)
+{
+ return ContextMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
+}
+
} // namespace WebKit
#endif // ENABLE(CONTEXT_MENUS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
