Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Side by Side Diff: Source/core/frame/Location.cpp

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Stale refernence to weboriginexport in .gpyi Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/History.cpp ('k') | Source/core/html/HTMLAnchorElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 19 matching lines...) Expand all
30 #include "core/frame/Location.h" 30 #include "core/frame/Location.h"
31 31
32 #include "bindings/v8/ExceptionMessages.h" 32 #include "bindings/v8/ExceptionMessages.h"
33 #include "bindings/v8/ExceptionState.h" 33 #include "bindings/v8/ExceptionState.h"
34 #include "core/dom/DOMURLUtilsReadOnly.h" 34 #include "core/dom/DOMURLUtilsReadOnly.h"
35 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "core/frame/DOMWindow.h" 37 #include "core/frame/DOMWindow.h"
38 #include "core/frame/Frame.h" 38 #include "core/frame/Frame.h"
39 #include "core/loader/FrameLoader.h" 39 #include "core/loader/FrameLoader.h"
40 #include "weborigin/KURL.h" 40 #include "platform/weborigin/KURL.h"
41 #include "weborigin/SecurityOrigin.h" 41 #include "platform/weborigin/SecurityOrigin.h"
42 42
43 namespace WebCore { 43 namespace WebCore {
44 44
45 Location::Location(Frame* frame) 45 Location::Location(Frame* frame)
46 : DOMWindowProperty(frame) 46 : DOMWindowProperty(frame)
47 { 47 {
48 ScriptWrappable::init(this); 48 ScriptWrappable::init(this);
49 } 49 }
50 50
51 inline const KURL& Location::url() const 51 inline const KURL& Location::url() const
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 { 244 {
245 ASSERT(m_frame); 245 ASSERT(m_frame);
246 // We call findFrameForNavigation to handle the case of a seamless iframe co rrectly. 246 // We call findFrameForNavigation to handle the case of a seamless iframe co rrectly.
247 Frame* frame = m_frame->loader().findFrameForNavigation(String(), activeWind ow->document()); 247 Frame* frame = m_frame->loader().findFrameForNavigation(String(), activeWind ow->document());
248 if (!frame) 248 if (!frame)
249 return; 249 return;
250 frame->domWindow()->setLocation(url, activeWindow, firstWindow); 250 frame->domWindow()->setLocation(url, activeWindow, firstWindow);
251 } 251 }
252 252
253 } // namespace WebCore 253 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/History.cpp ('k') | Source/core/html/HTMLAnchorElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698