Chromium Code Reviews| Index: Source/core/page/CreateWindow.cpp |
| diff --git a/Source/core/page/CreateWindow.cpp b/Source/core/page/CreateWindow.cpp |
| index 822dd26fdf27f0b11f00705ec23652a918c69c78..249a4682db51983b160234632fb95841125005d9 100644 |
| --- a/Source/core/page/CreateWindow.cpp |
| +++ b/Source/core/page/CreateWindow.cpp |
| @@ -50,11 +50,11 @@ 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)) { |
|
dcheng
2014/12/13 01:55:49
openerFrame should never be null right? Should we
Nate Chapin
2014/12/20 00:09:14
Done.
|
| if (request.frameName() != "_self") |
| frame->page()->focusController().setFocusedFrame(frame); |
| created = false; |
| - return frame; |
| + return frame->isLocalFrame() ? toLocalFrame(frame) : 0; |
|
dcheng
2014/12/13 01:55:49
nullptr
Nate Chapin
2014/12/20 00:09:14
Done.
|
| } |
| } |