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

Unified Diff: cc/test/test_compositor_frame_sink.cc

Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes. (Closed)
Patch Set: Rebase Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/surfaces/surface_sequence.h ('k') | components/exo/surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/test_compositor_frame_sink.cc
diff --git a/cc/test/test_compositor_frame_sink.cc b/cc/test/test_compositor_frame_sink.cc
index 9a7241f642acafe702e09c065718ed4fca582b04..9c7cdb0e664dfd73c755dbb7a5070863d357e9c8 100644
--- a/cc/test/test_compositor_frame_sink.cc
+++ b/cc/test/test_compositor_frame_sink.cc
@@ -111,7 +111,7 @@ bool TestCompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
void TestCompositorFrameSink::DetachFromClient() {
// Some tests make BindToClient fail on purpose. ^__^
if (bound_) {
- if (!delegated_local_frame_id_.is_null())
+ if (delegated_local_frame_id_.is_valid())
surface_factory_->Destroy(delegated_local_frame_id_);
surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
@@ -128,7 +128,7 @@ void TestCompositorFrameSink::DetachFromClient() {
void TestCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
test_client_->DisplayReceivedCompositorFrame(frame);
- if (delegated_local_frame_id_.is_null()) {
+ if (!delegated_local_frame_id_.is_valid()) {
delegated_local_frame_id_ = surface_id_allocator_->GenerateId();
surface_factory_->Create(delegated_local_frame_id_);
}
@@ -177,7 +177,7 @@ void TestCompositorFrameSink::DidDrawCallback() {
void TestCompositorFrameSink::ForceReclaimResources() {
if (capabilities_.can_force_reclaim_resources &&
- !delegated_local_frame_id_.is_null()) {
+ delegated_local_frame_id_.is_valid()) {
surface_factory_->SubmitCompositorFrame(delegated_local_frame_id_,
CompositorFrame(),
SurfaceFactory::DrawCallback());
« no previous file with comments | « cc/surfaces/surface_sequence.h ('k') | components/exo/surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698