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

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

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: DrawingDisplayItem Created 3 years, 10 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_display_item_list_impl.h ('k') | cc/debug/rasterize_and_record_benchmark_impl.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 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_display_item_list_impl.h" 5 #include "cc/blink/web_display_item_list_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
11 11
12 #include "cc/paint/paint_record.h"
12 #include "cc/playback/clip_display_item.h" 13 #include "cc/playback/clip_display_item.h"
13 #include "cc/playback/clip_path_display_item.h" 14 #include "cc/playback/clip_path_display_item.h"
14 #include "cc/playback/compositing_display_item.h" 15 #include "cc/playback/compositing_display_item.h"
15 #include "cc/playback/drawing_display_item.h" 16 #include "cc/playback/drawing_display_item.h"
16 #include "cc/playback/filter_display_item.h" 17 #include "cc/playback/filter_display_item.h"
17 #include "cc/playback/float_clip_display_item.h" 18 #include "cc/playback/float_clip_display_item.h"
18 #include "cc/playback/transform_display_item.h" 19 #include "cc/playback/transform_display_item.h"
19 #include "third_party/WebKit/public/platform/WebFloatRect.h" 20 #include "third_party/WebKit/public/platform/WebFloatRect.h"
20 #include "third_party/WebKit/public/platform/WebRect.h" 21 #include "third_party/WebKit/public/platform/WebRect.h"
21 #include "third_party/skia/include/core/SkColorFilter.h" 22 #include "third_party/skia/include/core/SkColorFilter.h"
22 #include "third_party/skia/include/core/SkMatrix44.h" 23 #include "third_party/skia/include/core/SkMatrix44.h"
23 #include "third_party/skia/include/core/SkPicture.h"
24 #include "ui/gfx/geometry/rect_conversions.h" 24 #include "ui/gfx/geometry/rect_conversions.h"
25 #include "ui/gfx/geometry/safe_integer_conversions.h" 25 #include "ui/gfx/geometry/safe_integer_conversions.h"
26 #include "ui/gfx/transform.h" 26 #include "ui/gfx/transform.h"
27 27
28 namespace cc_blink { 28 namespace cc_blink {
29 29
30 namespace { 30 namespace {
31 31
32 } // namespace 32 } // namespace
33 33
34 WebDisplayItemListImpl::WebDisplayItemListImpl() 34 WebDisplayItemListImpl::WebDisplayItemListImpl()
35 : display_item_list_(new cc::DisplayItemList) {} 35 : display_item_list_(new cc::DisplayItemList) {}
36 36
37 WebDisplayItemListImpl::WebDisplayItemListImpl( 37 WebDisplayItemListImpl::WebDisplayItemListImpl(
38 cc::DisplayItemList* display_list) 38 cc::DisplayItemList* display_list)
39 : display_item_list_(display_list) { 39 : display_item_list_(display_list) {
40 } 40 }
41 41
42 void WebDisplayItemListImpl::appendDrawingItem( 42 void WebDisplayItemListImpl::appendDrawingItem(
43 const blink::WebRect& visual_rect, 43 const blink::WebRect& visual_rect,
44 sk_sp<const SkPicture> picture) { 44 sk_sp<const cc::PaintRecord> picture) {
45 display_item_list_->CreateAndAppendDrawingItem<cc::DrawingDisplayItem>( 45 display_item_list_->CreateAndAppendDrawingItem<cc::DrawingDisplayItem>(
46 visual_rect, std::move(picture)); 46 visual_rect, std::move(picture));
47 } 47 }
48 48
49 void WebDisplayItemListImpl::appendClipItem( 49 void WebDisplayItemListImpl::appendClipItem(
50 const blink::WebRect& clip_rect, 50 const blink::WebRect& clip_rect,
51 const blink::WebVector<SkRRect>& rounded_clip_rects) { 51 const blink::WebVector<SkRRect>& rounded_clip_rects) {
52 std::vector<SkRRect> rounded_rects; 52 std::vector<SkRRect> rounded_rects;
53 for (size_t i = 0; i < rounded_clip_rects.size(); ++i) { 53 for (size_t i = 0; i < rounded_clip_rects.size(); ++i) {
54 rounded_rects.push_back(rounded_clip_rects[i]); 54 rounded_rects.push_back(rounded_clip_rects[i]);
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 void WebDisplayItemListImpl::setImpliedColorSpace( 154 void WebDisplayItemListImpl::setImpliedColorSpace(
155 const gfx::ColorSpace& implied_color_space) { 155 const gfx::ColorSpace& implied_color_space) {
156 display_item_list_->SetImpliedColorSpace(implied_color_space); 156 display_item_list_->SetImpliedColorSpace(implied_color_space);
157 } 157 }
158 158
159 WebDisplayItemListImpl::~WebDisplayItemListImpl() { 159 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
160 } 160 }
161 161
162 } // namespace cc_blink 162 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_display_item_list_impl.h ('k') | cc/debug/rasterize_and_record_benchmark_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698