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

Unified Diff: Source/bindings/v8/V8WindowShell.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/bindings/v8/V8Binding.cpp ('k') | Source/bindings/v8/custom/V8WindowCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/v8/V8WindowShell.cpp
diff --git a/Source/bindings/v8/V8WindowShell.cpp b/Source/bindings/v8/V8WindowShell.cpp
index 4bd753f47e8b5ba2b6ddaf273b9820807a3a1efc..053222dae02bcc99f9725af9b4ec89f83ca4c0f5 100644
--- a/Source/bindings/v8/V8WindowShell.cpp
+++ b/Source/bindings/v8/V8WindowShell.cpp
@@ -99,7 +99,7 @@ void V8WindowShell::disposeContext()
return;
v8::HandleScope handleScope(m_isolate);
- m_frame->loader()->client()->willReleaseScriptContext(m_context.newLocal(m_isolate), m_world->worldId());
+ m_frame->loader().client()->willReleaseScriptContext(m_context.newLocal(m_isolate), m_world->worldId());
m_context.clear();
@@ -251,7 +251,7 @@ bool V8WindowShell::initializeIfNeeded()
InspectorInstrumentation::didCreateIsolatedContext(m_frame, scriptState, origin);
}
}
- m_frame->loader()->client()->didCreateScriptContext(context, m_world->extensionGroup(), m_world->worldId());
+ m_frame->loader().client()->didCreateScriptContext(context, m_world->extensionGroup(), m_world->worldId());
return true;
}
@@ -259,7 +259,7 @@ void V8WindowShell::createContext()
{
// The activeDocumentLoader pointer could be 0 during frame shutdown.
// FIXME: Can we remove this check?
- if (!m_frame->loader()->activeDocumentLoader())
+ if (!m_frame->loader().activeDocumentLoader())
return;
// Create a new environment using an empty template for the shadow
@@ -283,7 +283,7 @@ void V8WindowShell::createContext()
for (size_t i = 0; i < extensions.size(); ++i) {
// Ensure our date extension is always allowed.
if (extensions[i] != DateExtension::get()
- && !m_frame->loader()->client()->allowScriptExtension(extensions[i]->name(), extensionGroup, worldId))
+ && !m_frame->loader().client()->allowScriptExtension(extensions[i]->name(), extensionGroup, worldId))
continue;
extensionNames[index++] = extensions[i]->name();
@@ -394,7 +394,7 @@ void V8WindowShell::setSecurityToken()
// are in the initial empty document, so that we can do a full canAccess
// check in those cases.
if (!origin->domainWasSetInDOM()
- && !m_frame->loader()->stateMachine()->isDisplayingInitialEmptyDocument())
+ && !m_frame->loader().stateMachine()->isDisplayingInitialEmptyDocument())
token = document->securityOrigin()->toString();
// An empty or "null" token means we always have to call
« no previous file with comments | « Source/bindings/v8/V8Binding.cpp ('k') | Source/bindings/v8/custom/V8WindowCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698