summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/bindings/core/v8/window_proxy.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/bindings/core/v8/window_proxy.cc')
-rw-r--r--chromium/third_party/blink/renderer/bindings/core/v8/window_proxy.cc29
1 files changed, 5 insertions, 24 deletions
diff --git a/chromium/third_party/blink/renderer/bindings/core/v8/window_proxy.cc b/chromium/third_party/blink/renderer/bindings/core/v8/window_proxy.cc
index 86076cb3f39..389dcd940e9 100644
--- a/chromium/third_party/blink/renderer/bindings/core/v8/window_proxy.cc
+++ b/chromium/third_party/blink/renderer/bindings/core/v8/window_proxy.cc
@@ -48,7 +48,7 @@ WindowProxy::~WindowProxy() {
DCHECK(lifecycle_ != Lifecycle::kContextIsInitialized);
}
-void WindowProxy::Trace(blink::Visitor* visitor) {
+void WindowProxy::Trace(Visitor* visitor) {
visitor->Trace(frame_);
}
@@ -65,24 +65,19 @@ void WindowProxy::ClearForClose() {
DisposeContext(lifecycle_ == Lifecycle::kV8MemoryIsForciblyPurged
? Lifecycle::kFrameIsDetachedAndV8MemoryIsPurged
: Lifecycle::kFrameIsDetached,
- kFrameWillNotBeReused,
- v8::Context::DetachedWindowReason::kDetachedWindowByClosing);
+ kFrameWillNotBeReused);
}
void WindowProxy::ClearForNavigation() {
- DisposeContext(Lifecycle::kGlobalObjectIsDetached, kFrameWillBeReused,
- v8::Context::kDetachedWindowByNavigation);
+ DisposeContext(Lifecycle::kGlobalObjectIsDetached, kFrameWillBeReused);
}
void WindowProxy::ClearForSwap() {
- // This happens on a navigation between local/remote source.
- DisposeContext(Lifecycle::kGlobalObjectIsDetached, kFrameWillNotBeReused,
- v8::Context::kDetachedWindowByNavigation);
+ DisposeContext(Lifecycle::kGlobalObjectIsDetached, kFrameWillNotBeReused);
}
void WindowProxy::ClearForV8MemoryPurge() {
- DisposeContext(Lifecycle::kV8MemoryIsForciblyPurged, kFrameWillNotBeReused,
- v8::Context::kDetachedWindowByOtherReason);
+ DisposeContext(Lifecycle::kV8MemoryIsForciblyPurged, kFrameWillNotBeReused);
}
v8::Local<v8::Object> WindowProxy::GlobalProxyIfNotDetached() {
@@ -165,18 +160,4 @@ void WindowProxy::InitializeIfNeeded() {
}
}
-v8::Local<v8::Object> WindowProxy::AssociateWithWrapper(
- DOMWindow* window,
- const WrapperTypeInfo* wrapper_type_info,
- v8::Local<v8::Object> wrapper) {
- if (world_->DomDataStore().Set(isolate_, window, wrapper_type_info,
- wrapper)) {
- WrapperTypeInfo::WrapperCreated();
- V8DOMWrapper::SetNativeInfo(isolate_, wrapper, wrapper_type_info, window);
- DCHECK(V8DOMWrapper::HasInternalFieldsSet(wrapper));
- }
- SECURITY_CHECK(ToScriptWrappable(wrapper) == window);
- return wrapper;
-}
-
} // namespace blink