Changeset 72618 in webkit

Timestamp:

Nov 23, 2010 11:33:57 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-23 Avi Drissman <​avi@google.com>

Reviewed by Antonio Gomes.

Add preference to not select when right-clicked
​https://bugs.webkit.org/show_bug.cgi?id=23351

• editing/selection/context-menu-text-selection-expected.txt: Added.
• editing/selection/context-menu-text-selection.html: Added.

2010-11-23 Avi Drissman <​avi@google.com>

Reviewed by Antonio Gomes.

Add preference to not select when right-clicked
​https://bugs.webkit.org/show_bug.cgi?id=23351

Test: editing/selection/context-menu-text-selection.html

• editing/EditingBehavior.h: (WebCore::EditingBehavior::shouldSelectOnContextualMenuClick):
• page/EventHandler.cpp: (WebCore::EventHandler::sendContextMenuEvent):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/context-menu-text-selection-expected.txt (added)
• LayoutTests/editing/selection/context-menu-text-selection.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/EditingBehavior.h (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-23  Avi Drissman  <avi@google.com>
+
+        Reviewed by Antonio Gomes.
+
+        Add preference to not select when right-clicked
+        https://bugs.webkit.org/show_bug.cgi?id=23351
+
+        * editing/selection/context-menu-text-selection-expected.txt: Added.
+        * editing/selection/context-menu-text-selection.html: Added.
+
 2010-11-23  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-23  Avi Drissman  <avi@google.com>
+
+        Reviewed by Antonio Gomes.
+
+        Add preference to not select when right-clicked
+        https://bugs.webkit.org/show_bug.cgi?id=23351
+
+        Test: editing/selection/context-menu-text-selection.html
+
+        * editing/EditingBehavior.h:
+        (WebCore::EditingBehavior::shouldSelectOnContextualMenuClick):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::sendContextMenuEvent):
+
 2010-11-23  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/editing/EditingBehavior.h

@@ -58 +58 @@
     bool shouldAlwaysGrowSelectionWhenExtendingToBoundary() const { return m_type == EditingMacBehavior; }
 
+    // On Mac, when processing a contextual click, the object being clicked upon should be selected.
+    bool shouldSelectOnContextualMenuClick() const { return m_type == EditingMacBehavior; }
+
 private:
     EditingBehaviorType m_type;

trunk/WebCore/page/EventHandler.cpp

@@ -2008 +2008 @@
     MouseEventWithHitTestResults mev = doc->prepareMouseEvent(request, viewportPos, event);
 
-    // Context menu events shouldn't select text in GTK+ applications or in Chromium.
-    // FIXME: This should probably be configurable by embedders. Consider making it a WebPreferences setting.
-    // See: https://bugs.webkit.org/show_bug.cgi?id=15279
-#if !PLATFORM(GTK) && !PLATFORM(CHROMIUM)
-    if (!m_frame->selection()->contains(viewportPos)
+    if (m_frame->editor()->behavior().shouldSelectOnContextualMenuClick()
+        && !m_frame->selection()->contains(viewportPos)
         // FIXME: In the editable case, word selection sometimes selects content that isn't underneath the mouse.
         // If the selection is non-editable, we do word selection to make it easier to use the contextual menu items
@@ -2020 +2017 @@
         selectClosestWordOrLinkFromMouseEvent(mev);
     }
-#endif
 
     swallowEvent = dispatchMouseEvent(eventNames().contextmenuEvent, mev.targetNode(), true, 0, event, false);