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

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

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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.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 <vector> 7 #include <vector>
8 8
9 #include "cc/blink/web_filter_operations_impl.h" 9 #include "cc/blink/web_filter_operations_impl.h"
10 #include "cc/resources/clip_display_item.h" 10 #include "cc/resources/clip_display_item.h"
11 #include "cc/resources/clip_path_display_item.h" 11 #include "cc/resources/clip_path_display_item.h"
12 #include "cc/resources/compositing_display_item.h" 12 #include "cc/resources/compositing_display_item.h"
13 #include "cc/resources/drawing_display_item.h" 13 #include "cc/resources/drawing_display_item.h"
14 #include "cc/resources/filter_display_item.h" 14 #include "cc/resources/filter_display_item.h"
15 #include "cc/resources/float_clip_display_item.h" 15 #include "cc/resources/float_clip_display_item.h"
16 #include "cc/resources/transform_display_item.h" 16 #include "cc/resources/transform_display_item.h"
17 #include "skia/ext/refptr.h" 17 #include "skia/ext/refptr.h"
18 #include "third_party/WebKit/public/platform/WebFloatRect.h" 18 #include "third_party/WebKit/public/platform/WebFloatRect.h"
19 #include "third_party/WebKit/public/platform/WebRect.h" 19 #include "third_party/WebKit/public/platform/WebRect.h"
20 #include "third_party/skia/include/core/SkColorFilter.h" 20 #include "third_party/skia/include/core/SkColorFilter.h"
21 #include "third_party/skia/include/core/SkPicture.h" 21 #include "third_party/skia/include/core/SkPicture.h"
22 #include "third_party/skia/include/utils/SkMatrix44.h" 22 #include "third_party/skia/include/utils/SkMatrix44.h"
23 #include "ui/gfx/geometry/safe_integer_conversions.h" 23 #include "ui/gfx/geometry/safe_integer_conversions.h"
24 #include "ui/gfx/transform.h" 24 #include "ui/gfx/transform.h"
25 25
26 namespace cc_blink { 26 namespace cc_blink {
27 27
28 WebDisplayItemListImpl::WebDisplayItemListImpl( 28 WebDisplayItemListImpl::WebDisplayItemListImpl()
29 cc::DisplayItemList* display_list) 29 : display_item_list_(cc::DisplayItemList::Create()) {
30 : display_item_list_(display_list) { 30 }
31
32 scoped_refptr<cc::DisplayItemList> WebDisplayItemListImpl::ToDisplayItemList() {
33 return display_item_list_;
31 } 34 }
32 35
33 void WebDisplayItemListImpl::appendDrawingItem(const SkPicture* picture) { 36 void WebDisplayItemListImpl::appendDrawingItem(const SkPicture* picture) {
34 display_item_list_->AppendItem(cc::DrawingDisplayItem::Create( 37 display_item_list_->AppendItem(cc::DrawingDisplayItem::Create(
35 skia::SharePtr(const_cast<SkPicture*>(picture)))); 38 skia::SharePtr(const_cast<SkPicture*>(picture))));
36 } 39 }
37 40
38 void WebDisplayItemListImpl::appendClipItem( 41 void WebDisplayItemListImpl::appendClipItem(
39 const blink::WebRect& clip_rect, 42 const blink::WebRect& clip_rect,
40 const blink::WebVector<SkRRect>& rounded_clip_rects) { 43 const blink::WebVector<SkRRect>& rounded_clip_rects) {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 } 123 }
121 124
122 void WebDisplayItemListImpl::appendEndScrollItem() { 125 void WebDisplayItemListImpl::appendEndScrollItem() {
123 appendEndTransformItem(); 126 appendEndTransformItem();
124 } 127 }
125 128
126 WebDisplayItemListImpl::~WebDisplayItemListImpl() { 129 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
127 } 130 }
128 131
129 } // namespace cc_blink 132 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_display_item_list_impl.h ('k') | cc/debug/rasterize_and_record_benchmark.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698