Remove NULL ResourceProvider, TileManager early outs

cc/trees/thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/thread_proxy.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 333 matching lines @@
       FROM_HERE,
       base::Bind(&ThreadProxy::CheckOutputSurfaceStatusOnImplThread,
                  impl_thread_weak_ptr_));
 }
 
 void ThreadProxy::CheckOutputSurfaceStatusOnImplThread() {
   DCHECK(IsImplThread());
   TRACE_EVENT0("cc", "ThreadProxy::CheckOutputSurfaceStatusOnImplThread");
   if (!layer_tree_host_impl_->IsContextLost())
     return;
-  cc::ContextProvider* offscreen_contexts =
-    layer_tree_host_impl_->resource_provider() ?
-        layer_tree_host_impl_->resource_provider()->
-            offscreen_context_provider() : NULL;
-
-  if (offscreen_contexts)
+  if (cc::ContextProvider* offscreen_contexts = layer_tree_host_impl_
+          ->resource_provider()->offscreen_context_provider())
     offscreen_contexts->VerifyContexts();
   scheduler_on_impl_thread_->DidLoseOutputSurface();
 }
 
 void ThreadProxy::OnSwapBuffersCompleteOnImplThread() {
   DCHECK(IsImplThread());
   TRACE_EVENT0("cc", "ThreadProxy::OnSwapBuffersCompleteOnImplThread");
   Proxy::MainThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ThreadProxy::DidCompleteSwapBuffers, main_thread_weak_ptr_));
