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

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

Issue 2334883002: Revert of Disable LayerTreeHostTilesTestPartialInvalidation.{Full,Partial}Raster_SingleThread... (Closed)
Patch Set: Created 4 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 | « no previous file | 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 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "cc/layers/content_layer_client.h" 7 #include "cc/layers/content_layer_client.h"
8 #include "cc/layers/picture_layer.h" 8 #include "cc/layers/picture_layer.h"
9 #include "cc/output/copy_output_request.h" 9 #include "cc/output/copy_output_request.h"
10 #include "cc/playback/display_item_list.h" 10 #include "cc/playback/display_item_list.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 DoReadback(); 174 DoReadback();
175 break; 175 break;
176 } 176 }
177 } 177 }
178 178
179 protected: 179 protected:
180 BlueYellowClient client_; 180 BlueYellowClient client_;
181 scoped_refptr<PictureLayer> picture_layer_; 181 scoped_refptr<PictureLayer> picture_layer_;
182 }; 182 };
183 183
184 // Fails flakily on Linux ASan (http://crbug.com/645898).
185 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
186 #define MAYBE_PartialRaster_SingleThread_OneCopy \
187 DISABLED_PartialRaster_SingleThread_OneCopy
188 #else
189 #define MAYBE_PartialRaster_SingleThread_OneCopy \
190 PartialRaster_SingleThread_OneCopy
191 #endif
192 TEST_F(LayerTreeHostTilesTestPartialInvalidation, 184 TEST_F(LayerTreeHostTilesTestPartialInvalidation,
193 MAYBE_PartialRaster_SingleThread_OneCopy) { 185 PartialRaster_SingleThread_OneCopy) {
194 RunRasterPixelTest( 186 RunRasterPixelTest(
195 false, PARTIAL_ONE_COPY, picture_layer_, 187 false, PARTIAL_ONE_COPY, picture_layer_,
196 base::FilePath(FILE_PATH_LITERAL("blue_yellow_partial_flipped.png"))); 188 base::FilePath(FILE_PATH_LITERAL("blue_yellow_partial_flipped.png")));
197 } 189 }
198 190
199 // Fails flakily on Linux ASan (http://crbug.com/645898).
200 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
201 #define MAYBE_FullRaster_SingleThread_OneCopy \
202 DISABLED_FullRaster_SingleThread_OneCopy
203 #else
204 #define MAYBE_FullRaster_SingleThread_OneCopy FullRaster_SingleThread_OneCopy
205 #endif
206 TEST_F(LayerTreeHostTilesTestPartialInvalidation, 191 TEST_F(LayerTreeHostTilesTestPartialInvalidation,
207 MAYBE_FullRaster_SingleThread_OneCopy) { 192 FullRaster_SingleThread_OneCopy) {
208 RunRasterPixelTest( 193 RunRasterPixelTest(
209 false, FULL_ONE_COPY, picture_layer_, 194 false, FULL_ONE_COPY, picture_layer_,
210 base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png"))); 195 base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png")));
211 } 196 }
212 197
213 TEST_F(LayerTreeHostTilesTestPartialInvalidation, 198 TEST_F(LayerTreeHostTilesTestPartialInvalidation,
214 PartialRaster_MultiThread_OneCopy) { 199 PartialRaster_MultiThread_OneCopy) {
215 RunRasterPixelTest( 200 RunRasterPixelTest(
216 true, PARTIAL_ONE_COPY, picture_layer_, 201 true, PARTIAL_ONE_COPY, picture_layer_,
217 base::FilePath(FILE_PATH_LITERAL("blue_yellow_partial_flipped.png"))); 202 base::FilePath(FILE_PATH_LITERAL("blue_yellow_partial_flipped.png")));
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 FullRaster_SingleThread_GpuRaster) { 234 FullRaster_SingleThread_GpuRaster) {
250 RunRasterPixelTest( 235 RunRasterPixelTest(
251 false, FULL_GPU, picture_layer_, 236 false, FULL_GPU, picture_layer_,
252 base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png"))); 237 base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png")));
253 } 238 }
254 239
255 } // namespace 240 } // namespace
256 } // namespace cc 241 } // namespace cc
257 242
258 #endif // !defined(OS_ANDROID) 243 #endif // !defined(OS_ANDROID)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698