Skip to content
Permalink
Browse files
(r110063) m_mouseDownMayStartDrag is used without being behind the EN…
…ABLE(DRAG_SUPPORT) macro

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):

Canonical link: https://commits.webkit.org/98922@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111400 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Konrad Piascik authored and webkit-commit-queue committed Mar 20, 2012
1 parent 3161122 commit 28093e9ab804890b45485b9d20d6f5b3eea5615f
Showing with 17 additions and 1 deletion.
  1. +12 −0 Source/WebCore/ChangeLog
  2. +5 −1 Source/WebCore/page/EventHandler.cpp
@@ -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]
@@ -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) {

0 comments on commit 28093e9

Please sign in to comment.