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 6360 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);
 
+class LayerTreeHostTestPaintedDeviceScaleFactor : public LayerTreeHostTest {
+  class PaintedScaleSwapPromise : public SwapPromise {
+   public:
+    PaintedScaleSwapPromise() {}
+    ~PaintedScaleSwapPromise() override {}
+    void DidActivate() override {}
+    void DidSwap(CompositorFrameMetadata* metadata) override {
+      EXPECT_EQ(2.0f, metadata->device_scale_factor);

[enne (OOO), 2015/10/23 21:21:25]

Maybe include a device scale factor on the compositor here too, just for
completeness?

[oshima, 2015/10/23 22:05:02]

I added additional check in SwapBuffersOnThread.

+    }
+    void DidNotSwap(DidNotSwapReason reason) override {}
+    int64 TraceId() const override { return 0; }
+  };
+
+ protected:
+  void BeginTest() override {
+    layer_tree_host()->SetPaintedDeviceScaleFactor(2.0f);
+    EXPECT_EQ(1.0f, layer_tree_host()->device_scale_factor());
+    PostSetNeedsCommitToMainThread();
+  }
+
+  void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
+    int frame = host_impl->active_tree()->source_frame_number();
+    if (frame == -1) {
+      host_impl->active_tree()->QueuePinnedSwapPromise(
+          make_scoped_ptr(new PaintedScaleSwapPromise()));
+    }
+  }
+
+  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
+    EndTest();
+  }
+
+  void AfterTest() override {}
+};
+
+MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);
+
 }  // namespace
 }  // namespace cc