| 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 if (features.ySet) | 112 if (features.ySet) |
| 113 windowRect.setY(features.y); | 113 windowRect.setY(features.y); |
| 114 if (features.widthSet) | 114 if (features.widthSet) |
| 115 windowRect.setWidth(features.width + (windowRect.width() - viewportSize.
width())); | 115 windowRect.setWidth(features.width + (windowRect.width() - viewportSize.
width())); |
| 116 if (features.heightSet) | 116 if (features.heightSet) |
| 117 windowRect.setHeight(features.height + (windowRect.height() - viewportSi
ze.height())); | 117 windowRect.setHeight(features.height + (windowRect.height() - viewportSi
ze.height())); |
| 118 | 118 |
| 119 host->chrome().setWindowRect(windowRect); | 119 host->chrome().setWindowRect(windowRect); |
| 120 host->chrome().show(policy); | 120 host->chrome().show(policy); |
| 121 | 121 |
| 122 frame.loader().forceSandboxFlags(openerFrame.document()->sandboxFlags()); | 122 if (openerFrame.document()->isSandboxed(SandboxPropagatesToAuxiliaryBrowsing
Contexts)) |
| 123 frame.loader().forceSandboxFlags(openerFrame.document()->sandboxFlags())
; |
| 123 | 124 |
| 124 created = true; | 125 created = true; |
| 125 return &frame; | 126 return &frame; |
| 126 } | 127 } |
| 127 | 128 |
| 128 LocalFrame* createWindow(const String& urlString, const AtomicString& frameName,
const WindowFeatures& windowFeatures, | 129 LocalFrame* createWindow(const String& urlString, const AtomicString& frameName,
const WindowFeatures& windowFeatures, |
| 129 LocalDOMWindow& callingWindow, LocalFrame& firstFrame, LocalFrame& openerFra
me) | 130 LocalDOMWindow& callingWindow, LocalFrame& firstFrame, LocalFrame& openerFra
me) |
| 130 { | 131 { |
| 131 LocalFrame* activeFrame = callingWindow.frame(); | 132 LocalFrame* activeFrame = callingWindow.frame(); |
| 132 ASSERT(activeFrame); | 133 ASSERT(activeFrame); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 if (shouldSendReferrer == MaybeSendReferrer) { | 198 if (shouldSendReferrer == MaybeSendReferrer) { |
| 198 newFrame->loader().setOpener(&openerFrame); | 199 newFrame->loader().setOpener(&openerFrame); |
| 199 newFrame->document()->setReferrerPolicy(openerFrame.document()->referrer
Policy()); | 200 newFrame->document()->setReferrerPolicy(openerFrame.document()->referrer
Policy()); |
| 200 } | 201 } |
| 201 FrameLoadRequest newRequest(0, request.resourceRequest()); | 202 FrameLoadRequest newRequest(0, request.resourceRequest()); |
| 202 newRequest.setFormState(request.formState()); | 203 newRequest.setFormState(request.formState()); |
| 203 newFrame->loader().load(newRequest); | 204 newFrame->loader().load(newRequest); |
| 204 } | 205 } |
| 205 | 206 |
| 206 } // namespace blink | 207 } // namespace blink |
| OLD | NEW |