Changeset 73305 in webkit

Timestamp:

Dec 3, 2010 2:36:04 PM (13 years ago)

Author:

bweinstein@apple.com

Message:

WebContextMenuClient::fixMenuReceivedFromOldSafari is no longer needed on Windows
​https://bugs.webkit.org/show_bug.cgi?id=50486

Reviewed by Brady Eidson.

Remove the static fixMenuReceivedFromOldSafari and isPreInspectElementTagSafari methods
from WebContextMenuClient. There were there for when WebKit had the Inspect Element context menu
item, but Safari didn't support it. We don't support that old Safari, so that code can go.

• WebCoreSupport/WebContextMenuClient.cpp:

(WebContextMenuClient::getCustomMenuFromDefaultItems):

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebContextMenuClient.cpp (modified) (2 diffs)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-12-03  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        WebContextMenuClient::fixMenuReceivedFromOldSafari is no longer needed on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=50486
+        
+        Remove the static fixMenuReceivedFromOldSafari and isPreInspectElementTagSafari methods 
+        from WebContextMenuClient. There were there for when WebKit had the Inspect Element context menu
+        item, but Safari didn't support it. We don't support that old Safari, so that code can go.
+
+        * WebCoreSupport/WebContextMenuClient.cpp:
+        (WebContextMenuClient::getCustomMenuFromDefaultItems):
+
 2010-12-02  John Knottenbelt  <jknotten@chromium.org>
 

trunk/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp

@@ -55 +55 @@
 }
 
-static bool isPreInspectElementTagSafari(IWebUIDelegate* uiDelegate)
-{
-    if (!uiDelegate)
-        return false;
-
-    TCHAR modulePath[MAX_PATH];
-    DWORD length = ::GetModuleFileName(0, modulePath, WTF_ARRAY_LENGTH(modulePath));
-    if (!length)
-        return false;
-
-    return String(modulePath, length).endsWith("Safari.exe", false);
-}
-
-static HMENU fixMenuReceivedFromOldSafari(IWebUIDelegate* uiDelegate, ContextMenu* originalMenu, HMENU menuFromClient)
-{
-    ASSERT_ARG(originalMenu, originalMenu);
-    if (!isPreInspectElementTagSafari(uiDelegate))
-        return menuFromClient;
-
-    int count = ::GetMenuItemCount(originalMenu->platformDescription());
-    if (count < 1)
-        return menuFromClient;
-
-    if (::GetMenuItemID(originalMenu->platformDescription(), count - 1) != WebMenuItemTagInspectElement)
-        return menuFromClient;
-
-    count = ::GetMenuItemCount(menuFromClient);
-    if (count < 1)
-        return menuFromClient;
-
-    if (::GetMenuItemID(menuFromClient, count - 1) == WebMenuItemTagInspectElement)
-        return menuFromClient;
-
-    originalMenu->setPlatformDescription(menuFromClient);
-    originalMenu->addInspectElementItem();
-    return originalMenu->platformDescription();
-}
-
 HMENU WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* menu)
 {
@@ -107 +69 @@
     if (FAILED(uiDelegate->contextMenuItemsForElement(m_webView, propertyBag.get(), (OLE_HANDLE)(ULONG64)menu->platformDescription(), (OLE_HANDLE*)&newMenu)))
         return menu->platformDescription();
-    return fixMenuReceivedFromOldSafari(uiDelegate.get(), menu, newMenu);
+    return newMenu;
 }