Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(466)

Unified Diff: webkit/compositor_bindings/web_image_layer_impl.cc

Issue 12496013: Move compositor bindings implementations out of WebKit::, fix style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 40c2213b73543881f772e353d21db8903b8f7c00..15c3a79737f7e5daf41ee7cad8a8a5c6999da3b2 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

Powered by Google App Engine
This is Rietveld 408576698