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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 if (newFrame->domWindow()->isInsecureScriptAccess(activeWindow, completedURL
)) | 144 if (newFrame->domWindow()->isInsecureScriptAccess(activeWindow, completedURL
)) |
145 return newFrame; | 145 return newFrame; |
146 | 146 |
147 if (function) | 147 if (function) |
148 function(newFrame->domWindow(), functionContext); | 148 function(newFrame->domWindow(), functionContext); |
149 | 149 |
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->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 |