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

Unified Diff: Source/core/frame/DOMWindow.cpp

Issue 31063004: Have Frame::loader() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/frame/Frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/DOMWindow.cpp
diff --git a/Source/core/frame/DOMWindow.cpp b/Source/core/frame/DOMWindow.cpp
index 48c7821f2d21a47a2923aa645530d94d90d590cc..f302b8fc2cd48ec9e4afe6622bbcd46d922baccf 100644
--- a/Source/core/frame/DOMWindow.cpp
+++ b/Source/core/frame/DOMWindow.cpp
@@ -788,7 +788,7 @@ void DOMWindow::postMessageTimerFired(PassOwnPtr<PostMessageTimer> t)
// Give the embedder a chance to intercept this postMessage because this
// DOMWindow might be a proxy for another in browsers that support
// postMessage calls across WebKit instances.
- if (m_frame->loader()->client()->willCheckAndDispatchMessageEvent(timer->targetOrigin(), event.get()))
+ if (m_frame->loader().client()->willCheckAndDispatchMessageEvent(timer->targetOrigin(), event.get()))
return;
event->entangleMessagePorts(document());
@@ -885,7 +885,7 @@ void DOMWindow::close(ExecutionContext* context)
if (!(page->openedByDOM() || page->backForward().backForwardListCount() <= 1 || allowScriptsToCloseWindows))
return;
- if (!m_frame->loader()->shouldClose())
+ if (!m_frame->loader().shouldClose())
return;
page->chrome().closeWindowSoon();
@@ -900,7 +900,7 @@ void DOMWindow::print()
if (!page)
return;
- if (m_frame->loader()->activeDocumentLoader()->isLoading()) {
+ if (m_frame->loader().activeDocumentLoader()->isLoading()) {
m_shouldPrintWhenFinishedLoading = true;
return;
}
@@ -912,7 +912,7 @@ void DOMWindow::stop()
{
if (!m_frame)
return;
- m_frame->loader()->stopAllLoaders();
+ m_frame->loader().stopAllLoaders();
}
void DOMWindow::alert(const String& message)
@@ -1118,7 +1118,7 @@ void DOMWindow::setName(const String& string)
return;
m_frame->tree().setName(string);
- m_frame->loader()->client()->didChangeName(string);
+ m_frame->loader().client()->didChangeName(string);
}
void DOMWindow::setStatus(const String& string)
@@ -1164,7 +1164,7 @@ DOMWindow* DOMWindow::opener() const
if (!m_frame)
return 0;
- Frame* opener = m_frame->loader()->opener();
+ Frame* opener = m_frame->loader().opener();
if (!opener)
return 0;
@@ -1482,10 +1482,10 @@ bool DOMWindow::removeEventListener(const AtomicString& eventType, EventListener
void DOMWindow::dispatchLoadEvent()
{
RefPtr<Event> loadEvent(Event::create(EventTypeNames::load));
- if (m_frame && m_frame->loader()->documentLoader() && !m_frame->loader()->documentLoader()->timing()->loadEventStart()) {
+ if (m_frame && m_frame->loader().documentLoader() && !m_frame->loader().documentLoader()->timing()->loadEventStart()) {
// The DocumentLoader (and thus its DocumentLoadTiming) might get destroyed while dispatching
// the event, so protect it to prevent writing the end time into freed memory.
- RefPtr<DocumentLoader> documentLoader = m_frame->loader()->documentLoader();
+ RefPtr<DocumentLoader> documentLoader = m_frame->loader().documentLoader();
DocumentLoadTiming* timing = documentLoader->timing();
timing->markLoadEventStart();
dispatchEvent(loadEvent, document());
@@ -1570,7 +1570,7 @@ void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DO
// We want a new history item if we are processing a user gesture.
m_frame->navigationScheduler().scheduleLocationChange(activeDocument->securityOrigin(),
// FIXME: What if activeDocument()->frame() is 0?
- completedURL, activeDocument->frame()->loader()->outgoingReferrer(),
+ completedURL, activeDocument->frame()->loader().outgoingReferrer(),
locking != LockHistoryBasedOnGestureState);
}
@@ -1715,7 +1715,7 @@ PassRefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicStrin
targetFrame->navigationScheduler().scheduleLocationChange(
activeDocument->securityOrigin(),
completedURL,
- firstFrame->loader()->outgoingReferrer(),
+ firstFrame->loader().outgoingReferrer(),
false);
return targetFrame->domWindow();
}
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/frame/Frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698