cc: Do not synchronize on deletion of non-internal resources.

cc/resources/resource_provider.cc

 // Copyright 2012 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/resources/resource_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 685 matching lines @@
 
   // Exported resources are lost on shutdown.
   bool exported_resource_lost =
       style == FOR_SHUTDOWN && resource->exported_count > 0;
   // GPU resources are lost when output surface is lost.
   bool gpu_resource_lost =
       IsGpuResourceType(resource->type) && lost_output_surface_;
   bool lost_resource =
       resource->lost || exported_resource_lost || gpu_resource_lost;
 
-  if (!lost_resource &&
+  // Wait on sync token before deleting resources we own.
+  if (!lost_resource && resource->origin == Resource::INTERNAL &&
       resource->synchronization_state() == Resource::NEEDS_WAIT) {
     DCHECK(resource->allocated);
     DCHECK(IsGpuResourceType(resource->type));
     GLES2Interface* gl = ContextGL();
     DCHECK(gl);
     resource->WaitSyncToken(gl);
   }
 
   if (resource->image_id) {
     DCHECK(resource->origin == Resource::INTERNAL);
@@ skipping 20 matching lines @@
     gl->DeleteBuffers(1, &resource->gl_pixel_buffer_id);
   }
   if (resource->origin == Resource::EXTERNAL) {
     DCHECK(resource->mailbox().IsValid());
     gpu::SyncToken sync_token = resource->mailbox().sync_token();
     if (IsGpuResourceType(resource->type)) {
       DCHECK(resource->mailbox().IsTexture());
       GLES2Interface* gl = ContextGL();
       DCHECK(gl);
       if (resource->gl_id) {
+        DCHECK_NE(Resource::NEEDS_WAIT, resource->synchronization_state());
         gl->DeleteTextures(1, &resource->gl_id);
         resource->gl_id = 0;
         if (!lost_resource) {
           const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
           gl->ShallowFlushCHROMIUM();
           gl->GenSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
         }
       }
     } else {
       DCHECK(resource->mailbox().IsSharedMemory());
@@ skipping 1216 matching lines @@
 
     const int kImportance = 2;
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
   }
 
   return true;
 }
 
 }  // namespace cc