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

Side by Side Diff: cc/layers/picture_image_layer.cc

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 years, 1 month 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/layers/painted_scrollbar_layer.cc ('k') | cc/layers/picture_image_layer_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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/layers/picture_image_layer.h" 5 #include "cc/layers/picture_image_layer.h"
6 6
7 #include "cc/layers/picture_image_layer_impl.h" 7 #include "cc/layers/picture_image_layer_impl.h"
8 #include "cc/playback/display_item_list_settings.h" 8 #include "cc/playback/display_item_list_settings.h"
9 #include "cc/playback/drawing_display_item.h" 9 #include "cc/playback/drawing_display_item.h"
10 #include "third_party/skia/include/core/SkCanvas.h" 10 #include "third_party/skia/include/core/SkCanvas.h"
(...skipping 26 matching lines...) Expand all
37 } 37 }
38 38
39 void PictureImageLayer::SetImage(skia::RefPtr<const SkImage> image) { 39 void PictureImageLayer::SetImage(skia::RefPtr<const SkImage> image) {
40 // SetImage() currently gets called whenever there is any 40 // SetImage() currently gets called whenever there is any
41 // style change that affects the layer even if that change doesn't 41 // style change that affects the layer even if that change doesn't
42 // affect the actual contents of the image (e.g. a CSS animation). 42 // affect the actual contents of the image (e.g. a CSS animation).
43 // With this check in place we avoid unecessary texture uploads. 43 // With this check in place we avoid unecessary texture uploads.
44 if (image_.get() == image.get()) 44 if (image_.get() == image.get())
45 return; 45 return;
46 46
47 image_ = image.Pass(); 47 image_ = std::move(image);
48 UpdateDrawsContent(HasDrawableContent()); 48 UpdateDrawsContent(HasDrawableContent());
49 SetNeedsDisplay(); 49 SetNeedsDisplay();
50 } 50 }
51 51
52 scoped_refptr<DisplayItemList> PictureImageLayer::PaintContentsToDisplayList( 52 scoped_refptr<DisplayItemList> PictureImageLayer::PaintContentsToDisplayList(
53 const gfx::Rect& clip, 53 const gfx::Rect& clip,
54 ContentLayerClient::PaintingControlSetting painting_control) { 54 ContentLayerClient::PaintingControlSetting painting_control) {
55 DCHECK(image_); 55 DCHECK(image_);
56 DCHECK_GT(image_->width(), 0); 56 DCHECK_GT(image_->width(), 0);
57 DCHECK_GT(image_->height(), 0); 57 DCHECK_GT(image_->height(), 0);
(...skipping 15 matching lines...) Expand all
73 canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y); 73 canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y);
74 74
75 // Because Android WebView resourceless software draw mode rasters directly 75 // Because Android WebView resourceless software draw mode rasters directly
76 // to the root canvas, this draw must use the kSrcOver_Mode so that 76 // to the root canvas, this draw must use the kSrcOver_Mode so that
77 // transparent images blend correctly. 77 // transparent images blend correctly.
78 canvas->drawImage(image_.get(), 0, 0); 78 canvas->drawImage(image_.get(), 0, 0);
79 79
80 skia::RefPtr<SkPicture> picture = 80 skia::RefPtr<SkPicture> picture =
81 skia::AdoptRef(recorder.endRecordingAsPicture()); 81 skia::AdoptRef(recorder.endRecordingAsPicture());
82 auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>(); 82 auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>();
83 item->SetNew(picture.Pass()); 83 item->SetNew(std::move(picture));
84 84
85 display_list->Finalize(); 85 display_list->Finalize();
86 return display_list; 86 return display_list;
87 } 87 }
88 88
89 bool PictureImageLayer::FillsBoundsCompletely() const { 89 bool PictureImageLayer::FillsBoundsCompletely() const {
90 return false; 90 return false;
91 } 91 }
92 92
93 size_t PictureImageLayer::GetApproximateUnsharedMemoryUsage() const { 93 size_t PictureImageLayer::GetApproximateUnsharedMemoryUsage() const {
94 return 0; 94 return 0;
95 } 95 }
96 96
97 } // namespace cc 97 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/painted_scrollbar_layer.cc ('k') | cc/layers/picture_image_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698