Changeset 79843 in webkit

Timestamp:

Feb 27, 2011 11:28:49 PM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-02-27 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Darin Fisher.

Pass frame history state in the context menu parameters.
​https://bugs.webkit.org/show_bug.cgi?id=55232

• public/WebContextMenuData.h:
• src/ContextMenuClientImpl.cpp: (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebContextMenuData.h (modified) (2 diffs)
• src/ContextMenuClientImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-02-27  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Pass frame history state in the context menu parameters.
+        https://bugs.webkit.org/show_bug.cgi?id=55232
+
+        * public/WebContextMenuData.h:
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+
 2011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebContextMenuData.h

@@ -32 +32 @@
 #define WebContextMenuData_h
 
+#include "WebHistoryItem.h"
 #include "WebMenuItemInfo.h"
 #include "WebNode.h"
@@ -78 +79 @@
     // The encoding for the frame in context.
     WebString frameEncoding;
+
+    // History state of the subframe in context.
+    WebHistoryItem frameHistoryItem;
 
     enum MediaFlags {

trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp

@@ -42 +42 @@
 #include "FrameLoader.h"
 #include "FrameView.h"
+#include "HistoryItem.h"
 #include "HitTestResult.h"
 #include "HTMLMediaElement.h"
@@ -241 +242 @@
     // Send the frame and page URLs in any case.
     data.pageURL = urlFromFrame(m_webView->mainFrameImpl()->frame());
-    if (selectedFrame != m_webView->mainFrameImpl()->frame())
+    if (selectedFrame != m_webView->mainFrameImpl()->frame()) {
         data.frameURL = urlFromFrame(selectedFrame);
+        RefPtr<HistoryItem> historyItem = selectedFrame->loader()->history()->currentItem();
+        if (historyItem)
+            data.frameHistoryItem = WebHistoryItem(historyItem);
+    }
 
     if (r.isSelected())