diff options
| author | oshima <oshima@chromium.org> | 2016-03-04 05:26:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-04 13:27:34 +0000 |
| commit | 50872a70a931c93798061e5976b86499123fa1d0 (patch) | |
| tree | aee1df04a42a7b129c9517d5964f83102a64ad72 /content/renderer/gpu/render_widget_compositor.h | |
| parent | 989441be7a61fba9338e74302b7f45ac30226cc7 (diff) | |
| download | chromium_src-50872a70a931c93798061e5976b86499123fa1d0.zip chromium_src-50872a70a931c93798061e5976b86499123fa1d0.tar.gz chromium_src-50872a70a931c93798061e5976b86499123fa1d0.tar.bz2 | |
Handle emulated device scale factor and original device scale factor properly in use-zoom-for-dsf mode.
* The zoom level is set to the original device scale factor (m_compositorDeviceScaleFactorOverride).
* Sets the page's dsf to emulated dsf / original dsf so that device pixel ratio becomes emulated dsf.
* Explicitly call ScreenMetricsEmuation::Apply so that RenderWidget can tell if it's in emulation mode.
* Remove DevToolsHost.convertLengthForEmbedder because it's no longer necessary.
BUG=584709
TEST=RenderViewImplScaleFactorTest.ScreenMetricsEmulation*
(existing ScreenMetricsEmulation has been migrated to RenderViewImplScakeFactirTest.ScreenMetricsEmulationWithOriginalDSF1)
also tested manually
Review URL: https://codereview.chromium.org/1737733002
Cr-Commit-Position: refs/heads/master@{#379277}
Diffstat (limited to 'content/renderer/gpu/render_widget_compositor.h')
| -rw-r--r-- | content/renderer/gpu/render_widget_compositor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index ab2c72d..aacbfac 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h @@ -192,6 +192,8 @@ class CONTENT_EXPORT RenderWidgetCompositor }; protected: + friend class RenderViewImplScaleFactorTest; + RenderWidgetCompositor(RenderWidgetCompositorDelegate* delegate, CompositorDependencies* compositor_deps); |