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

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

Issue 683013002: Extract a DOMWindow interface from LocalDOMWindow and use it in the idl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on top of DOMWindow moves and UseCounter overload for Frame Created 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 2f1bb962f4f129cf1331bf065dd210bc84e98544..9a92d93d6c1307673cea31dfef5810f234b7addf 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -586,7 +586,7 @@ void FrameLoader::loadInSameDocument(const KURL& url, PassRefPtr<SerializedScrip
bool hashChange = equalIgnoringFragmentIdentifier(url, oldURL) && url.fragmentIdentifier() != oldURL.fragmentIdentifier();
if (hashChange) {
m_frame->eventHandler().stopAutoscroll();
- m_frame->domWindow()->enqueueHashchangeEvent(oldURL, url);
+ m_frame->localDOMWindow()->enqueueHashchangeEvent(oldURL, url);
}
m_documentLoader->setIsClientRedirect(clientRedirect == ClientRedirect);
m_documentLoader->setReplacesCurrentHistoryItem(m_loadType == FrameLoadTypeStandard);
@@ -599,7 +599,7 @@ void FrameLoader::loadInSameDocument(const KURL& url, PassRefPtr<SerializedScrip
scrollToFragmentWithParentBoundary(url);
checkCompleted();
- m_frame->domWindow()->statePopped(stateObject ? stateObject : SerializedScriptValue::nullValue());
+ m_frame->localDOMWindow()->statePopped(stateObject ? stateObject : SerializedScriptValue::nullValue());
}
void FrameLoader::completed()
@@ -943,7 +943,7 @@ void FrameLoader::commitProvisionalLoad()
// its frame is not in a consistent state for rendering, so avoid setJSStatusBarText
// since it may cause clients to attempt to render the frame.
if (!m_stateMachine.creatingInitialEmptyDocument()) {
- LocalDOMWindow* window = m_frame->domWindow();
+ DOMWindow* window = m_frame->domWindow();
window->setStatus(String());
window->setDefaultStatus(String());
}
@@ -1039,7 +1039,7 @@ bool FrameLoader::checkLoadCompleteForThisFrame()
return true;
m_progressTracker->progressCompleted();
- m_frame->domWindow()->finishedLoading();
+ m_frame->localDOMWindow()->finishedLoading();
const ResourceError& error = m_documentLoader->mainDocumentError();
if (!error.isNull()) {

Powered by Google App Engine
This is Rietveld 408576698