summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2016-02-27 21:42:57 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-28 05:44:28 +0000
commit131114a6dd70fabb949d7f05f3c9759bcf701281 (patch)
treecc781337cc01f3c7e9c76b4c4b1b2f321b93accd
parentb072291233b54ac5a731c8c44db09ed4cb59cbe2 (diff)
downloadchromium_src-131114a6dd70fabb949d7f05f3c9759bcf701281.zip
chromium_src-131114a6dd70fabb949d7f05f3c9759bcf701281.tar.gz
chromium_src-131114a6dd70fabb949d7f05f3c9759bcf701281.tar.bz2
Pepper uses DIP, so RWFullscreenPepper should always use SetDeviceScaleFctor.
RenderWidget::OnDeviceScaleFactorChanegd calls setPaintedDeviceScaleFactor, which does not work for pepper. I apparently forgot to handle this in https://codereview.chromium.org/1609193002. BUG=589869,485650 Review URL: https://codereview.chromium.org/1745523002 Cr-Commit-Position: refs/heads/master@{#378153}
-rw-r--r--content/renderer/render_widget_fullscreen_pepper.cc6
-rw-r--r--content/renderer/render_widget_fullscreen_pepper.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index e751afd..d75b279 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -384,11 +384,9 @@ GURL RenderWidgetFullscreenPepper::GetURLForGraphicsContext3D() {
return active_url_;
}
-void RenderWidgetFullscreenPepper::SetDeviceScaleFactor(
- float device_scale_factor) {
- RenderWidget::SetDeviceScaleFactor(device_scale_factor);
+void RenderWidgetFullscreenPepper::OnDeviceScaleFactorChanged() {
if (compositor_)
- compositor_->setDeviceScaleFactor(device_scale_factor);
+ compositor_->setDeviceScaleFactor(device_scale_factor_);
}
} // namespace content
diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h
index 77445e4..c3c9308 100644
--- a/content/renderer/render_widget_fullscreen_pepper.h
+++ b/content/renderer/render_widget_fullscreen_pepper.h
@@ -71,7 +71,7 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
// RenderWidget overrides.
GURL GetURLForGraphicsContext3D() override;
- void SetDeviceScaleFactor(float device_scale_factor) override;
+ void OnDeviceScaleFactorChanged() override;
private:
// URL that is responsible for this widget, passed to ggl::CreateViewContext.