third_party/WebKit/Source/core/frame/LocalFrame.cpp - Issue 1996223003: Mark FrameHost::deviceScaleFactor as deprecated.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 1996223003: Mark FrameHost::deviceScaleFactor as deprecated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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:

Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp

diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

index ec75129d3b2132a38e583588cbfb369498075499..7c3d3c8fdbab02ea6d53147203d2a73ede7daee6 100644

--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp

+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

@@ -109,8 +109,8 @@ public:

{

if (m_draggedNode && m_draggedNode->layoutObject())

m_draggedNode->layoutObject()->updateDragState(true);

+ float deviceScaleFactor = m_localFrame->host()->chromeClient().screenInfo().deviceScaleFactor;

- float deviceScaleFactor = m_localFrame->host()->deviceScaleFactor();

m_bounds.setWidth(m_bounds.width() * deviceScaleFactor);

m_bounds.setHeight(m_bounds.height() * deviceScaleFactor);

m_pictureBuilder = adoptPtr(new SkPictureBuilder(SkRect::MakeIWH(m_bounds.width(), m_bounds.height())));

@@ -606,7 +606,7 @@ double LocalFrame::devicePixelRatio() const

if (!m_host)

return 0;

- double ratio = m_host->deviceScaleFactor();

+ double ratio = m_host->deviceScaleFactorDeprecated();

ratio *= pageZoomFactor();

return ratio;

}