Chromium Code Reviews| 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 ebd255b75ec08cb74b64de95990fae3ca233ed1e..beae6dbebe2a6cf950ca2ac67241cdc2203e69cc 100644 |
| --- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp |
| +++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp |
| @@ -57,6 +57,7 @@ |
| #include "core/loader/FrameLoadRequest.h" |
| #include "core/loader/FrameLoaderClient.h" |
| #include "core/loader/NavigationScheduler.h" |
| +#include "core/page/ChromeClient.h" |
| #include "core/page/FocusController.h" |
| #include "core/page/Page.h" |
| #include "core/page/scrolling/ScrollingCoordinator.h" |
| @@ -76,6 +77,7 @@ |
| #include "platform/graphics/paint/TransformDisplayItem.h" |
| #include "platform/text/TextStream.h" |
| #include "public/platform/WebFrameScheduler.h" |
| +#include "public/platform/WebScreenInfo.h" |
| #include "public/platform/WebSecurityOrigin.h" |
| #include "public/platform/WebViewScheduler.h" |
| #include "third_party/skia/include/core/SkImage.h" |
| @@ -129,8 +131,10 @@ public: |
| RespectImageOrientationEnum imageOrientation = DoNotRespectImageOrientation; |
| if (m_draggedNode && m_draggedNode->layoutObject()) |
| imageOrientation = LayoutObject::shouldRespectImageOrientation(m_draggedNode->layoutObject()); |
| - return DragImage::create(image.get(), imageOrientation, |
| - m_localFrame->host()->deviceScaleFactor(), InterpolationHigh, m_opacity); |
| + |
| + float screenDeviceScaleFactor = m_localFrame->page()->chromeClient().screenInfo().deviceScaleFactor; |
|
dcheng
2016/01/20 22:48:11
When should code use FrameHost::deviceScaleFactor(
oshima
2016/01/20 23:25:31
The code above (that uses FrameHost::deviceScaleFa
|
| + |
| + return DragImage::create(image.get(), imageOrientation, screenDeviceScaleFactor, InterpolationHigh, m_opacity); |
| } |
| private: |