OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
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 16 matching lines...) Expand all Loading... |
27 */ | 27 */ |
28 | 28 |
29 #include "config.h" | 29 #include "config.h" |
30 #include "core/page/Location.h" | 30 #include "core/page/Location.h" |
31 | 31 |
32 #include "core/dom/Document.h" | 32 #include "core/dom/Document.h" |
33 #include "core/dom/ExceptionCode.h" | 33 #include "core/dom/ExceptionCode.h" |
34 #include "core/loader/FrameLoader.h" | 34 #include "core/loader/FrameLoader.h" |
35 #include "core/page/DOMWindow.h" | 35 #include "core/page/DOMWindow.h" |
36 #include "core/page/Frame.h" | 36 #include "core/page/Frame.h" |
37 #include "core/platform/KURL.h" | |
38 #include "weborigin/SecurityOrigin.h" | 37 #include "weborigin/SecurityOrigin.h" |
39 | 38 |
40 namespace WebCore { | 39 namespace WebCore { |
41 | 40 |
42 Location::Location(Frame* frame) | 41 Location::Location(Frame* frame) |
43 : DOMWindowProperty(frame) | 42 : DOMWindowProperty(frame) |
44 { | 43 { |
45 ScriptWrappable::init(this); | 44 ScriptWrappable::init(this); |
46 } | 45 } |
47 | 46 |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 { | 265 { |
267 ASSERT(m_frame); | 266 ASSERT(m_frame); |
268 // We call findFrameForNavigation to handle the case of a seamless iframe co
rrectly. | 267 // We call findFrameForNavigation to handle the case of a seamless iframe co
rrectly. |
269 Frame* frame = m_frame->loader()->findFrameForNavigation(String(), activeWin
dow->document()); | 268 Frame* frame = m_frame->loader()->findFrameForNavigation(String(), activeWin
dow->document()); |
270 if (!frame) | 269 if (!frame) |
271 return; | 270 return; |
272 frame->document()->domWindow()->setLocation(url, activeWindow, firstWindow); | 271 frame->document()->domWindow()->setLocation(url, activeWindow, firstWindow); |
273 } | 272 } |
274 | 273 |
275 } // namespace WebCore | 274 } // namespace WebCore |
OLD | NEW |