Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / cc / layers / contents_scaling_layer.cc

diff --git a/src/cc/layers/contents_scaling_layer.cc b/src/cc/layers/contents_scaling_layer.cc
index 44a3f37..5811bdc 100644 (file)
--- a/src/cc/layers/contents_scaling_layer.cc
+++ b/src/cc/layers/contents_scaling_layer.cc
@@ -22,9 +22,6 @@ ContentsScalingLayer::~ContentsScalingLayer() {
 
 void ContentsScalingLayer::CalculateContentsScale(
     float ideal_contents_scale,
-    float device_scale_factor,
-    float page_scale_factor,
-    bool animating_transform_to_screen,
     float* contents_scale_x,
     float* contents_scale_y,
     gfx::Size* content_bounds) {
@@ -35,9 +32,8 @@ void ContentsScalingLayer::CalculateContentsScale(
       ideal_contents_scale);
 }
 
-bool ContentsScalingLayer::Update(
-    ResourceUpdateQueue* queue,
-    const OcclusionTracker* occlusion) {
+bool ContentsScalingLayer::Update(ResourceUpdateQueue* queue,
+                                  const OcclusionTracker<Layer>* occlusion) {
   bool updated = Layer::Update(queue, occlusion);
 
   if (draw_properties().contents_scale_x == last_update_contents_scale_x_ &&