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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp

Issue 2809983002: Fix g_k_* symbols after blink rename. (Closed)
Patch Set: Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 } 274 }
275 }; 275 };
276 276
277 using DecodedImageTypeHistogramTest = 277 using DecodedImageTypeHistogramTest =
278 BitmapHistogramTest<BitmapImageMetrics::DecodedImageType>; 278 BitmapHistogramTest<BitmapImageMetrics::DecodedImageType>;
279 279
280 TEST_P(DecodedImageTypeHistogramTest, ImageType) { 280 TEST_P(DecodedImageTypeHistogramTest, ImageType) {
281 RunTest("Blink.DecodedImageType"); 281 RunTest("Blink.DecodedImageType");
282 } 282 }
283 283
284 DecodedImageTypeHistogramTest::ParamType 284 const DecodedImageTypeHistogramTest::ParamType
285 g_k_decoded_image_type_histogram_test_params[] = { 285 kDecodedImageTypeHistogramTestparams[] = {
286 {"/LayoutTests/images/resources/green.jpg", 286 {"/LayoutTests/images/resources/green.jpg",
287 BitmapImageMetrics::kImageJPEG}, 287 BitmapImageMetrics::kImageJPEG},
288 {"/LayoutTests/images/resources/" 288 {"/LayoutTests/images/resources/"
289 "palatted-color-png-gamma-one-color-profile.png", 289 "palatted-color-png-gamma-one-color-profile.png",
290 BitmapImageMetrics::kImagePNG}, 290 BitmapImageMetrics::kImagePNG},
291 {"/LayoutTests/images/resources/animated-10color.gif", 291 {"/LayoutTests/images/resources/animated-10color.gif",
292 BitmapImageMetrics::kImageGIF}, 292 BitmapImageMetrics::kImageGIF},
293 {"/LayoutTests/images/resources/webp-color-profile-lossy.webp", 293 {"/LayoutTests/images/resources/webp-color-profile-lossy.webp",
294 BitmapImageMetrics::kImageWebP}, 294 BitmapImageMetrics::kImageWebP},
295 {"/LayoutTests/images/resources/wrong-frame-dimensions.ico", 295 {"/LayoutTests/images/resources/wrong-frame-dimensions.ico",
296 BitmapImageMetrics::kImageICO}, 296 BitmapImageMetrics::kImageICO},
297 {"/LayoutTests/images/resources/lenna.bmp", 297 {"/LayoutTests/images/resources/lenna.bmp",
298 BitmapImageMetrics::kImageBMP}}; 298 BitmapImageMetrics::kImageBMP}};
299 299
300 INSTANTIATE_TEST_CASE_P( 300 INSTANTIATE_TEST_CASE_P(
301 DecodedImageTypeHistogramTest, 301 DecodedImageTypeHistogramTest,
302 DecodedImageTypeHistogramTest, 302 DecodedImageTypeHistogramTest,
303 ::testing::ValuesIn(g_k_decoded_image_type_histogram_test_params)); 303 ::testing::ValuesIn(kDecodedImageTypeHistogramTestparams));
304 304
305 using DecodedImageOrientationHistogramTest = 305 using DecodedImageOrientationHistogramTest =
306 BitmapHistogramTest<ImageOrientationEnum>; 306 BitmapHistogramTest<ImageOrientationEnum>;
307 307
308 TEST_P(DecodedImageOrientationHistogramTest, ImageOrientation) { 308 TEST_P(DecodedImageOrientationHistogramTest, ImageOrientation) {
309 RunTest("Blink.DecodedImage.Orientation"); 309 RunTest("Blink.DecodedImage.Orientation");
310 } 310 }
311 311
312 DecodedImageOrientationHistogramTest::ParamType 312 DecodedImageOrientationHistogramTest::ParamType
313 g_k_decoded_image_orientation_histogram_test_params[] = { 313 g_k_decoded_image_orientation_histogram_test_params[] = {
(...skipping 13 matching lines...) Expand all
327 kOriginRightBottom}, 327 kOriginRightBottom},
328 {"/LayoutTests/images/resources/exif-orientation-8-llo.jpg", 328 {"/LayoutTests/images/resources/exif-orientation-8-llo.jpg",
329 kOriginLeftBottom}}; 329 kOriginLeftBottom}};
330 330
331 INSTANTIATE_TEST_CASE_P( 331 INSTANTIATE_TEST_CASE_P(
332 DecodedImageOrientationHistogramTest, 332 DecodedImageOrientationHistogramTest,
333 DecodedImageOrientationHistogramTest, 333 DecodedImageOrientationHistogramTest,
334 ::testing::ValuesIn(g_k_decoded_image_orientation_histogram_test_params)); 334 ::testing::ValuesIn(g_k_decoded_image_orientation_histogram_test_params));
335 335
336 } // namespace blink 336 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698