Introduce painted-device-scale-factor and use it when --enable-use-zoom-for-dsf is specified.

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 17 matching lines @@
 #include "cc/output/swap_promise.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/io_surface_draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_display_list_recording_source.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_output_surface_client.h"

[danakj, 2015/10/24 00:08:07]

not needed?

[oshima, 2015/10/27 20:28:09]

Done.

 #include "cc/test/fake_painted_scrollbar_layer.h"
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/fake_picture_layer_impl.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/fake_scoped_ui_resource.h"
 #include "cc/test/fake_video_frame_provider.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_web_graphics_context_3d.h"
@@ skipping 6323 matching lines @@
     // that this works correctly and the output surface is destroyed on
     // the correct thread.
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestDestroyWhileInitializingOutputSurface);
 
+// Makes sure that painted_device_scale_factor is propagated to the
+// frame's metadata.
+class LayerTreeHostTestPaintedDeviceScaleFactor : public LayerTreeHostTest {
+ protected:
+  void BeginTest() override {
+    layer_tree_host()->SetPaintedDeviceScaleFactor(2.0f);
+    EXPECT_EQ(1.0f, layer_tree_host()->device_scale_factor());
+    PostSetNeedsCommitToMainThread();
+  }
+
+  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
+    EXPECT_EQ(2.0f,

[danakj, 2015/10/24 00:07:00]

Great, thanks. The cc parts LGTM

+              output_surface()->last_sent_frame().metadata.device_scale_factor);
+    EXPECT_EQ(2.0f, host_impl->active_tree()->painted_device_scale_factor());
+    EXPECT_EQ(1.0f, host_impl->active_tree()->device_scale_factor());
+    EndTest();
+  }
+
+  void AfterTest() override {}
+};
+
+MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);

[danakj, 2015/10/24 00:08:07]

Why is it MULTI only and not SINGLE_AND_MULTI?

[oshima, 2015/10/27 20:28:09]

Done.

+
 }  // namespace
 }  // namespace cc