Index: webkit/compositor_bindings/web_layer_impl_fixed_bounds.cc |
diff --git a/webkit/compositor_bindings/web_layer_impl_fixed_bounds.cc b/webkit/compositor_bindings/web_layer_impl_fixed_bounds.cc |
index 0999dffb23327d79a654c5e77cf9960144ed56d3..7804da3c96626fb19e1b57471848475a36901093 100644 |
--- a/webkit/compositor_bindings/web_layer_impl_fixed_bounds.cc |
+++ b/webkit/compositor_bindings/web_layer_impl_fixed_bounds.cc |
@@ -11,7 +11,7 @@ |
using cc::Layer; |
-namespace WebKit { |
+namespace webkit { |
WebLayerImplFixedBounds::WebLayerImplFixedBounds() { |
} |
@@ -24,28 +24,28 @@ WebLayerImplFixedBounds::WebLayerImplFixedBounds(scoped_refptr<Layer> layer) |
WebLayerImplFixedBounds::~WebLayerImplFixedBounds() { |
} |
-void WebLayerImplFixedBounds::invalidateRect(const WebFloatRect& rect) { |
+void WebLayerImplFixedBounds::invalidateRect(const WebKit::WebFloatRect& rect) { |
// Partial invalidations seldom occur for such layers. |
// Simply invalidate the whole layer to avoid transformation of coordinates. |
invalidate(); |
} |
void WebLayerImplFixedBounds::setAnchorPoint( |
- const WebFloatPoint& anchor_point) { |
+ const WebKit::WebFloatPoint& anchor_point) { |
if (anchor_point != this->anchorPoint()) { |
layer_->SetAnchorPoint(anchor_point); |
UpdateLayerBoundsAndTransform(); |
} |
} |
-void WebLayerImplFixedBounds::setBounds(const WebSize& bounds) { |
+void WebLayerImplFixedBounds::setBounds(const WebKit::WebSize& bounds) { |
if (original_bounds_ != gfx::Size(bounds)) { |
original_bounds_ = bounds; |
UpdateLayerBoundsAndTransform(); |
} |
} |
-WebSize WebLayerImplFixedBounds::bounds() const { |
+WebKit::WebSize WebLayerImplFixedBounds::bounds() const { |
return original_bounds_; |
} |
@@ -69,7 +69,7 @@ SkMatrix44 WebLayerImplFixedBounds::transform() const { |
return original_transform_.matrix(); |
} |
-void WebLayerImplFixedBounds::SetFixedBounds(const gfx::Size& fixed_bounds) { |
+void WebLayerImplFixedBounds::SetFixedBounds(gfx::Size fixed_bounds) { |
if (fixed_bounds_ != fixed_bounds) { |
fixed_bounds_ = fixed_bounds; |
UpdateLayerBoundsAndTransform(); |
@@ -92,8 +92,7 @@ void WebLayerImplFixedBounds::SetTransformInternal( |
} |
} |
-void WebLayerImplFixedBounds::UpdateLayerBoundsAndTransform() |
-{ |
+void WebLayerImplFixedBounds::UpdateLayerBoundsAndTransform() { |
if (fixed_bounds_.IsEmpty() || original_bounds_.IsEmpty() || |
fixed_bounds_ == original_bounds_ || |
// For now fall back to non-fixed bounds for non-zero anchor point. |
@@ -126,4 +125,4 @@ void WebLayerImplFixedBounds::UpdateLayerBoundsAndTransform() |
layer_->SetSublayerTransform(sublayer_transform_with_inverse_bounds_scale); |
} |
-} // namespace WebKit |
+} // namespace WebKit |