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

Side by Side Diff: content/renderer/compositor_bindings/web_image_layer_impl.cc

Issue 317163002: Moving compositor_bindings from webkit to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using layouttest_support to instantiate WebLayer Created 6 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/renderer/compositor_bindings/web_image_layer_impl.h" 5 #include "content/renderer/compositor_bindings/web_image_layer_impl.h"
6 6
7 #include "cc/layers/image_layer.h" 7 #include "cc/layers/image_layer.h"
8 #include "cc/layers/picture_image_layer.h" 8 #include "cc/layers/picture_image_layer.h"
9 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" 9 #include "content/renderer/compositor_bindings/web_layer_impl.h"
10 #include "webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h" 10 #include "content/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h"
11 11
12 namespace webkit { 12 namespace content {
13 13
14 WebImageLayerImpl::WebImageLayerImpl() { 14 WebImageLayerImpl::WebImageLayerImpl() {
15 if (WebLayerImpl::UsingPictureLayer()) 15 if (WebLayerImpl::UsingPictureLayer())
16 layer_.reset(new WebLayerImplFixedBounds(cc::PictureImageLayer::Create())); 16 layer_.reset(new WebLayerImplFixedBounds(cc::PictureImageLayer::Create()));
17 else 17 else
18 layer_.reset(new WebLayerImpl(cc::ImageLayer::Create())); 18 layer_.reset(new WebLayerImpl(cc::ImageLayer::Create()));
19 } 19 }
20 20
21 WebImageLayerImpl::~WebImageLayerImpl() {} 21 WebImageLayerImpl::~WebImageLayerImpl() {
22 }
22 23
23 blink::WebLayer* WebImageLayerImpl::layer() { return layer_.get(); } 24 blink::WebLayer* WebImageLayerImpl::layer() {
25 return layer_.get();
26 }
24 27
25 void WebImageLayerImpl::setBitmap(SkBitmap bitmap) { 28 void WebImageLayerImpl::setBitmap(SkBitmap bitmap) {
26 if (WebLayerImpl::UsingPictureLayer()) { 29 if (WebLayerImpl::UsingPictureLayer()) {
27 static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap); 30 static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap);
28 static_cast<WebLayerImplFixedBounds*>(layer_.get())->SetFixedBounds( 31 static_cast<WebLayerImplFixedBounds*>(layer_.get())
29 gfx::Size(bitmap.width(), bitmap.height())); 32 ->SetFixedBounds(gfx::Size(bitmap.width(), bitmap.height()));
jam 2014/06/11 00:27:04 ditto
30 } else { 33 } else {
31 static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap); 34 static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap);
32 } 35 }
33 } 36 }
34 37
35 } // namespace webkit 38 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698