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

Unified Diff: Source/core/inspector/InspectorPageAgent.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 6 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/inspector/InspectorOverlay.cpp ('k') | Source/core/inspector/PageDebuggerAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorPageAgent.cpp
diff --git a/Source/core/inspector/InspectorPageAgent.cpp b/Source/core/inspector/InspectorPageAgent.cpp
index af3818ea6178b6f37a84f04f66a16325cf913550..3572507ada281c891f7fe37ee183e419d91500fd 100644
--- a/Source/core/inspector/InspectorPageAgent.cpp
+++ b/Source/core/inspector/InspectorPageAgent.cpp
@@ -473,13 +473,13 @@ void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCa
{
m_pendingScriptToEvaluateOnLoadOnce = optionalScriptToEvaluateOnLoad ? *optionalScriptToEvaluateOnLoad : "";
m_pendingScriptPreprocessor = optionalScriptPreprocessor ? *optionalScriptPreprocessor : "";
- m_page->mainFrame()->loader().reload(optionalIgnoreCache && *optionalIgnoreCache ? EndToEndReload : NormalReload);
+ m_page->deprecatedLocalMainFrame()->loader().reload(optionalIgnoreCache && *optionalIgnoreCache ? EndToEndReload : NormalReload);
}
void InspectorPageAgent::navigate(ErrorString*, const String& url)
{
UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
- LocalFrame* frame = m_page->mainFrame();
+ LocalFrame* frame = m_page->deprecatedLocalMainFrame();
FrameLoadRequest request(frame->document(), ResourceRequest(frame->document()->completeURL(url)));
frame->loader().load(request);
}
@@ -613,7 +613,7 @@ void InspectorPageAgent::deleteCookie(ErrorString*, const String& cookieName, co
void InspectorPageAgent::getResourceTree(ErrorString*, RefPtr<TypeBuilder::Page::FrameResourceTree>& object)
{
- object = buildObjectForFrameTree(m_page->mainFrame());
+ object = buildObjectForFrameTree(m_page->deprecatedLocalMainFrame());
}
void InspectorPageAgent::getResourceContent(ErrorString* errorString, const String& frameId, const String& url, String* content, bool* base64Encoded)
@@ -889,7 +889,7 @@ void InspectorPageAgent::frameDetachedFromParent(LocalFrame* frame)
LocalFrame* InspectorPageAgent::mainFrame()
{
- return m_page->mainFrame();
+ return m_page->deprecatedLocalMainFrame();
}
LocalFrame* InspectorPageAgent::frameForId(const String& frameId)
@@ -1197,7 +1197,7 @@ void InspectorPageAgent::updateTouchEventEmulationInPage(bool enabled)
m_page->settings().setDeviceSupportsTouch(enabled ? true : m_originalDeviceSupportsTouch);
m_touchEmulationEnabled = enabled;
m_client->setTouchEventEmulationEnabled(enabled);
- m_page->mainFrame()->view()->layout();
+ m_page->deprecatedLocalMainFrame()->view()->layout();
}
void InspectorPageAgent::hasTouchInputs(ErrorString*, bool* result)
@@ -1231,7 +1231,7 @@ void InspectorPageAgent::setEmulatedMedia(ErrorString*, const String& media)
m_state->setString(PageAgentState::pageAgentEmulatedMedia, media);
Document* document = 0;
if (m_page->mainFrame())
- document = m_page->mainFrame()->document();
+ document = m_page->deprecatedLocalMainFrame()->document();
if (document) {
document->mediaQueryAffectingValueChanged();
document->styleResolverChanged();
« no previous file with comments | « Source/core/inspector/InspectorOverlay.cpp ('k') | Source/core/inspector/PageDebuggerAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698