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

Unified Diff: webkit/compositor_bindings/web_content_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: rebased 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_content_layer_impl.cc
diff --git a/webkit/compositor_bindings/web_content_layer_impl.cc b/webkit/compositor_bindings/web_content_layer_impl.cc
index e9a66c15fff5bc0e4e095548641a94f2c02edc07..6503a89e962d711728fa39007162702101a0c546 100644
--- a/webkit/compositor_bindings/web_content_layer_impl.cc
+++ b/webkit/compositor_bindings/web_content_layer_impl.cc
@@ -15,15 +15,16 @@
#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
#include "third_party/skia/include/utils/SkMatrix44.h"
-using namespace cc;
+using cc::ContentLayer;
+using cc::PictureLayer;
-namespace WebKit {
+namespace webkit {
static bool usingPictureLayer() {
return cc::switches::IsImplSidePaintingEnabled();
}
-WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client)
+WebContentLayerImpl::WebContentLayerImpl(WebKit::WebContentLayerClient* client)
: client_(client) {
if (usingPictureLayer())
layer_ = make_scoped_ptr(new WebLayerImpl(PictureLayer::Create(this)));
@@ -39,7 +40,7 @@ WebContentLayerImpl::~WebContentLayerImpl() {
static_cast<ContentLayer*>(layer_->layer())->ClearClient();
}
-WebLayer* WebContentLayerImpl::layer() { return layer_.get(); }
+WebKit::WebLayer* WebContentLayerImpl::layer() { return layer_.get(); }
void WebContentLayerImpl::setDoubleSided(bool double_sided) {
layer_->layer()->SetDoubleSided(double_sided);
@@ -71,10 +72,10 @@ void WebContentLayerImpl::PaintContents(SkCanvas* canvas,
if (!client_)
return;
- WebFloatRect web_opaque;
+ WebKit::WebFloatRect web_opaque;
client_->paintContents(
canvas, clip, layer_->layer()->can_use_lcd_text(), web_opaque);
*opaque = web_opaque;
}
-} // namespace WebKit
+} // namespace webkit
« no previous file with comments | « webkit/compositor_bindings/web_content_layer_impl.h ('k') | webkit/compositor_bindings/web_external_texture_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698