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

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

Issue 502203003: Remove implicit conversions from scoped_refptr to T* in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change to use .get() instead of rewriting local variable Created 6 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 | « cc/resources/picture_pile_base.cc ('k') | cc/resources/prioritized_tile_set_unittest.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 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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 EXPECT_EQ(NULL, content_layer_client.last_canvas()); 456 EXPECT_EQ(NULL, content_layer_client.last_canvas());
457 457
458 scoped_refptr<Picture> picture = Picture::Create(layer_rect, 458 scoped_refptr<Picture> picture = Picture::Create(layer_rect,
459 &content_layer_client, 459 &content_layer_client,
460 tile_grid_info, 460 tile_grid_info,
461 false, 461 false,
462 Picture::RECORD_NORMALLY); 462 Picture::RECORD_NORMALLY);
463 EXPECT_TRUE(content_layer_client.last_canvas() != NULL); 463 EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
464 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED, 464 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
465 content_layer_client.last_context_status()); 465 content_layer_client.last_context_status());
466 EXPECT_TRUE(picture); 466 EXPECT_TRUE(picture.get());
467 467
468 picture = Picture::Create(layer_rect, 468 picture = Picture::Create(layer_rect,
469 &content_layer_client, 469 &content_layer_client,
470 tile_grid_info, 470 tile_grid_info,
471 false, 471 false,
472 Picture::RECORD_WITH_SK_NULL_CANVAS); 472 Picture::RECORD_WITH_SK_NULL_CANVAS);
473 EXPECT_TRUE(content_layer_client.last_canvas() != NULL); 473 EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
474 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED, 474 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
475 content_layer_client.last_context_status()); 475 content_layer_client.last_context_status());
476 EXPECT_TRUE(picture); 476 EXPECT_TRUE(picture.get());
477 477
478 picture = Picture::Create(layer_rect, 478 picture = Picture::Create(layer_rect,
479 &content_layer_client, 479 &content_layer_client,
480 tile_grid_info, 480 tile_grid_info,
481 false, 481 false,
482 Picture::RECORD_WITH_PAINTING_DISABLED); 482 Picture::RECORD_WITH_PAINTING_DISABLED);
483 EXPECT_TRUE(content_layer_client.last_canvas() != NULL); 483 EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
484 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_DISABLED, 484 EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_DISABLED,
485 content_layer_client.last_context_status()); 485 content_layer_client.last_context_status());
486 EXPECT_TRUE(picture); 486 EXPECT_TRUE(picture.get());
487 487
488 picture = Picture::Create(layer_rect, 488 picture = Picture::Create(layer_rect,
489 &content_layer_client, 489 &content_layer_client,
490 tile_grid_info, 490 tile_grid_info,
491 false, 491 false,
492 Picture::RECORD_WITH_SKRECORD); 492 Picture::RECORD_WITH_SKRECORD);
493 EXPECT_TRUE(content_layer_client.last_canvas() != NULL); 493 EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
494 EXPECT_TRUE(picture); 494 EXPECT_TRUE(picture.get());
495 495
496 EXPECT_EQ(4, Picture::RECORDING_MODE_COUNT); 496 EXPECT_EQ(4, Picture::RECORDING_MODE_COUNT);
497 } 497 }
498 498
499 } // namespace 499 } // namespace
500 } // namespace cc 500 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/picture_pile_base.cc ('k') | cc/resources/prioritized_tile_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698