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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp

Issue 2710263003: Replace usage of FrameLoaderClient.h with LocalFrameClient.h for files in: (Closed)
Patch Set: Created 3 years, 9 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2011 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "bindings/core/v8/WindowProxy.h" 31 #include "bindings/core/v8/WindowProxy.h"
32 32
33 #include <v8-debug.h>
34 #include <v8.h>
35 #include <algorithm>
36 #include <utility>
33 #include "bindings/core/v8/ConditionalFeatures.h" 37 #include "bindings/core/v8/ConditionalFeatures.h"
34 #include "bindings/core/v8/DOMWrapperWorld.h" 38 #include "bindings/core/v8/DOMWrapperWorld.h"
35 #include "bindings/core/v8/ScriptController.h" 39 #include "bindings/core/v8/ScriptController.h"
36 #include "bindings/core/v8/ToV8.h" 40 #include "bindings/core/v8/ToV8.h"
37 #include "bindings/core/v8/V8Binding.h" 41 #include "bindings/core/v8/V8Binding.h"
38 #include "bindings/core/v8/V8DOMActivityLogger.h" 42 #include "bindings/core/v8/V8DOMActivityLogger.h"
39 #include "bindings/core/v8/V8Document.h" 43 #include "bindings/core/v8/V8Document.h"
40 #include "bindings/core/v8/V8GCForContextDispose.h" 44 #include "bindings/core/v8/V8GCForContextDispose.h"
41 #include "bindings/core/v8/V8HTMLCollection.h" 45 #include "bindings/core/v8/V8HTMLCollection.h"
42 #include "bindings/core/v8/V8HTMLDocument.h" 46 #include "bindings/core/v8/V8HTMLDocument.h"
43 #include "bindings/core/v8/V8HiddenValue.h" 47 #include "bindings/core/v8/V8HiddenValue.h"
44 #include "bindings/core/v8/V8Initializer.h" 48 #include "bindings/core/v8/V8Initializer.h"
45 #include "bindings/core/v8/V8ObjectConstructor.h" 49 #include "bindings/core/v8/V8ObjectConstructor.h"
46 #include "bindings/core/v8/V8PagePopupControllerBinding.h" 50 #include "bindings/core/v8/V8PagePopupControllerBinding.h"
47 #include "bindings/core/v8/V8PrivateProperty.h" 51 #include "bindings/core/v8/V8PrivateProperty.h"
48 #include "bindings/core/v8/V8Window.h" 52 #include "bindings/core/v8/V8Window.h"
49 #include "core/frame/LocalFrame.h" 53 #include "core/frame/LocalFrame.h"
54 #include "core/frame/LocalFrameClient.h"
50 #include "core/frame/csp/ContentSecurityPolicy.h" 55 #include "core/frame/csp/ContentSecurityPolicy.h"
51 #include "core/html/DocumentNameCollection.h" 56 #include "core/html/DocumentNameCollection.h"
52 #include "core/html/HTMLCollection.h" 57 #include "core/html/HTMLCollection.h"
53 #include "core/html/HTMLIFrameElement.h" 58 #include "core/html/HTMLIFrameElement.h"
54 #include "core/inspector/InspectorInstrumentation.h" 59 #include "core/inspector/InspectorInstrumentation.h"
55 #include "core/inspector/MainThreadDebugger.h" 60 #include "core/inspector/MainThreadDebugger.h"
56 #include "core/loader/DocumentLoader.h" 61 #include "core/loader/DocumentLoader.h"
57 #include "core/loader/FrameLoader.h" 62 #include "core/loader/FrameLoader.h"
58 #include "core/loader/FrameLoaderClient.h"
59 #include "core/origin_trials/OriginTrialContext.h" 63 #include "core/origin_trials/OriginTrialContext.h"
60 #include "platform/Histogram.h" 64 #include "platform/Histogram.h"
61 #include "platform/RuntimeEnabledFeatures.h" 65 #include "platform/RuntimeEnabledFeatures.h"
62 #include "platform/ScriptForbiddenScope.h" 66 #include "platform/ScriptForbiddenScope.h"
63 #include "platform/heap/Handle.h" 67 #include "platform/heap/Handle.h"
64 #include "platform/instrumentation/tracing/TraceEvent.h" 68 #include "platform/instrumentation/tracing/TraceEvent.h"
65 #include "platform/weborigin/SecurityOrigin.h" 69 #include "platform/weborigin/SecurityOrigin.h"
66 #include "public/platform/Platform.h" 70 #include "public/platform/Platform.h"
67 #include "wtf/Assertions.h" 71 #include "wtf/Assertions.h"
68 #include "wtf/StringExtras.h" 72 #include "wtf/StringExtras.h"
69 #include "wtf/text/CString.h" 73 #include "wtf/text/CString.h"
70 #include <algorithm>
71 #include <utility>
72 #include <v8-debug.h>
73 #include <v8.h>
74 74
75 namespace blink { 75 namespace blink {
76 76
77 RemoteWindowProxy::RemoteWindowProxy(v8::Isolate* isolate, 77 RemoteWindowProxy::RemoteWindowProxy(v8::Isolate* isolate,
78 RemoteFrame& frame, 78 RemoteFrame& frame,
79 RefPtr<DOMWrapperWorld> world) 79 RefPtr<DOMWrapperWorld> world)
80 : WindowProxy(isolate, frame, std::move(world)) {} 80 : WindowProxy(isolate, frame, std::move(world)) {}
81 81
82 void RemoteWindowProxy::disposeContext(GlobalDetachmentBehavior behavior) { 82 void RemoteWindowProxy::disposeContext(GlobalDetachmentBehavior behavior) {
83 if (m_lifecycle != Lifecycle::ContextInitialized) 83 if (m_lifecycle != Lifecycle::ContextInitialized)
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 m_scriptState = ScriptState::create(context, m_world); 134 m_scriptState = ScriptState::create(context, m_world);
135 135
136 // TODO(haraken): Currently we cannot enable the following DCHECK because 136 // TODO(haraken): Currently we cannot enable the following DCHECK because
137 // an already detached window proxy can be re-initialized. This is wrong. 137 // an already detached window proxy can be re-initialized. This is wrong.
138 // DCHECK(m_lifecycle == Lifecycle::ContextUninitialized); 138 // DCHECK(m_lifecycle == Lifecycle::ContextUninitialized);
139 m_lifecycle = Lifecycle::ContextInitialized; 139 m_lifecycle = Lifecycle::ContextInitialized;
140 DCHECK(m_scriptState->contextIsValid()); 140 DCHECK(m_scriptState->contextIsValid());
141 } 141 }
142 142
143 } // namespace blink 143 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698