| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 if (!page) | 86 if (!page) |
| 87 return 0; | 87 return 0; |
| 88 | 88 |
| 89 Frame* frame = page->mainFrame(); | 89 Frame* frame = page->mainFrame(); |
| 90 | 90 |
| 91 frame->loader()->forceSandboxFlags(openerFrame->document()->sandboxFlags()); | 91 frame->loader()->forceSandboxFlags(openerFrame->document()->sandboxFlags()); |
| 92 | 92 |
| 93 if (request.frameName() != "_blank") | 93 if (request.frameName() != "_blank") |
| 94 frame->tree()->setName(request.frameName()); | 94 frame->tree()->setName(request.frameName()); |
| 95 | 95 |
| 96 page->chrome().setToolbarsVisible(features.toolBarVisible || features.locati
onBarVisible); | 96 page->chrome().setWindowFeatures(features); |
| 97 page->chrome().setStatusbarVisible(features.statusBarVisible); | |
| 98 page->chrome().setScrollbarsVisible(features.scrollbarsVisible); | |
| 99 page->chrome().setMenubarVisible(features.menuBarVisible); | |
| 100 page->chrome().setResizable(features.resizable); | |
| 101 | 97 |
| 102 // 'x' and 'y' specify the location of the window, while 'width' and 'height
' | 98 // 'x' and 'y' specify the location of the window, while 'width' and 'height
' |
| 103 // specify the size of the viewport. We can only resize the window, so adjus
t | 99 // specify the size of the viewport. We can only resize the window, so adjus
t |
| 104 // for the difference between the window size and the viewport size. | 100 // for the difference between the window size and the viewport size. |
| 105 | 101 |
| 106 FloatRect windowRect = page->chrome().windowRect(); | 102 FloatRect windowRect = page->chrome().windowRect(); |
| 107 FloatSize viewportSize = page->chrome().pageRect().size(); | 103 FloatSize viewportSize = page->chrome().pageRect().size(); |
| 108 | 104 |
| 109 if (features.xSet) | 105 if (features.xSet) |
| 110 windowRect.setX(features.x); | 106 windowRect.setX(features.x); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 if (created) { | 159 if (created) { |
| 164 FrameLoadRequest request(activeWindow->document()->securityOrigin(), Res
ourceRequest(completedURL, referrer)); | 160 FrameLoadRequest request(activeWindow->document()->securityOrigin(), Res
ourceRequest(completedURL, referrer)); |
| 165 newFrame->loader()->load(request); | 161 newFrame->loader()->load(request); |
| 166 } else if (!urlString.isEmpty()) { | 162 } else if (!urlString.isEmpty()) { |
| 167 newFrame->navigationScheduler()->scheduleLocationChange(activeWindow->do
cument()->securityOrigin(), completedURL.string(), referrer, false); | 163 newFrame->navigationScheduler()->scheduleLocationChange(activeWindow->do
cument()->securityOrigin(), completedURL.string(), referrer, false); |
| 168 } | 164 } |
| 169 return newFrame; | 165 return newFrame; |
| 170 } | 166 } |
| 171 | 167 |
| 172 } // namespace WebCore | 168 } // namespace WebCore |
| OLD | NEW |