Title: [111967] releases/WebKitGTK/webkit-1.8/Source/WebCore
Revision
111967
Author
[email protected]
Date
2012-03-23 19:13:24 -0700 (Fri, 23 Mar 2012)

Log Message

Merging r111400

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (111966 => 111967)


--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-03-24 02:12:38 UTC (rev 111966)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-03-24 02:13:24 UTC (rev 111967)
@@ -1,3 +1,15 @@
+2012-03-23  Konrad Piascik  <[email protected]>
+
+        (r110063) m_mouseDownMayStartDrag is used without being behind the ENABLE(DRAG_SUPPORT) macro
+        https://bugs.webkit.org/show_bug.cgi?id=81666
+
+        Reviewed by Rob Buis.
+
+        Compiled with feature disabled and built.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::selectCursor):
+
 2012-03-23  Adam Barth  <[email protected]>
 
         Remove support for "magic" iframe

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/page/EventHandler.cpp (111966 => 111967)


--- releases/WebKitGTK/webkit-1.8/Source/WebCore/page/EventHandler.cpp	2012-03-24 02:12:38 UTC (rev 111966)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/page/EventHandler.cpp	2012-03-24 02:13:24 UTC (rev 111967)
@@ -1260,7 +1260,11 @@
 
     // During selection, use an I-beam no matter what we're over.
     // If a drag may be starting or we're capturing mouse events for a particular node, don't treat this as a selection.
-    if (m_mousePressed && m_mouseDownMayStartSelect && !m_mouseDownMayStartDrag && m_frame->selection()->isCaretOrRange() && !m_capturingMouseEventsNode)
+    if (m_mousePressed && m_mouseDownMayStartSelect
+#if ENABLE(DRAG_SUPPORT)
+        && !m_mouseDownMayStartDrag
+#endif
+        && m_frame->selection()->isCaretOrRange() && !m_capturingMouseEventsNode)
         return iBeam;
 
     if (renderer) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to