Make zoom filter independent of the layer size.

ui/compositor/layer.cc

 // Copyright (c) 2012 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 "ui/compositor/layer.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 40 matching lines @@
       force_render_surface_(false),
       fills_bounds_opaquely_(true),
       layer_updated_externally_(false),
       background_blur_radius_(0),
       layer_saturation_(0.0f),
       layer_brightness_(0.0f),
       layer_grayscale_(0.0f),
       layer_inverted_(false),
       layer_mask_(NULL),
       layer_mask_back_link_(NULL),
-      zoom_x_offset_(0),
-      zoom_y_offset_(0),
       zoom_(1),
       zoom_inset_(0),
       delegate_(NULL),
       cc_layer_(NULL),
       scale_content_(true),
       device_scale_factor_(1.0f) {
   CreateWebLayer();
 }
 
 Layer::Layer(LayerType type)
     : type_(type),
       compositor_(NULL),
       parent_(NULL),
       visible_(true),
       is_drawn_(true),
       force_render_surface_(false),
       fills_bounds_opaquely_(true),
       layer_updated_externally_(false),
       background_blur_radius_(0),
       layer_saturation_(0.0f),
       layer_brightness_(0.0f),
       layer_grayscale_(0.0f),
       layer_inverted_(false),
       layer_mask_(NULL),
       layer_mask_back_link_(NULL),
-      zoom_x_offset_(0),
-      zoom_y_offset_(0),
       zoom_(1),
       zoom_inset_(0),
       delegate_(NULL),
       scale_content_(true),
       device_scale_factor_(1.0f) {
   CreateWebLayer();
 }
 
 Layer::~Layer() {
   // Destroying the animator may cause observers to use the layer (and
@@ skipping 202 matching lines @@
   cc_layer_->SetMaskLayer(
       layer_mask ? layer_mask->cc_layer() : NULL);
   // We need to reference the linked object so that it can properly break the
   // link to us when it gets deleted.
   if (layer_mask) {
     layer_mask->layer_mask_back_link_ = this;
     layer_mask->OnDeviceScaleFactorChanged(device_scale_factor_);
   }
 }
 
-void Layer::SetBackgroundZoom(float x_offset,
-                              float y_offset,
-                              float zoom,
-                              int inset) {
-  zoom_x_offset_ = x_offset;
-  zoom_y_offset_ = y_offset;
+void Layer::SetBackgroundZoom(float zoom, int inset) {
   zoom_ = zoom;
   zoom_inset_ = inset;
 
   SetLayerBackgroundFilters();
 }
 
 void Layer::SetLayerFilters() {
   WebKit::WebFilterOperations filters;
   if (layer_saturation_) {
     filters.append(WebKit::WebFilterOperation::createSaturateFilter(
@@ skipping 12 matching lines @@
     filters.append(WebKit::WebFilterOperation::createSaturatingBrightnessFilter(
         layer_brightness_));
   }
 
   cc_layer_->SetFilters(filters);
 }
 
 void Layer::SetLayerBackgroundFilters() {
   WebKit::WebFilterOperations filters;
   if (zoom_ != 1) {
-    filters.append(WebKit::WebFilterOperation::createZoomFilter(
-        WebKit::WebRect(zoom_x_offset_, zoom_y_offset_,
-                        (GetTargetBounds().width() / zoom_),
-                        (GetTargetBounds().height() / zoom_)),
-        zoom_inset_));
+#ifdef NEW_ZOOM_FILTER // TODO(danakj): Remove this when WebKit rolls.
+    filters.append(WebKit::WebFilterOperation::createZoomFilter(zoom_,
+                                                                zoom_inset_));
+#endif
   }
 
   if (background_blur_radius_) {
     filters.append(WebKit::WebFilterOperation::createBlurFilter(
         background_blur_radius_));
   }
 
   cc_layer_->SetBackgroundFilters(filters);
 }
 
@@ skipping 546 matching lines @@
     texture_layer_->setUV(uv_top_left, uv_bottom_right);
   } else if (delegated_renderer_layer_.get()) {
     delegated_renderer_layer_->SetDisplaySize(
         ConvertSizeToPixel(this, delegated_frame_size_in_dip_));
     size.ClampToMax(delegated_frame_size_in_dip_);
   }
   cc_layer_->SetBounds(ConvertSizeToPixel(this, size));
 }
 
 }  // namespace ui