| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 66 |
| 67 if (openerFrame->settings() && !openerFrame->settings()->supportsMultipleWin
dows()) { | 67 if (openerFrame->settings() && !openerFrame->settings()->supportsMultipleWin
dows()) { |
| 68 created = false; | 68 created = false; |
| 69 return openerFrame; | 69 return openerFrame; |
| 70 } | 70 } |
| 71 | 71 |
| 72 Page* oldPage = openerFrame->page(); | 72 Page* oldPage = openerFrame->page(); |
| 73 if (!oldPage) | 73 if (!oldPage) |
| 74 return 0; | 74 return 0; |
| 75 | 75 |
| 76 Page* page = oldPage->chrome().client()->createWindow(openerFrame, request,
features); | 76 Page* page = oldPage->chrome().client().createWindow(openerFrame, request, f
eatures); |
| 77 if (!page) | 77 if (!page) |
| 78 return 0; | 78 return 0; |
| 79 | 79 |
| 80 Frame* frame = page->mainFrame(); | 80 Frame* frame = page->mainFrame(); |
| 81 | 81 |
| 82 frame->loader()->forceSandboxFlags(openerFrame->document()->sandboxFlags()); | 82 frame->loader()->forceSandboxFlags(openerFrame->document()->sandboxFlags()); |
| 83 | 83 |
| 84 if (request.frameName() != "_blank") | 84 if (request.frameName() != "_blank") |
| 85 frame->tree()->setName(request.frameName()); | 85 frame->tree()->setName(request.frameName()); |
| 86 | 86 |
| (...skipping 63 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->do
cument()->securityOrigin(), completedURL.string(), referrer, false); | 154 newFrame->navigationScheduler()->scheduleLocationChange(activeWindow->do
cument()->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 |