| Index: third_party/WebKit/Source/core/editing/SelectionController.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/SelectionController.cpp b/third_party/WebKit/Source/core/editing/SelectionController.cpp
|
| index 75736a6e7713c34ce2d3b098d4fe5694386a7ac6..b9e9be1662646a62751fc309e3afdbb7cb70a81f 100644
|
| --- a/third_party/WebKit/Source/core/editing/SelectionController.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/SelectionController.cpp
|
| @@ -821,9 +821,17 @@ bool isLinkSelection(const MouseEventWithHitTestResults& event) {
|
| }
|
|
|
| bool isExtendingSelection(const MouseEventWithHitTestResults& event) {
|
| + bool isDraggable = false;
|
| + Node* innerNode = event.innerNode();
|
| + if (LayoutObject* layoutObject = innerNode->layoutObject()) {
|
| + const ComputedStyle& style = layoutObject->styleRef();
|
| + if (style.userDrag() == DRAG_ELEMENT)
|
| + isDraggable = true;
|
| + }
|
| +
|
| bool isMouseDownOnLinkOrImage =
|
| event.isOverLink() || event.hitTestResult().image();
|
| - return event.event().shiftKey() && !isMouseDownOnLinkOrImage;
|
| + return event.event().shiftKey() && !isMouseDownOnLinkOrImage && !isDraggable;
|
| }
|
|
|
| } // namespace blink
|
|
|