Title: [111400] trunk/Source/WebCore
- Revision
- 111400
- Author
- [email protected]
- Date
- 2012-03-20 09:17:57 -0700 (Tue, 20 Mar 2012)
Log Message
(r110063) m_mouseDownMayStartDrag is used without being behind the ENABLE(DRAG_SUPPORT) macro
https://bugs.webkit.org/show_bug.cgi?id=81666
Patch by Konrad Piascik <[email protected]> on 2012-03-20
Reviewed by Rob Buis.
Compiled with feature disabled and built.
* page/EventHandler.cpp:
(WebCore::EventHandler::selectCursor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111399 => 111400)
--- trunk/Source/WebCore/ChangeLog 2012-03-20 15:38:40 UTC (rev 111399)
+++ trunk/Source/WebCore/ChangeLog 2012-03-20 16:17:57 UTC (rev 111400)
@@ -1,3 +1,15 @@
+2012-03-20 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-20 W. James MacLean <[email protected]>
[chromium] Tune fling physics curve. [Not for review yet]
Modified: trunk/Source/WebCore/page/EventHandler.cpp (111399 => 111400)
--- trunk/Source/WebCore/page/EventHandler.cpp 2012-03-20 15:38:40 UTC (rev 111399)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2012-03-20 16:17:57 UTC (rev 111400)
@@ -1295,7 +1295,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
