Chromium Code Reviews| Index: Source/core/page/EventHandler.cpp |
| diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp |
| index f32a579c0cb86dbe09e7a2250c02e1d1e726b4f3..c8dd5592b7cb40519de63e06a0ff65e7650655e2 100644 |
| --- a/Source/core/page/EventHandler.cpp |
| +++ b/Source/core/page/EventHandler.cpp |
| @@ -1714,7 +1714,7 @@ bool EventHandler::handlePasteGlobalSelection(const PlatformMouseEvent& mouseEve |
| if (!m_frame->page()) |
| return false; |
| - LocalFrame* focusFrame = m_frame->page()->focusController().focusedOrMainFrame(); |
| + Frame* focusFrame = m_frame->page()->focusController().focusedOrMainFrame(); |
| // Do not paste here if the focus was moved somewhere else. |
| if (m_frame == focusFrame && m_frame->editor().behavior().supportsGlobalSelection()) |
| return m_frame->editor().command("PasteGlobalSelection").execute(); |
| @@ -1750,7 +1750,11 @@ static bool targetIsFrame(Node* target, LocalFrame*& frame) |
| if (!target->hasTagName(frameTag) && !target->hasTagName(iframeTag)) |
| return false; |
| - frame = toHTMLFrameElementBase(target)->contentFrame(); |
| + // Cross-process drag and drop is not yet supported. |
|
dcheng
2014/03/17 18:17:44
Tag this with FIXME? Maybe we should track these i
kenrb
2014/03/18 20:01:19
I'm not worried about that in cases where we will
|
| + if (!toHTMLFrameElementBase(target)->contentFrame()->isLocalFrame()) |
| + return false; |
| + |
| + frame = toLocalFrame(toHTMLFrameElementBase(target)->contentFrame()); |
| return true; |
| } |