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

Side by Side Diff: cc/trees/layer_tree_host_pixeltest_tiles.cc

Issue 1521373005: Revert of cc: Shrink size of display item (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/trees/layer_tree_host_pixeltest_masks.cc ('k') | ui/compositor/clip_recorder.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/content_layer_client.h" 5 #include "cc/layers/content_layer_client.h"
6 #include "cc/layers/picture_layer.h" 6 #include "cc/layers/picture_layer.h"
7 #include "cc/output/copy_output_request.h" 7 #include "cc/output/copy_output_request.h"
8 #include "cc/playback/display_item_list.h" 8 #include "cc/playback/display_item_list.h"
9 #include "cc/playback/display_item_list_settings.h" 9 #include "cc/playback/display_item_list_settings.h"
10 #include "cc/playback/drawing_display_item.h" 10 #include "cc/playback/drawing_display_item.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 gfx::Rect yellow_rect = blue_top_ ? bottom : top; 123 gfx::Rect yellow_rect = blue_top_ ? bottom : top;
124 124
125 SkPaint paint; 125 SkPaint paint;
126 paint.setStyle(SkPaint::kFill_Style); 126 paint.setStyle(SkPaint::kFill_Style);
127 127
128 paint.setColor(SK_ColorBLUE); 128 paint.setColor(SK_ColorBLUE);
129 canvas->drawRect(gfx::RectToSkRect(blue_rect), paint); 129 canvas->drawRect(gfx::RectToSkRect(blue_rect), paint);
130 paint.setColor(SK_ColorYELLOW); 130 paint.setColor(SK_ColorYELLOW);
131 canvas->drawRect(gfx::RectToSkRect(yellow_rect), paint); 131 canvas->drawRect(gfx::RectToSkRect(yellow_rect), paint);
132 132
133 display_list->CreateAndAppendItem<DrawingDisplayItem>( 133 skia::RefPtr<SkPicture> picture =
134 PaintableRegion(), skia::AdoptRef(recorder.endRecordingAsPicture())); 134 skia::AdoptRef(recorder.endRecordingAsPicture());
135
136 auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>(
137 PaintableRegion());
138 item->SetNew(std::move(picture));
139
135 display_list->Finalize(); 140 display_list->Finalize();
136 return display_list; 141 return display_list;
137 } 142 }
138 143
139 bool FillsBoundsCompletely() const override { return true; } 144 bool FillsBoundsCompletely() const override { return true; }
140 size_t GetApproximateUnsharedMemoryUsage() const override { return 0; } 145 size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
141 146
142 void set_blue_top(bool b) { blue_top_ = b; } 147 void set_blue_top(bool b) { blue_top_ = b; }
143 148
144 private: 149 private:
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 FullRaster_SingleThread_GpuRaster) { 237 FullRaster_SingleThread_GpuRaster) {
233 RunRasterPixelTest( 238 RunRasterPixelTest(
234 false, FULL_GPU, picture_layer_, 239 false, FULL_GPU, picture_layer_,
235 base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png"))); 240 base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png")));
236 } 241 }
237 242
238 } // namespace 243 } // namespace
239 } // namespace cc 244 } // namespace cc
240 245
241 #endif // !defined(OS_ANDROID) 246 #endif // !defined(OS_ANDROID)
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_masks.cc ('k') | ui/compositor/clip_recorder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698