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

Side by Side Diff: cc/resources/picture_unittest.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. Created 6 years, 2 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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/resources/picture.h" 5 #include "cc/resources/picture.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "cc/test/fake_content_layer_client.h" 10 #include "cc/test/fake_content_layer_client.h"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 content_layer_client.add_draw_rect(layer_rect, red_paint); 413 content_layer_client.add_draw_rect(layer_rect, red_paint);
414 scoped_refptr<Picture> one_rect_picture = 414 scoped_refptr<Picture> one_rect_picture =
415 Picture::Create(layer_rect, 415 Picture::Create(layer_rect,
416 &content_layer_client, 416 &content_layer_client,
417 tile_grid_info, 417 tile_grid_info,
418 false, 418 false,
419 Picture::RECORD_NORMALLY); 419 Picture::RECORD_NORMALLY);
420 scoped_ptr<base::Value> serialized_one_rect( 420 scoped_ptr<base::Value> serialized_one_rect(
421 one_rect_picture->AsValue()); 421 one_rect_picture->AsValue());
422 422
423 const base::DictionaryValue* value = NULL; 423 const base::DictionaryValue* value = nullptr;
424 EXPECT_TRUE(serialized_one_rect->GetAsDictionary(&value)); 424 EXPECT_TRUE(serialized_one_rect->GetAsDictionary(&value));
425 425
426 // Decode the picture from base64. 426 // Decode the picture from base64.
427 const base::Value* skp_value; 427 const base::Value* skp_value;
428 EXPECT_TRUE(value->Get("skp64", &skp_value)); 428 EXPECT_TRUE(value->Get("skp64", &skp_value));
429 429
430 // Reconstruct the picture. 430 // Reconstruct the picture.
431 scoped_refptr<Picture> one_rect_picture_check = 431 scoped_refptr<Picture> one_rect_picture_check =
432 Picture::CreateFromSkpValue(skp_value); 432 Picture::CreateFromSkpValue(skp_value);
433 EXPECT_TRUE(!!one_rect_picture_check.get()); 433 EXPECT_TRUE(!!one_rect_picture_check.get());
434 434
435 EXPECT_EQ(100, one_rect_picture_check->LayerRect().width()); 435 EXPECT_EQ(100, one_rect_picture_check->LayerRect().width());
436 EXPECT_EQ(200, one_rect_picture_check->LayerRect().height()); 436 EXPECT_EQ(200, one_rect_picture_check->LayerRect().height());
437 } 437 }
438 438
439 TEST(PictureTest, RecordingModes) { 439 TEST(PictureTest, RecordingModes) {
440 SkGraphics::Init(); 440 SkGraphics::Init();
441 441
442 gfx::Rect layer_rect(100, 200); 442 gfx::Rect layer_rect(100, 200);
443 443
444 SkTileGridFactory::TileGridInfo tile_grid_info; 444 SkTileGridFactory::TileGridInfo tile_grid_info;
445 tile_grid_info.fTileInterval = SkISize::Make(100, 200); 445 tile_grid_info.fTileInterval = SkISize::Make(100, 200);
446 tile_grid_info.fMargin.setEmpty(); 446 tile_grid_info.fMargin.setEmpty();
447 tile_grid_info.fOffset.setZero(); 447 tile_grid_info.fOffset.setZero();
448 448
449 FakeContentLayerClient content_layer_client; 449 FakeContentLayerClient content_layer_client;
450 EXPECT_EQ(NULL, content_layer_client.last_canvas()); 450 EXPECT_EQ(nullptr, content_layer_client.last_canvas());
451 451
452 scoped_refptr<Picture> picture = Picture::Create(layer_rect, 452 scoped_refptr<Picture> picture = Picture::Create(layer_rect,
453 &content_layer_client, 453 &content_layer_client,
454 tile_grid_info, 454 tile_grid_info,
455 false, 455 false,
456 Picture::RECORD_NORMALLY); 456 Picture::RECORD_NORMALLY);
457 EXPECT_TRUE(content_layer_client.last_canvas() != NULL); 457 EXPECT_TRUE(content_layer_client.last_canvas() != nullptr);
458 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED, 458 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
459 content_layer_client.last_context_status()); 459 content_layer_client.last_context_status());
460 EXPECT_TRUE(picture.get()); 460 EXPECT_TRUE(picture.get());
461 461
462 picture = Picture::Create(layer_rect, 462 picture = Picture::Create(layer_rect,
463 &content_layer_client, 463 &content_layer_client,
464 tile_grid_info, 464 tile_grid_info,
465 false, 465 false,
466 Picture::RECORD_WITH_SK_NULL_CANVAS); 466 Picture::RECORD_WITH_SK_nullptr_CANVAS);
467 EXPECT_TRUE(content_layer_client.last_canvas() != NULL); 467 EXPECT_TRUE(content_layer_client.last_canvas() != nullptr);
468 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED, 468 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
469 content_layer_client.last_context_status()); 469 content_layer_client.last_context_status());
470 EXPECT_TRUE(picture.get()); 470 EXPECT_TRUE(picture.get());
471 471
472 picture = Picture::Create(layer_rect, 472 picture = Picture::Create(layer_rect,
473 &content_layer_client, 473 &content_layer_client,
474 tile_grid_info, 474 tile_grid_info,
475 false, 475 false,
476 Picture::RECORD_WITH_PAINTING_DISABLED); 476 Picture::RECORD_WITH_PAINTING_DISABLED);
477 EXPECT_TRUE(content_layer_client.last_canvas() != NULL); 477 EXPECT_TRUE(content_layer_client.last_canvas() != nullptr);
478 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_DISABLED, 478 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_DISABLED,
479 content_layer_client.last_context_status()); 479 content_layer_client.last_context_status());
480 EXPECT_TRUE(picture.get()); 480 EXPECT_TRUE(picture.get());
481 481
482 picture = Picture::Create(layer_rect, 482 picture = Picture::Create(layer_rect,
483 &content_layer_client, 483 &content_layer_client,
484 tile_grid_info, 484 tile_grid_info,
485 false, 485 false,
486 Picture::RECORD_WITH_SKRECORD); 486 Picture::RECORD_WITH_SKRECORD);
487 EXPECT_TRUE(content_layer_client.last_canvas() != NULL); 487 EXPECT_TRUE(content_layer_client.last_canvas() != nullptr);
488 EXPECT_TRUE(picture.get()); 488 EXPECT_TRUE(picture.get());
489 489
490 EXPECT_EQ(4, Picture::RECORDING_MODE_COUNT); 490 EXPECT_EQ(4, Picture::RECORDING_MODE_COUNT);
491 } 491 }
492 492
493 } // namespace 493 } // namespace
494 } // namespace cc 494 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698