Commit f03d7b70 authored by lfg@chromium.org's avatar lfg@chromium.org

Propagate the correct device scale factor into the RemoteFrame.

BUG=522237, 493262

Review URL: https://codereview.chromium.org/1312903017

git-svn-id: svn://svn.chromium.org/blink/trunk@201936 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent c3e3000b
...@@ -755,12 +755,9 @@ void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const ...@@ -755,12 +755,9 @@ void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const
ASSERT(source); ASSERT(source);
WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source); WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source);
// TODO(bokan): The scale_factor argument here used to be the now-removed
// FrameView::visibleContentScaleFactor but the callee uses this parameter
// to set the device scale factor. crbug.com/493262
client()->initializeChildFrame( client()->initializeChildFrame(
localFrameImpl->frame()->view()->frameRect(), localFrameImpl->frame()->view()->frameRect(),
1); localFrameImpl->frame()->page()->deviceScaleFactor());
} }
void WebRemoteFrameImpl::setReplicatedOrigin(const WebSecurityOrigin& origin) const void WebRemoteFrameImpl::setReplicatedOrigin(const WebSecurityOrigin& origin) const
......
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
// out of process. // out of process.
virtual void initializeChildFrame( virtual void initializeChildFrame(
const WebRect& frameRect, const WebRect& frameRect,
float scaleFactor) { } float deviceScaleFactor) { }
// A remote frame was asked to start a navigation. // A remote frame was asked to start a navigation.
virtual void navigate(const WebURLRequest& request, bool shouldReplaceCurrentEntry) { } virtual void navigate(const WebURLRequest& request, bool shouldReplaceCurrentEntry) { }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment