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

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: Removed added printf statements; LocalFrameId::is_valid() no longer checks if nonce is 0. Created 4 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 side-by-side diff with in-line comments
Download patch
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 5d79d61031855a4aa5b02e50d8223a69bf564a73..39c67723c009f0db3ad86f2cac5fee0334376e71 100644
--- a/cc/test/test_compositor_frame_sink.cc
+++ b/cc/test/test_compositor_frame_sink.cc
@@ -104,7 +104,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_);
@@ -121,7 +121,7 @@ void TestCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
if (test_client_)
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_);
}
@@ -171,7 +171,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());

Powered by Google App Engine
This is Rietveld 408576698