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

Unified Diff: third_party/WebKit/Source/web/mac/WebSubstringUtil.mm

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/web/mac/WebSubstringUtil.mm
diff --git a/third_party/WebKit/Source/web/mac/WebSubstringUtil.mm b/third_party/WebKit/Source/web/mac/WebSubstringUtil.mm
index 34ef2bc13b4a02432336c36f36fdce6f19c89dde..8fc93a811d2527eafeca2a09db18d9badceb0745 100644
--- a/third_party/WebKit/Source/web/mac/WebSubstringUtil.mm
+++ b/third_party/WebKit/Source/web/mac/WebSubstringUtil.mm
@@ -41,13 +41,13 @@
#include "core/editing/FrameSelection.h"
#include "core/editing/PlainTextRange.h"
#include "core/editing/iterators/TextIterator.h"
-#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
#include "core/frame/VisualViewport.h"
#include "core/html/HTMLElement.h"
#include "core/layout/HitTestResult.h"
#include "core/layout/LayoutObject.h"
+#include "core/page/PAge.h"
#include "core/style/ComputedStyle.h"
#include "platform/fonts/Font.h"
#include "platform/mac/ColorMac.h"
@@ -179,7 +179,7 @@ NSAttributedString* WebSubstringUtil::attributedWordAtPoint(
// Convert to NSAttributedString.
NSAttributedString* string = attributedSubstringFromRange(
- wordRange, frame->host()->visualViewport().scale());
+ wordRange, frame->page()->visualViewport().scale());
baselinePoint = getBaselinePoint(frame->view(), wordRange, string);
return string;
}
@@ -210,7 +210,7 @@ NSAttributedString* WebSubstringUtil::attributedSubstringInRange(
return nil;
NSAttributedString* result = attributedSubstringFromRange(
- ephemeralRange, frame->host()->visualViewport().scale());
+ ephemeralRange, frame->page()->visualViewport().scale());
if (baselinePoint)
*baselinePoint = getBaselinePoint(frame->view(), ephemeralRange, result);
return result;
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.cpp ('k') | third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698