gpu-raster: Check for NULL sk_surface in GpuRasterizer::RasterizeSource.

content/common/gpu/client/context_provider_command_buffer.cc

 // Copyright (c) 2013 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 "content/common/gpu/client/context_provider_command_buffer.h"
 
 #include <set>
 #include <vector>
 
 #include "base/callback_helpers.h"
 #include "base/strings/stringprintf.h"
 #include "cc/output/managed_memory_policy.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
+#include "third_party/skia/include/gpu/GrContext.h"
 #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h"
 
 namespace content {
 
 class ContextProviderCommandBuffer::LostContextCallbackProxy
     : public blink::WebGraphicsContext3D::WebGraphicsContextLostCallback {
  public:
   explicit LostContextCallbackProxy(ContextProviderCommandBuffer* provider)
       : provider_(provider) {
     provider_->context3d_->setContextLostCallback(this);
@@ skipping 102 matching lines @@
 
 class GrContext* ContextProviderCommandBuffer::GrContext() {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     return gr_context_->get();
 
   gr_context_.reset(
       new webkit::gpu::GrContextForWebGraphicsContext3D(context3d_.get()));
+
+  // If GlContext is already lost, also abandon the new GrContext.
+  if (IsContextLost())
+    gr_context_->get()->abandonContext();
+
   return gr_context_->get();
 }
 
 void ContextProviderCommandBuffer::SetupLock() {
   DCHECK(context3d_);
   context3d_->GetCommandBufferProxy()->SetLock(&context_lock_);
 }
 
 base::Lock* ContextProviderCommandBuffer::GetLock() {
   return &context_lock_;
@@ skipping 82 matching lines @@
 
 void ContextProviderCommandBuffer::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(memory_policy_changed_callback_.is_null() ||
          memory_policy_changed_callback.is_null());
   memory_policy_changed_callback_ = memory_policy_changed_callback;
 }
 
 }  // namespace content