diff options
-rw-r--r-- | cc/blink/web_layer_impl.cc | 4 | ||||
-rw-r--r-- | cc/blink/web_layer_impl.h | 2 | ||||
-rw-r--r-- | cc/blink/web_layer_impl_fixed_bounds.cc | 6 | ||||
-rw-r--r-- | cc/blink/web_layer_impl_fixed_bounds.h | 14 |
4 files changed, 7 insertions, 19 deletions
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc index e638ae4..b4b9f29 100644 --- a/cc/blink/web_layer_impl.cc +++ b/cc/blink/web_layer_impl.cc @@ -77,10 +77,6 @@ int WebLayerImpl::id() const { return layer_->id(); } -void WebLayerImpl::invalidateRect(const blink::WebFloatRect& rect) { - layer_->SetNeedsDisplayRect(gfx::ToEnclosingRect(rect)); -} - void WebLayerImpl::invalidateRect(const blink::WebRect& rect) { layer_->SetNeedsDisplayRect(rect); } diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index 0a5cd12..cc94344 100644 --- a/cc/blink/web_layer_impl.h +++ b/cc/blink/web_layer_impl.h @@ -57,8 +57,6 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { // WebLayer implementation. virtual int id() const; - // TODO(danakj): Remove WebFloatRect version. - virtual void invalidateRect(const blink::WebFloatRect&); virtual void invalidateRect(const blink::WebRect&); virtual void invalidate(); virtual void addChild(blink::WebLayer* child); diff --git a/cc/blink/web_layer_impl_fixed_bounds.cc b/cc/blink/web_layer_impl_fixed_bounds.cc index e9e11c1..e7ecb34 100644 --- a/cc/blink/web_layer_impl_fixed_bounds.cc +++ b/cc/blink/web_layer_impl_fixed_bounds.cc @@ -23,12 +23,6 @@ WebLayerImplFixedBounds::WebLayerImplFixedBounds(scoped_refptr<Layer> layer) WebLayerImplFixedBounds::~WebLayerImplFixedBounds() { } -void WebLayerImplFixedBounds::invalidateRect(const blink::WebFloatRect& rect) { - // Partial invalidations seldom occur for such layers. - // Simply invalidate the whole layer to avoid transformation of coordinates. - invalidate(); -} - void WebLayerImplFixedBounds::invalidateRect(const blink::WebRect& rect) { // Partial invalidations seldom occur for such layers. // Simply invalidate the whole layer to avoid transformation of coordinates. diff --git a/cc/blink/web_layer_impl_fixed_bounds.h b/cc/blink/web_layer_impl_fixed_bounds.h index 52f54cf..907975a 100644 --- a/cc/blink/web_layer_impl_fixed_bounds.h +++ b/cc/blink/web_layer_impl_fixed_bounds.h @@ -19,18 +19,18 @@ namespace cc_blink { class WebLayerImplFixedBounds : public WebLayerImpl { public: CC_BLINK_EXPORT WebLayerImplFixedBounds(); - CC_BLINK_EXPORT explicit WebLayerImplFixedBounds(scoped_refptr<cc::Layer>); + CC_BLINK_EXPORT explicit WebLayerImplFixedBounds( + scoped_refptr<cc::Layer> layer); virtual ~WebLayerImplFixedBounds(); // WebLayerImpl overrides. - virtual void invalidateRect(const blink::WebFloatRect& rect) override; virtual void invalidateRect(const blink::WebRect& rect) override; virtual void setTransformOrigin( - const blink::WebFloatPoint3D& transform_origin); - virtual void setBounds(const blink::WebSize& bounds); - virtual blink::WebSize bounds() const; - virtual void setTransform(const SkMatrix44& transform); - virtual SkMatrix44 transform() const; + const blink::WebFloatPoint3D& transform_origin) override; + virtual void setBounds(const blink::WebSize& bounds) override; + virtual blink::WebSize bounds() const override; + virtual void setTransform(const SkMatrix44& transform) override; + virtual SkMatrix44 transform() const override; CC_BLINK_EXPORT void SetFixedBounds(gfx::Size bounds); |