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

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 23364004: Implementation of device metrics emulation in render view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Style Created 7 years, 3 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
Index: content/renderer/gpu/render_widget_compositor.cc
===================================================================
--- content/renderer/gpu/render_widget_compositor.cc (revision 221161)
+++ content/renderer/gpu/render_widget_compositor.cc (working copy)
@@ -299,7 +299,8 @@
bool threaded)
: threaded_(threaded),
suppress_schedule_composite_(false),
- widget_(widget) {
+ widget_(widget),
+ saved_device_scale_factor_(0.f) {
}
RenderWidgetCompositor::~RenderWidgetCompositor() {}
@@ -421,9 +422,22 @@
}
void RenderWidgetCompositor::setDeviceScaleFactor(float device_scale) {
- layer_tree_host_->SetDeviceScaleFactor(device_scale);
+ if (saved_device_scale_factor_)
+ saved_device_scale_factor_ = device_scale;
+ else
+ layer_tree_host_->SetDeviceScaleFactor(device_scale);
}
+void RenderWidgetCompositor::OverrideDeviceScaleFactor(float device_scale) {
+ if (device_scale) {
+ saved_device_scale_factor_ = deviceScaleFactor();
+ layer_tree_host_->SetDeviceScaleFactor(device_scale);
+ } else {
+ layer_tree_host_->SetDeviceScaleFactor(saved_device_scale_factor_);
+ saved_device_scale_factor_ = 0.f;
+ }
+}
+
float RenderWidgetCompositor::deviceScaleFactor() const {
return layer_tree_host_->device_scale_factor();
}

Powered by Google App Engine
This is Rietveld 408576698