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

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2151933003: Change WTF::TemporaryChange to be an alias for AutoReset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 3488d75c8c5dc32a8404a113d9e37b81ff3d988f..0954accf9c514e2017d4c14689763cb9647cabd3 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -744,7 +744,7 @@ void FrameLoader::loadInSameDocument(const KURL& url, PassRefPtr<SerializedScrip
detachDocumentLoader(m_provisionalDocumentLoader);
if (!m_frame->host())
return;
- TemporaryChange<FrameLoadType> loadTypeChange(m_loadType, frameLoadType);
+ TemporaryChange<FrameLoadType> loadTypeChange(&m_loadType, frameLoadType);
saveScrollState();
KURL oldURL = m_frame->document()->url();
@@ -1119,7 +1119,7 @@ bool FrameLoader::prepareForCommit()
// At this point, the provisional document loader should not detach, because
// then the FrameLoader would not have any attached DocumentLoaders.
if (m_documentLoader) {
- TemporaryChange<bool> inDetachDocumentLoader(m_protectProvisionalLoader, true);
+ TemporaryChange<bool> inDetachDocumentLoader(&m_protectProvisionalLoader, true);
detachDocumentLoader(m_documentLoader);
}
// 'abort' listeners can also detach the frame.
@@ -1550,7 +1550,7 @@ void FrameLoader::dispatchDidClearDocumentOfWindowObject()
if (m_dispatchingDidClearWindowObjectInMainWorld)
return;
TemporaryChange<bool>
- inDidClearWindowObject(m_dispatchingDidClearWindowObjectInMainWorld, true);
+ inDidClearWindowObject(&m_dispatchingDidClearWindowObjectInMainWorld, true);
// We just cleared the document, not the entire window object, but for the
// embedder that's close enough.
client()->dispatchDidClearWindowObjectInMainWorld();
@@ -1564,7 +1564,7 @@ void FrameLoader::dispatchDidClearWindowObjectInMainWorld()
if (m_dispatchingDidClearWindowObjectInMainWorld)
return;
TemporaryChange<bool>
- inDidClearWindowObject(m_dispatchingDidClearWindowObjectInMainWorld, true);
+ inDidClearWindowObject(&m_dispatchingDidClearWindowObjectInMainWorld, true);
client()->dispatchDidClearWindowObjectInMainWorld();
}

Powered by Google App Engine
This is Rietveld 408576698