OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. |
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
31 #include "core/frame/Frame.h" | 31 #include "core/frame/Frame.h" |
32 #include "core/loader/FrameLoadRequest.h" | 32 #include "core/loader/FrameLoadRequest.h" |
33 #include "core/page/Chrome.h" | 33 #include "core/page/Chrome.h" |
34 #include "core/page/ChromeClient.h" | 34 #include "core/page/ChromeClient.h" |
35 #include "core/page/Page.h" | 35 #include "core/page/Page.h" |
36 #include "core/page/Settings.h" | 36 #include "core/page/Settings.h" |
37 #include "core/page/WindowFeatures.h" | 37 #include "core/page/WindowFeatures.h" |
38 #include "platform/network/ResourceRequest.h" | 38 #include "platform/network/ResourceRequest.h" |
39 #include "weborigin/KURL.h" | 39 #include "platform/weborigin/KURL.h" |
40 #include "weborigin/SecurityOrigin.h" | 40 #include "platform/weborigin/SecurityOrigin.h" |
41 #include "weborigin/SecurityPolicy.h" | 41 #include "platform/weborigin/SecurityPolicy.h" |
42 | 42 |
43 namespace WebCore { | 43 namespace WebCore { |
44 | 44 |
45 static Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLo
adRequest& request, const WindowFeatures& features, bool& created) | 45 static Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLo
adRequest& request, const WindowFeatures& features, bool& created) |
46 { | 46 { |
47 ASSERT(!features.dialog || request.frameName().isEmpty()); | 47 ASSERT(!features.dialog || request.frameName().isEmpty()); |
48 | 48 |
49 if (!request.frameName().isEmpty() && request.frameName() != "_blank") { | 49 if (!request.frameName().isEmpty() && request.frameName() != "_blank") { |
50 if (Frame* frame = lookupFrame->loader().findFrameForNavigation(request.
frameName(), openerFrame->document())) { | 50 if (Frame* frame = lookupFrame->loader().findFrameForNavigation(request.
frameName(), openerFrame->document())) { |
51 if (request.frameName() != "_self") { | 51 if (request.frameName() != "_self") { |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 if (created) { | 150 if (created) { |
151 FrameLoadRequest request(activeWindow->document()->securityOrigin(), Res
ourceRequest(completedURL, referrer)); | 151 FrameLoadRequest request(activeWindow->document()->securityOrigin(), Res
ourceRequest(completedURL, referrer)); |
152 newFrame->loader().load(request); | 152 newFrame->loader().load(request); |
153 } else if (!urlString.isEmpty()) { | 153 } else if (!urlString.isEmpty()) { |
154 newFrame->navigationScheduler().scheduleLocationChange(activeWindow->doc
ument()->securityOrigin(), completedURL.string(), referrer, false); | 154 newFrame->navigationScheduler().scheduleLocationChange(activeWindow->doc
ument()->securityOrigin(), completedURL.string(), referrer, false); |
155 } | 155 } |
156 return newFrame; | 156 return newFrame; |
157 } | 157 } |
158 | 158 |
159 } // namespace WebCore | 159 } // namespace WebCore |
OLD | NEW |