summaryrefslogtreecommitdiff
path: root/Source/WebCore/page/DOMWindowExtension.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/page/DOMWindowExtension.cpp')
-rw-r--r--Source/WebCore/page/DOMWindowExtension.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/WebCore/page/DOMWindowExtension.cpp b/Source/WebCore/page/DOMWindowExtension.cpp
index cdfe9aa32..9c25e5d11 100644
--- a/Source/WebCore/page/DOMWindowExtension.cpp
+++ b/Source/WebCore/page/DOMWindowExtension.cpp
@@ -43,26 +43,26 @@ DOMWindowExtension::DOMWindowExtension(Frame* frame, DOMWrapperWorld& world)
ASSERT(this->frame());
}
-void DOMWindowExtension::disconnectFrameForPageCache()
+void DOMWindowExtension::disconnectFrameForDocumentSuspension()
{
// Calling out to the client might result in this DOMWindowExtension being destroyed
// while there is still work to do.
- Ref<DOMWindowExtension> protect(*this);
+ Ref<DOMWindowExtension> protectedThis(*this);
Frame* frame = this->frame();
frame->loader().client().dispatchWillDisconnectDOMWindowExtensionFromGlobalObject(this);
m_disconnectedFrame = frame;
- DOMWindowProperty::disconnectFrameForPageCache();
+ DOMWindowProperty::disconnectFrameForDocumentSuspension();
}
-void DOMWindowExtension::reconnectFrameFromPageCache(Frame* frame)
+void DOMWindowExtension::reconnectFrameFromDocumentSuspension(Frame* frame)
{
ASSERT(m_disconnectedFrame == frame);
- DOMWindowProperty::reconnectFrameFromPageCache(frame);
- m_disconnectedFrame = 0;
+ DOMWindowProperty::reconnectFrameFromDocumentSuspension(frame);
+ m_disconnectedFrame = nullptr;
this->frame()->loader().client().dispatchDidReconnectDOMWindowExtensionToGlobalObject(this);
}
@@ -73,10 +73,10 @@ void DOMWindowExtension::willDestroyGlobalObjectInCachedFrame()
// Calling out to the client might result in this DOMWindowExtension being destroyed
// while there is still work to do.
- Ref<DOMWindowExtension> protect(*this);
+ Ref<DOMWindowExtension> protectedThis(*this);
m_disconnectedFrame->loader().client().dispatchWillDestroyGlobalObjectForDOMWindowExtension(this);
- m_disconnectedFrame = 0;
+ m_disconnectedFrame = nullptr;
DOMWindowProperty::willDestroyGlobalObjectInCachedFrame();
}
@@ -87,7 +87,7 @@ void DOMWindowExtension::willDestroyGlobalObjectInFrame()
// Calling out to the client might result in this DOMWindowExtension being destroyed
// while there is still work to do.
- Ref<DOMWindowExtension> protect(*this);
+ Ref<DOMWindowExtension> protectedThis(*this);
if (!m_wasDetached) {
Frame* frame = this->frame();
@@ -105,7 +105,7 @@ void DOMWindowExtension::willDetachGlobalObjectFromFrame()
// Calling out to the client might result in this DOMWindowExtension being destroyed
// while there is still work to do.
- Ref<DOMWindowExtension> protect(*this);
+ Ref<DOMWindowExtension> protectedThis(*this);
Frame* frame = this->frame();
ASSERT(frame);