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

Unified Diff: third_party/WebKit/Source/core/testing/Internals.cpp

Issue 2730573003: Moved FrameHost::m_visualViewport to Page (Closed)
Patch Set: Fixed some compile errors on mac and android Created 3 years, 9 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: third_party/WebKit/Source/core/testing/Internals.cpp
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
index 11e72f6f4cdc1b121cf9d378720bd78fcc7060a3..7d85b339fad0e311fb59ed8b1fd591c0326d02d7 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -2260,7 +2260,7 @@ float Internals::pageScaleFactor(ExceptionState& exceptionState) {
return 0;
}
Page* page = m_document->page();
- return page->frameHost().visualViewport().pageScale();
+ return page->visualViewport().pageScale();
}
void Internals::setPageScaleFactor(float scaleFactor,
@@ -2273,7 +2273,7 @@ void Internals::setPageScaleFactor(float scaleFactor,
return;
}
Page* page = m_document->page();
- page->frameHost().visualViewport().setScale(scaleFactor);
+ page->visualViewport().setScale(scaleFactor);
}
void Internals::setPageScaleFactorLimits(float minScaleFactor,
@@ -2293,7 +2293,7 @@ bool Internals::magnifyScaleAroundAnchor(float scaleFactor, float x, float y) {
if (!frame())
return false;
- return frame()->host()->visualViewport().magnifyScaleAroundAnchor(
+ return frame()->page()->visualViewport().magnifyScaleAroundAnchor(
scaleFactor, FloatPoint(x, y));
}
@@ -3072,14 +3072,14 @@ void Internals::setVisualViewportOffset(int x, int y) {
if (!frame())
return;
- frame()->host()->visualViewport().setLocation(FloatPoint(x, y));
+ frame()->page()->visualViewport().setLocation(FloatPoint(x, y));
}
int Internals::visualViewportHeight() {
if (!frame())
return 0;
- return expandedIntSize(frame()->host()->visualViewport().visibleRect().size())
+ return expandedIntSize(frame()->page()->visualViewport().visibleRect().size())
.height();
}
@@ -3087,7 +3087,7 @@ int Internals::visualViewportWidth() {
if (!frame())
return 0;
- return expandedIntSize(frame()->host()->visualViewport().visibleRect().size())
+ return expandedIntSize(frame()->page()->visualViewport().visibleRect().size())
.width();
}
« no previous file with comments | « third_party/WebKit/Source/core/testing/DummyPageHolder.cpp ('k') | third_party/WebKit/Source/web/DevToolsEmulator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698