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

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

Issue 1605143003: [UseZoomForDSF] Support drag&drop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: guest view support Created 4 years, 11 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
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/Source/core/page/DragController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
+
+ return DragImage::create(image.get(), imageOrientation, screenDeviceScaleFactor, InterpolationHigh, m_opacity);
}
private:
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/Source/core/page/DragController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698