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

Unified Diff: cc/blink/web_image_layer_impl.cc

Issue 470983004: Move blink<->cc bindings to cc/blink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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
« no previous file with comments | « cc/blink/web_image_layer_impl.h ('k') | cc/blink/web_layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blink/web_image_layer_impl.cc
diff --git a/content/renderer/compositor_bindings/web_image_layer_impl.cc b/cc/blink/web_image_layer_impl.cc
similarity index 69%
rename from content/renderer/compositor_bindings/web_image_layer_impl.cc
rename to cc/blink/web_image_layer_impl.cc
index ecbfbd06bf20dd96652a0bc53fdd17f8b7e9f253..b31d890dc2c618390850ece816ede74b0cea8259 100644
--- a/content/renderer/compositor_bindings/web_image_layer_impl.cc
+++ b/cc/blink/web_image_layer_impl.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/renderer/compositor_bindings/web_image_layer_impl.h"
+#include "cc/blink/web_image_layer_impl.h"
+#include "cc/blink/web_layer_impl.h"
+#include "cc/blink/web_layer_impl_fixed_bounds.h"
#include "cc/layers/image_layer.h"
#include "cc/layers/picture_image_layer.h"
-#include "content/renderer/compositor_bindings/web_layer_impl.h"
-#include "content/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h"
-namespace content {
+namespace cc_blink {
WebImageLayerImpl::WebImageLayerImpl() {
if (WebLayerImpl::UsingPictureLayer())
@@ -28,12 +28,11 @@ blink::WebLayer* WebImageLayerImpl::layer() {
void WebImageLayerImpl::setBitmap(SkBitmap bitmap) {
if (WebLayerImpl::UsingPictureLayer()) {
static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap);
- static_cast<WebLayerImplFixedBounds*>(layer_.get())->SetFixedBounds(
- gfx::Size(bitmap.width(), bitmap.height()));
+ static_cast<WebLayerImplFixedBounds*>(layer_.get())
+ ->SetFixedBounds(gfx::Size(bitmap.width(), bitmap.height()));
} else {
static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap);
}
}
-} // namespace content
-
+} // namespace cc_blink
« no previous file with comments | « cc/blink/web_image_layer_impl.h ('k') | cc/blink/web_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698