Index: Source/core/page/CreateWindow.cpp |
diff --git a/Source/core/page/CreateWindow.cpp b/Source/core/page/CreateWindow.cpp |
index ded523740760cab4165cb2d85f2ff29ca4282512..47ff6c92f49d093ac8e22439fb6927ebbab68120 100644 |
--- a/Source/core/page/CreateWindow.cpp |
+++ b/Source/core/page/CreateWindow.cpp |
@@ -50,7 +50,7 @@ static LocalFrame* createWindow(LocalFrame& openerFrame, LocalFrame& lookupFrame |
ASSERT(!features.dialog || request.frameName().isEmpty()); |
if (!request.frameName().isEmpty() && request.frameName() != "_blank" && policy == NavigationPolicyIgnore) { |
- if (LocalFrame* frame = lookupFrame.loader().findFrameForNavigation(request.frameName(), openerFrame.document())) { |
+ if (Frame* frame = lookupFrame.findFrameForNavigation(request.frameName(), openerFrame)) { |
if (request.frameName() != "_self") { |
if (FrameHost* host = frame->host()) { |
if (host == openerFrame.host()) |
@@ -60,7 +60,7 @@ static LocalFrame* createWindow(LocalFrame& openerFrame, LocalFrame& lookupFrame |
} |
} |
created = false; |
- return frame; |
+ return frame->isLocalFrame() ? toLocalFrame(frame) : nullptr; |
dcheng
2015/01/08 00:44:59
Tag this with a FIXME, because it's clearly broken
Nate Chapin
2015/01/08 17:10:52
Done.
dcheng
2015/01/08 23:17:26
Hmm, I was thinking just change the return type so
|
} |
} |