(r110063) m_mouseDownMayStartDrag is used without being behind the ENABLE(DRAG_SUPPOR...

https://bugs.webkit.org/show_bug.cgi?id=81666

Patch by Konrad Piascik <kpiascik@rim.com> on 2012-03-20
Reviewed by Rob Buis.

Compiled with feature disabled and built.

* page/EventHandler.cpp:
(WebCore::EventHandler::selectCursor):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111400 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 595eb9d2b195a883724b4d1794c22e8a8a258c4e..5c76684e32b256261aded547f269f967e23740aa 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-20  Konrad Piascik  <kpiascik@rim.com>
+
+        (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-20  W. James MacLean  <wjmaclean@chromium.org>
 
         [chromium] Tune fling physics curve. [Not for review yet]

diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index 30e9b5e880199e3fd7b5c980b218c5b07616a932..aba8624f0cb9a5674e1c401d95db5c949a4e4a42 100644 (file)
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -1295,7 +1295,11 @@ OptionalCursor EventHandler::selectCursor(const MouseEventWithHitTestResults& ev
 
     // 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) {