Index: webkit/compositor_bindings/web_image_layer_impl.cc |
diff --git a/webkit/compositor_bindings/web_image_layer_impl.cc b/webkit/compositor_bindings/web_image_layer_impl.cc |
index 7ec67446e4d3b39570ce951292306a6a61e5a071..a4210c0a630442d1e0dce45e5145636d94e353e9 100644 |
--- a/webkit/compositor_bindings/web_image_layer_impl.cc |
+++ b/webkit/compositor_bindings/web_image_layer_impl.cc |
@@ -15,7 +15,7 @@ static bool usingPictureLayer() { |
return cc::switches::IsImplSidePaintingEnabled(); |
} |
-namespace WebKit { |
+namespace webkit { |
WebImageLayerImpl::WebImageLayerImpl() { |
if (usingPictureLayer()) |
@@ -26,14 +26,16 @@ WebImageLayerImpl::WebImageLayerImpl() { |
WebImageLayerImpl::~WebImageLayerImpl() {} |
-WebLayer* WebImageLayerImpl::layer() { return layer_.get(); } |
+WebKit::WebLayer* WebImageLayerImpl::layer() { return layer_.get(); } |
void WebImageLayerImpl::setBitmap(SkBitmap bitmap) { |
if (usingPictureLayer()) { |
static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap); |
- static_cast<WebLayerImplFixedBounds*>(layer_.get())->SetFixedBounds(gfx::Size(bitmap.width(), bitmap.height())); |
- } else |
+ static_cast<WebLayerImplFixedBounds*>(layer_.get())->SetFixedBounds( |
+ gfx::Size(bitmap.width(), bitmap.height())); |
+ } else { |
static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap); |
+ } |
} |
-} // namespace WebKit |
+} // namespace webkit |