Changeset 19810 in webkit

Timestamp:

Feb 22, 2007 3:49:13 PM (17 years ago)

Author:

bdakin

Message:

WebCore:

Reviewed by Adam. Manual test added.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=12399 REGRESSION:
Unable to prevent default context menu from appearing. <rdar://
problem/5017416>

This problem appeared because of two facets of the current context
menu design. First, all context menu events are now considered to
be "swallowed" since we take care of building up the regular
context menu through the defaultEventHandler(). Second, the context
menu controller holds onto it's context menu until a new one is
created. There would be logistical problems changing this since
AppKit relies on the menu being around for as long as it is
visible on the screen and we don't get any notification once the
menu is popped-down.

This patch fixes the problem by giving WebKit a way to clear the
controller's context menu. WebKit now clears the menu before it
propagates a new context menu event through the DOM.

• WebCore.exp:
• manual-tests/DOMContextMenuEvent.html: Added.
• page/ContextMenuController.cpp: (WebCore::ContextMenuController::clearContextMenu):
• page/ContextMenuController.h:

WebKit:

Reviewed by Adam.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=12399 REGRESSION:
Unable to prevent default context menu from appearing. <rdar://
problem/5017416>

• WebView/WebHTMLView.mm: (-[WebHTMLView menuForEvent:]): Clear the controller's context menu before propagating a new context menu event through the DOM.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp (modified) (1 diff)
• WebCore/manual-tests/DOMContextMenuEvent.html (added)
• WebCore/page/ContextMenuController.cpp (modified) (1 diff)
• WebCore/page/ContextMenuController.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebView/WebHTMLView.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-22  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Adam. Manual test added.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=12399 REGRESSION: 
+        Unable to prevent default context menu from appearing. <rdar://
+        problem/5017416>
+
+        This problem appeared because of two facets of the current context 
+        menu design. First, all context menu events are now considered to 
+        be "swallowed" since we take care of building up the regular 
+        context menu through the defaultEventHandler(). Second, the context 
+        menu controller holds onto it's context menu until a new one is 
+        created. There would be logistical problems changing this since 
+        AppKit relies on the menu being around for as long as it is
+        visible on the screen and we don't get any notification once the 
+        menu is popped-down.
+
+        This patch fixes the problem by giving WebKit a way to clear the 
+        controller's context menu. WebKit now clears the menu before it 
+        propagates a new context menu event through the DOM.
+
+        * WebCore.exp:
+        * manual-tests/DOMContextMenuEvent.html: Added.
+        * page/ContextMenuController.cpp:
+        (WebCore::ContextMenuController::clearContextMenu):
+        * page/ContextMenuController.h:
+
 2007-02-22  John Sullivan  <sullivan@apple.com>
 

trunk/WebCore/WebCore.exp

@@ -306 +306 @@
 __ZN7WebCore19TextResourceDecoderC1ERKNS_6StringERKNS_12TextEncodingE
 __ZN7WebCore19TextResourceDecoderD1Ev
+__ZN7WebCore21ContextMenuController16clearContextMenuEv
 __ZN7WebCore21PlatformKeyboardEventC1EP7NSEventb
 __ZN7WebCore21findEventWithKeyStateEPNS_5EventE

trunk/WebCore/page/ContextMenuController.cpp

@@ -70 +70 @@
 }
 
+void ContextMenuController::clearContextMenu()
+{
+    m_contextMenu.set(0);
+}
+
 void ContextMenuController::handleContextMenuEvent(Event* event)
 {

trunk/WebCore/page/ContextMenuController.h

@@ -49 +49 @@
 
         ContextMenu* contextMenu() const { return m_contextMenu.get(); }
+        void clearContextMenu();
 
         void handleContextMenuEvent(Event*);

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-02-22  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Adam.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=12399 REGRESSION: 
+        Unable to prevent default context menu from appearing. <rdar://
+        problem/5017416>
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView menuForEvent:]): Clear the controller's context menu 
+        before propagating a new context menu event through the DOM.
+
 2007-02-22  John Sullivan  <sullivan@apple.com>
 

trunk/WebKit/WebView/WebHTMLView.mm

@@ -2628 +2628 @@
     }
 
+    Page* page = coreFrame->page();
+    if (!page)
+        return nil;
+
+    page->contextMenuController()->clearContextMenu();
     handledEvent = coreFrame->eventHandler()->sendContextMenuEvent(PlatformMouseEvent(event));
     _private->handlingMouseDownEvent = NO;
 
     if (!handledEvent)
-        return nil;
-
-    Page* page = coreFrame->page();
-    if (!page)
         return nil;