| Index: third_party/WebKit/Source/core/page/DragController.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/DragController.cpp b/third_party/WebKit/Source/core/page/DragController.cpp
|
| index 14efaeeb587f6631a3b5acdc01ba974d55e4e181..97d8446a861cb71c1d741dae00ae2c32956a47cd 100644
|
| --- a/third_party/WebKit/Source/core/page/DragController.cpp
|
| +++ b/third_party/WebKit/Source/core/page/DragController.cpp
|
| @@ -424,7 +424,7 @@ DragOperation DragController::operationForLoad(DragData* dragData)
|
| ASSERT(dragData);
|
| Document* doc = m_page->deprecatedLocalMainFrame()->documentAtPoint(dragData->clientPosition());
|
|
|
| - if (doc && (m_didInitiateDrag || doc->isPluginDocument() || doc->hasEditableStyle()))
|
| + if (doc && (m_didInitiateDrag || doc->isPluginDocument() || hasEditableStyle(*doc)))
|
| return DragOperationNone;
|
| return dragOperation(dragData);
|
| }
|
| @@ -564,9 +564,9 @@ bool DragController::canProcessDrag(DragData* dragData)
|
|
|
| if (isHTMLPlugInElement(*result.innerNode())) {
|
| HTMLPlugInElement* plugin = toHTMLPlugInElement(result.innerNode());
|
| - if (!plugin->canProcessDrag() && !result.innerNode()->hasEditableStyle())
|
| + if (!plugin->canProcessDrag() && !hasEditableStyle(*result.innerNode()))
|
| return false;
|
| - } else if (!result.innerNode()->hasEditableStyle()) {
|
| + } else if (!hasEditableStyle(*result.innerNode())) {
|
| return false;
|
| }
|
|
|
|
|