Changeset 72622 in webkit

Timestamp:

Nov 23, 2010 12:50:02 PM (13 years ago)

Author:

jparent@chromium.org

Message:

2010-11-23 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r72618.
​http://trac.webkit.org/changeset/72618
​https://bugs.webkit.org/show_bug.cgi?id=49987

"Newly added test is failing on Chromium-linux, patch author
said to rollout" (Requested by jparent on #webkit).

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

2010-11-23 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r72618.
​http://trac.webkit.org/changeset/72618
​https://bugs.webkit.org/show_bug.cgi?id=49987

"Newly added test is failing on Chromium-linux, patch author
said to rollout" (Requested by jparent on #webkit).

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/context-menu-text-selection-expected.txt (deleted)
• LayoutTests/editing/selection/context-menu-text-selection.html (deleted)
• 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  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r72618.
+        http://trac.webkit.org/changeset/72618
+        https://bugs.webkit.org/show_bug.cgi?id=49987
+
+        "Newly added test is failing on Chromium-linux, patch author
+        said to rollout" (Requested by jparent on #webkit).
+
+        * editing/selection/context-menu-text-selection-expected.txt: Removed.
+        * editing/selection/context-menu-text-selection.html: Removed.
+
 2010-11-23  Julie Parent  <jparent@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-23  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r72618.
+        http://trac.webkit.org/changeset/72618
+        https://bugs.webkit.org/show_bug.cgi?id=49987
+
+        "Newly added test is failing on Chromium-linux, patch author
+        said to rollout" (Requested by jparent on #webkit).
+
+        * editing/EditingBehavior.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::sendContextMenuEvent):
+
 2010-11-23  Avi Drissman  <avi@google.com>
 

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);
 
-    if (m_frame->editor()->behavior().shouldSelectOnContextualMenuClick()
-        && !m_frame->selection()->contains(viewportPos)
+    // 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)
         // 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
@@ -2017 +2020 @@
         selectClosestWordOrLinkFromMouseEvent(mev);
     }
+#endif
 
     swallowEvent = dispatchMouseEvent(eventNames().contextmenuEvent, mev.targetNode(), true, 0, event, false);