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

Side by Side Diff: cc/blink/web_image_layer_impl.cc

Issue 593083002: Cleanup WebImageLayerImpl by removing setBitmap(SkBitmap) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « cc/blink/web_image_layer_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "cc/blink/web_image_layer_impl.h" 5 #include "cc/blink/web_image_layer_impl.h"
6 6
7 #include "cc/blink/web_layer_impl.h" 7 #include "cc/blink/web_layer_impl.h"
8 #include "cc/blink/web_layer_impl_fixed_bounds.h" 8 #include "cc/blink/web_layer_impl_fixed_bounds.h"
9 #include "cc/layers/image_layer.h" 9 #include "cc/layers/image_layer.h"
10 #include "cc/layers/picture_image_layer.h" 10 #include "cc/layers/picture_image_layer.h"
11 11
12 namespace cc_blink { 12 namespace cc_blink {
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
24 blink::WebLayer* WebImageLayerImpl::layer() { 24 blink::WebLayer* WebImageLayerImpl::layer() {
25 return layer_.get(); 25 return layer_.get();
26 } 26 }
27 27
28 void WebImageLayerImpl::setBitmap(SkBitmap bitmap) {
29 setImageBitmap(bitmap);
30 }
31
32 void WebImageLayerImpl::setImageBitmap(const SkBitmap& bitmap) { 28 void WebImageLayerImpl::setImageBitmap(const SkBitmap& bitmap) {
33 if (WebLayerImpl::UsingPictureLayer()) { 29 if (WebLayerImpl::UsingPictureLayer()) {
34 static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap); 30 static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap);
35 static_cast<WebLayerImplFixedBounds*>(layer_.get()) 31 static_cast<WebLayerImplFixedBounds*>(layer_.get())
36 ->SetFixedBounds(gfx::Size(bitmap.width(), bitmap.height())); 32 ->SetFixedBounds(gfx::Size(bitmap.width(), bitmap.height()));
37 } else { 33 } else {
38 static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap); 34 static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap);
39 } 35 }
40 } 36 }
41 37
42 } // namespace cc_blink 38 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_image_layer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698