diff options
Diffstat (limited to 'WebCore/page/EventHandler.cpp')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index e12d9eb..22c2ecc 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -607,12 +607,12 @@ void EventHandler::updateSelectionForMouseDrag(Node* targetNode, const IntPoint& if (!targetNode) return; + if (!canMouseDragExtendSelect(targetNode)) + return; + RenderObject* targetRenderer = targetNode->renderer(); if (!targetRenderer) return; - - if (!canMouseDragExtendSelect(targetNode)) - return; VisiblePosition targetPosition(targetRenderer->positionForPoint(localPoint)); @@ -1787,8 +1787,6 @@ void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMo // If the target node is a text node, dispatch on the parent node - rdar://4196646 if (result && result->isTextNode()) result = result->parentNode(); - if (result) - result = result->shadowAncestorNode(); } m_nodeUnderMouse = result; #if ENABLE(SVG) @@ -2373,7 +2371,7 @@ void EventHandler::handleKeyboardSelectionMovement(KeyboardEvent* event) if (!event) return; - String key = event->keyIdentifier(); + const String& key = event->keyIdentifier(); bool isShifted = event->getModifierState("Shift"); bool isOptioned = event->getModifierState("Alt"); bool isCommanded = event->getModifierState("Meta"); |