Make ui::Layer use the cc:LayerTreeHost scale factor directly

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 3cc7aa814cab4a43b1d30792b4ec54308f0669f3..2b0d9138361dd46eabb0dbe199716c63c2256f3e 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -241,12 +241,6 @@ class COMPOSITOR_EXPORT Layer
   bool GetTargetTransformRelativeTo(const Layer* ancestor,
                                     gfx::Transform* transform) const;
 
-  // Converts a ui::Layer's transform to the transform on the corresponding
-  // cc::Layer.
-  static gfx::Transform ConvertTransformToCCTransform(
-      const gfx::Transform& transform,
-      float device_scale_factor);
-
   // See description in View for details
   void SetFillsBoundsOpaquely(bool fills_bounds_opaquely);
   bool fills_bounds_opaquely() const { return fills_bounds_opaquely_; }
@@ -299,17 +293,6 @@ class COMPOSITOR_EXPORT Layer
   // Notifies the layer that the device scale factor has changed.
   void OnDeviceScaleFactorChanged(float device_scale_factor);
 
-  // Sets whether the layer should scale its content. If true, the canvas will
-  // be scaled in software rendering mode before it is passed to
-  // |LayerDelegate::OnPaintLayer|.
-  // Set to false if the delegate handles scaling.
-  // NOTE: if this is called during |LayerDelegate::OnPaint|, the new value will
-  // not apply to the canvas passed to the pending draw.
-  void set_scale_content(bool scale_content) { scale_content_ = scale_content; }
-
-  // Returns true if the layer scales its content.
-  bool scale_content() const { return scale_content_; }
-
   // Requets a copy of the layer's output as a texture or bitmap.
   void RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request);
 
@@ -388,7 +371,6 @@ class COMPOSITOR_EXPORT Layer
   void CreateWebLayer();
 
   // Recomputes and sets to |cc_layer_|.
-  void RecomputeCCTransformFromTransform(const gfx::Transform& transform);
   void RecomputeDrawsContentAndUVRect();
   void RecomputePosition();
 
@@ -476,10 +458,6 @@ class COMPOSITOR_EXPORT Layer
   scoped_refptr<cc::DelegatedRendererLayer> delegated_renderer_layer_;
   cc::Layer* cc_layer_;
 
-  // If true, the layer scales the canvas and the texture with the device scale
-  // factor as apporpriate. When true, the texture size is in DIP.
-  bool scale_content_;
-
   // A cached copy of |Compositor::device_scale_factor()|.
   float device_scale_factor_;