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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorPageAgent.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/inspector/InspectorPageAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
index d23a4eda104c2ad00304dabccf3fc6f144dcb76f..ed029a03a510098f54142adea253964c333d648c 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
@@ -30,13 +30,13 @@
#include "core/inspector/InspectorPageAgent.h"
+#include <memory>
#include "bindings/core/v8/DOMWrapperWorld.h"
#include "bindings/core/v8/ScriptController.h"
#include "bindings/core/v8/ScriptRegexp.h"
#include "core/HTMLNames.h"
#include "core/dom/DOMImplementation.h"
#include "core/dom/Document.h"
-#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
#include "core/frame/Settings.h"
@@ -57,6 +57,7 @@
#include "core/loader/FrameLoader.h"
#include "core/loader/resource/CSSStyleSheetResource.h"
#include "core/loader/resource/ScriptResource.h"
+#include "core/page/Page.h"
#include "platform/PlatformResourceLoader.h"
#include "platform/UserGestureIndicator.h"
#include "platform/loader/fetch/MemoryCache.h"
@@ -69,7 +70,6 @@
#include "wtf/Vector.h"
#include "wtf/text/Base64.h"
#include "wtf/text/TextEncoding.h"
-#include <memory>
namespace blink {
@@ -865,7 +865,7 @@ Response InspectorPageAgent::getLayoutMetrics(
std::unique_ptr<protocol::Page::VisualViewport>* outVisualViewport,
std::unique_ptr<protocol::DOM::Rect>* outContentSize) {
LocalFrame* mainFrame = m_inspectedFrames->root();
- VisualViewport& visualViewport = mainFrame->host()->visualViewport();
+ VisualViewport& visualViewport = mainFrame->page()->visualViewport();
mainFrame->document()->updateStyleAndLayoutIgnorePendingStylesheets();

Powered by Google App Engine
This is Rietveld 408576698