Changeset 55353 in webkit

Timestamp:

Feb 27, 2010 4:39:27 AM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/7696607> Links do not respect -webkit-user-drag: none
​https://bugs.webkit.org/show_bug.cgi?id=35475

Reviewed by Maciej Stachowiak.

WebCore:

Test: fast/css/user-drag-none.html

• page/DragController.cpp:

(WebCore::DragController::mayStartDragAtEventLocation): Added a node
parameter. The image drag check is done against the node, rather than
than against the hit test result. This prevents a non-draggable image
with an auto-draggable ancestor from being dragged alone. The link drag
check now ignores links that are -webkit-user-drag: none.

• page/DragController.h:
• page/EventHandler.cpp:

(WebCore::EventHandler::shouldDragAutoNode): Pass the current node
to mayStartDragAtEventLocation().

LayoutTests:

• fast/css/user-drag-none-expected.txt: Added.
• fast/css/user-drag-none.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/user-drag-none-expected.txt (added)
• LayoutTests/fast/css/user-drag-none.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DragController.cpp (modified) (4 diffs)
• WebCore/page/DragController.h (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-02-27  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/7696607> Links do not respect -webkit-user-drag: none
+        https://bugs.webkit.org/show_bug.cgi?id=35475
+
+        * fast/css/user-drag-none-expected.txt: Added.
+        * fast/css/user-drag-none.html: Added.
+
 2010-02-27  Xan Lopez  <xlopez@igalia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-27  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/7696607> Links do not respect -webkit-user-drag: none
+        https://bugs.webkit.org/show_bug.cgi?id=35475
+
+        Test: fast/css/user-drag-none.html
+
+        * page/DragController.cpp:
+        (WebCore::DragController::mayStartDragAtEventLocation): Added a node
+        parameter. The image drag check is done against the node, rather than
+        than against the hit test result. This prevents a non-draggable image
+        with an auto-draggable ancestor from being dragged alone. The link drag
+        check now ignores links that are -webkit-user-drag: none.
+        * page/DragController.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::shouldDragAutoNode): Pass the current node
+        to mayStartDragAtEventLocation().
+
 2010-02-27  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/page/DragController.cpp

@@ -513 +513 @@
 }
 
-bool DragController::mayStartDragAtEventLocation(const Frame* frame, const IntPoint& framePos)
+bool DragController::mayStartDragAtEventLocation(const Frame* frame, const IntPoint& framePos, Node* node)
 {
     ASSERT(frame);
@@ -524 +524 @@
 
     mouseDownTarget = frame->eventHandler()->hitTestResultAtPoint(framePos, true);
+    if (node)
+        mouseDownTarget.setInnerNonSharedNode(node);
 
     if (mouseDownTarget.image()
@@ -533 +535 @@
     if (!mouseDownTarget.absoluteLinkURL().isEmpty()
         && m_dragSourceAction & DragSourceActionLink
-        && mouseDownTarget.isLiveLink())
+        && mouseDownTarget.isLiveLink()
+        && mouseDownTarget.URLElement()->renderer() && mouseDownTarget.URLElement()->renderer()->style()->userDrag() != DRAG_NONE)
         return true;
 
@@ -541 +544 @@
 
     return false;
-
 }
 

trunk/WebCore/page/DragController.h

@@ -78 +78 @@
         DragSourceAction delegateDragSourceAction(const IntPoint& pagePoint);
         
-        bool mayStartDragAtEventLocation(const Frame*, const IntPoint& framePos);
+        bool mayStartDragAtEventLocation(const Frame*, const IntPoint& framePos, Node*);
         void dragEnded();
         

trunk/WebCore/page/EventHandler.cpp

@@ -2218 +2218 @@
         return false;
     Page* page = m_frame->page();
-    return page && page->dragController()->mayStartDragAtEventLocation(m_frame, point);
+    return page && page->dragController()->mayStartDragAtEventLocation(m_frame, point, node);
 }