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

Unified Diff: content/renderer/android/synchronous_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: content/renderer/android/synchronous_compositor_frame_sink.cc
diff --git a/content/renderer/android/synchronous_compositor_frame_sink.cc b/content/renderer/android/synchronous_compositor_frame_sink.cc
index 788b36f45cfcf0c5844b2266ea5a038e3479750c..b2f48abdbb69a40c6acfc014cf62243fc22c459a 100644
--- a/content/renderer/android/synchronous_compositor_frame_sink.cc
+++ b/content/renderer/android/synchronous_compositor_frame_sink.cc
@@ -194,7 +194,7 @@ void SynchronousCompositorFrameSink::DetachFromClient() {
begin_frame_source_ = nullptr;
registry_->UnregisterCompositorFrameSink(routing_id_, this);
client_->SetTreeActivationCallback(base::Closure());
- if (!root_local_frame_id_.is_null()) {
+ if (root_local_frame_id_.is_valid()) {
surface_factory_->Destroy(root_local_frame_id_);
surface_factory_->Destroy(child_local_frame_id_);
}
@@ -231,7 +231,7 @@ void SynchronousCompositorFrameSink::SubmitCompositorFrame(
// the |frame| for the software path below.
submit_frame.metadata = frame.metadata.Clone();
- if (root_local_frame_id_.is_null()) {
+ if (!root_local_frame_id_.is_valid()) {
root_local_frame_id_ = surface_id_allocator_->GenerateId();
surface_factory_->Create(root_local_frame_id_);
child_local_frame_id_ = surface_id_allocator_->GenerateId();

Powered by Google App Engine
This is Rietveld 408576698