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

Unified Diff: Source/core/testing/Internals.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
Index: Source/core/testing/Internals.cpp
diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp
index 760ec5fb3ca694f8408889b177226aedc70fcbfa..22a86c8c894068b032899a3bafb6a5b8bc8f0c4f 100644
--- a/Source/core/testing/Internals.cpp
+++ b/Source/core/testing/Internals.cpp
@@ -191,15 +191,15 @@ void Internals::resetToConsistentState(Page* page)
delete s_pagePopupDriver;
s_pagePopupDriver = 0;
page->chrome().client().resetPagePopupDriver();
- if (!page->mainFrame()->spellChecker().isContinuousSpellCheckingEnabled())
- page->mainFrame()->spellChecker().toggleContinuousSpellChecking();
- if (page->mainFrame()->editor().isOverwriteModeEnabled())
- page->mainFrame()->editor().toggleOverwriteModeEnabled();
+ if (!page->deprecatedLocalMainFrame()->spellChecker().isContinuousSpellCheckingEnabled())
+ page->deprecatedLocalMainFrame()->spellChecker().toggleContinuousSpellChecking();
+ if (page->deprecatedLocalMainFrame()->editor().isOverwriteModeEnabled())
+ page->deprecatedLocalMainFrame()->editor().toggleOverwriteModeEnabled();
if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
scrollingCoordinator->reset();
- page->mainFrame()->view()->clear();
+ page->deprecatedLocalMainFrame()->view()->clear();
}
Internals::Internals(Document* document)
@@ -728,7 +728,7 @@ void Internals::setEnableMockPagePopup(bool enabled, ExceptionState& exceptionSt
return;
}
if (!s_pagePopupDriver)
- s_pagePopupDriver = MockPagePopupDriver::create(page->mainFrame()).leakPtr();
+ s_pagePopupDriver = MockPagePopupDriver::create(page->deprecatedLocalMainFrame()).leakPtr();
page->chrome().client().setPagePopupDriver(s_pagePopupDriver);
}
@@ -899,7 +899,7 @@ String Internals::viewportAsText(Document* document, float, int availableWidth,
// Update initial viewport size.
IntSize initialViewportSize(availableWidth, availableHeight);
- document->page()->mainFrame()->view()->setFrameRect(IntRect(IntPoint::zero(), initialViewportSize));
+ document->page()->deprecatedLocalMainFrame()->view()->setFrameRect(IntRect(IntPoint::zero(), initialViewportSize));
ViewportDescription description = page->viewportDescription();
PageScaleConstraints constraints = description.resolve(initialViewportSize, Length());
« no previous file with comments | « Source/core/svg/graphics/SVGImage.cpp ('k') | Source/modules/device_orientation/DeviceOrientationInspectorAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698