Chromium Code Reviews| Index: content/renderer/compositor_bindings/web_image_layer_impl.cc |
| diff --git a/webkit/renderer/compositor_bindings/web_image_layer_impl.cc b/content/renderer/compositor_bindings/web_image_layer_impl.cc |
| similarity index 59% |
| rename from webkit/renderer/compositor_bindings/web_image_layer_impl.cc |
| rename to content/renderer/compositor_bindings/web_image_layer_impl.cc |
| index c3ae4aad4559a2505663872e03e3cb616259a670..d18dc69eca3c25b8db5050fa828aa3bb4aff4757 100644 |
| --- a/webkit/renderer/compositor_bindings/web_image_layer_impl.cc |
| +++ b/content/renderer/compositor_bindings/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 "webkit/renderer/compositor_bindings/web_image_layer_impl.h" |
| +#include "content/renderer/compositor_bindings/web_image_layer_impl.h" |
| #include "cc/layers/image_layer.h" |
| #include "cc/layers/picture_image_layer.h" |
| -#include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
| -#include "webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h" |
| +#include "content/renderer/compositor_bindings/web_layer_impl.h" |
| +#include "content/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h" |
| -namespace webkit { |
| +namespace content { |
| WebImageLayerImpl::WebImageLayerImpl() { |
| if (WebLayerImpl::UsingPictureLayer()) |
| @@ -18,18 +18,21 @@ WebImageLayerImpl::WebImageLayerImpl() { |
| layer_.reset(new WebLayerImpl(cc::ImageLayer::Create())); |
| } |
| -WebImageLayerImpl::~WebImageLayerImpl() {} |
| +WebImageLayerImpl::~WebImageLayerImpl() { |
| +} |
| -blink::WebLayer* WebImageLayerImpl::layer() { return layer_.get(); } |
| +blink::WebLayer* WebImageLayerImpl::layer() { |
| + return layer_.get(); |
| +} |
| 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())); |
|
jam
2014/06/11 00:27:04
ditto
|
| } else { |
| static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap); |
| } |
| } |
| -} // namespace webkit |
| +} // namespace content |