@@ skipping 47 matching lines @@
                  base::Passed(&events),
                  wall_clock_time));
 }
 
 bool ThreadProxy::ReduceContentsTextureMemoryOnImplThread(size_t limit_bytes,
                                                           int priority_cutoff) {
   DCHECK(IsImplThread());
 
   if (!layer_tree_host_->contents_texture_manager())
     return false;
-  if (!layer_tree_host_impl_->resource_provider())
-    return false;
 
   bool reduce_result = layer_tree_host_->contents_texture_manager()->
       ReduceMemoryOnImplThread(limit_bytes,
                                priority_cutoff,
                                layer_tree_host_impl_->resource_provider());
   if (!reduce_result)
     return false;
 
   // The texture upload queue may reference textures that were just purged,
   // clear them from the queue.
   if (current_resource_update_controller_on_impl_thread_) {
     current_resource_update_controller_on_impl_thread_->
         DiscardUploadsToEvictedResources();
   }
   return true;
 }
 
 void ThreadProxy::ReduceWastedContentsTextureMemoryOnImplThread() {
   DCHECK(IsImplThread());
 
   if (!layer_tree_host_->contents_texture_manager())
     return;
-  if (!layer_tree_host_impl_->resource_provider())
-    return;
 
   layer_tree_host_->contents_texture_manager()->ReduceWastedMemoryOnImplThread(
       layer_tree_host_impl_->resource_provider());
 }
 
 void ThreadProxy::SendManagedMemoryStats() {
   DCHECK(IsImplThread());
   if (!layer_tree_host_impl_)
     return;
   if (!layer_tree_host_->contents_texture_manager())
@@ skipping 336 matching lines @@
   DCHECK(scheduler_on_impl_thread_->CommitPending());
 
   if (!layer_tree_host_impl_) {
     TRACE_EVENT0("cc", "EarlyOut_NoLayerTree");
     completion->Signal();
     return;
   }
 
   if (offscreen_context_provider.get())
     offscreen_context_provider->BindToCurrentThread();
-  if (layer_tree_host_impl_->resource_provider()) {
-    layer_tree_host_impl_->resource_provider()->
-        set_offscreen_context_provider(offscreen_context_provider);
-  }
+  layer_tree_host_impl_->resource_provider()->
+      set_offscreen_context_provider(offscreen_context_provider);
 
   if (layer_tree_host_->contents_texture_manager()) {
     if (layer_tree_host_->contents_texture_manager()->
             LinkedEvictedBackingsExist()) {
       // Clear any uploads we were making to textures linked to evicted
       // resources
       queue->ClearUploadsToEvictedResources();
       // Some textures in the layer tree are invalid. Kick off another commit
       // to fill them again.
       SetNeedsCommitOnImplThread();
     }
 
     layer_tree_host_->contents_texture_manager()->
         PushTexturePrioritiesToBackings();
   }
 
   commit_completion_event_on_impl_thread_ = completion;
-  if (layer_tree_host_impl_->resource_provider()) {
-    current_resource_update_controller_on_impl_thread_ =
-        ResourceUpdateController::Create(
-            this,
-            Proxy::ImplThreadTaskRunner(),
-            queue.Pass(),
-            layer_tree_host_impl_->resource_provider());
-    current_resource_update_controller_on_impl_thread_->PerformMoreUpdates(
-        scheduler_on_impl_thread_->AnticipatedDrawTime());
-  } else {
-    // Normally the ResourceUpdateController notifies when commit should
-    // finish, but in tile-free software rendering there is no resource
-    // update step so jump straight to the notification.
-    scheduler_on_impl_thread_->FinishCommit();
-  }
+  current_resource_update_controller_on_impl_thread_ =
+      ResourceUpdateController::Create(
+          this,
+          Proxy::ImplThreadTaskRunner(),
+          queue.Pass(),
+          layer_tree_host_impl_->resource_provider());
+  current_resource_update_controller_on_impl_thread_->PerformMoreUpdates(
+      scheduler_on_impl_thread_->AnticipatedDrawTime());
 }
 
 void ThreadProxy::BeginFrameAbortedByMainThreadOnImplThread() {
   TRACE_EVENT0("cc", "ThreadProxy::BeginFrameAbortedByMainThreadOnImplThread");
   DCHECK(IsImplThread());
   DCHECK(scheduler_on_impl_thread_);
   DCHECK(scheduler_on_impl_thread_->CommitPending());
 
   scheduler_on_impl_thread_->BeginFrameAbortedByMainThread();
 }
 
 void ThreadProxy::ScheduledActionCommit() {
   TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionCommit");
   DCHECK(IsImplThread());
   DCHECK(commit_completion_event_on_impl_thread_);
-  if (current_resource_update_controller_on_impl_thread_) {
-    // Complete all remaining texture updates.
-    current_resource_update_controller_on_impl_thread_->Finalize();
-    current_resource_update_controller_on_impl_thread_.reset();
-  }
+  DCHECK(current_resource_update_controller_on_impl_thread_);
+
+  // Complete all remaining texture updates.
+  current_resource_update_controller_on_impl_thread_->Finalize();
+  current_resource_update_controller_on_impl_thread_.reset();
 
   layer_tree_host_impl_->BeginCommit();
   layer_tree_host_->BeginCommitOnImplThread(layer_tree_host_impl_.get());
   layer_tree_host_->FinishCommitOnImplThread(layer_tree_host_impl_.get());
   layer_tree_host_impl_->CommitComplete();
 
   layer_tree_host_impl_->UpdateBackgroundAnimateTicking(
       !scheduler_on_impl_thread_->WillDrawIfNeeded());
 
   next_frame_is_newly_committed_frame_on_impl_thread_ = true;
@@ skipping 355 matching lines @@
 void ThreadProxy::DidTryInitializeRendererOnImplThread(
     bool success,
     scoped_refptr<ContextProvider> offscreen_context_provider) {
   DCHECK(IsImplThread());
   DCHECK(!inside_draw_);
 
   if (offscreen_context_provider.get())
     offscreen_context_provider->BindToCurrentThread();
 
   if (success) {
-    if (layer_tree_host_impl_->resource_provider()) {
-      layer_tree_host_impl_->resource_provider()->
-          set_offscreen_context_provider(offscreen_context_provider);
-    }
+    layer_tree_host_impl_->resource_provider()->
+        set_offscreen_context_provider(offscreen_context_provider);
   } else if (offscreen_context_provider.get()) {
     offscreen_context_provider->VerifyContexts();
   }
 }
 
 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) {
   TRACE_EVENT0("cc", "ThreadProxy::FinishGLOnImplThread");
   DCHECK(IsImplThread());
   if (layer_tree_host_impl_->resource_provider())
     layer_tree_host_impl_->resource_provider()->Finish();
@@ skipping 202 matching lines @@
       !layer_tree_host_impl_->pending_tree()) {
     TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation",
                          TRACE_EVENT_SCOPE_THREAD);
     DCHECK(layer_tree_host_impl_->settings().impl_side_painting);
     completion_event_for_commit_held_on_tree_activation_->Signal();
     completion_event_for_commit_held_on_tree_activation_ = NULL;
   }
 }
 
 }  // namespace cc