Modified old wait sync point functions to also accept new sync tokens.

cc/blink/web_external_texture_layer_impl.cc

 // Copyright 2014 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/blink/web_external_texture_layer_impl.h"
 
 #include "cc/blink/web_external_bitmap_impl.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/resources/single_release_callback.h"
@@ skipping 63 matching lines @@
   if (!client_->prepareMailbox(&client_mailbox, bitmap)) {
     if (bitmap)
       free_bitmaps_.push_back(bitmap);
     return false;
   }
   gpu::Mailbox name;
   name.SetName(client_mailbox.name);
   if (bitmap) {
     *mailbox = cc::TextureMailbox(bitmap->shared_bitmap(), bitmap->size());
   } else {
+    gpu::SyncToken sync_token;
+    static_assert(sizeof(sync_token) <= sizeof(client_mailbox.syncToken),
+                  "Size of web external sync token too small.");
+    if (client_mailbox.validSyncToken)
+      memcpy(&sync_token, client_mailbox.syncToken, sizeof(sync_token));
+
     // TODO(achaulk): pass a valid size here if allowOverlay is set.
     *mailbox = cc::TextureMailbox(name, GL_TEXTURE_2D, client_mailbox.syncPoint,
-                                  gfx::Size(), client_mailbox.allowOverlay);
+                                  sync_token, gfx::Size(),
+                                  client_mailbox.allowOverlay);
   }
   mailbox->set_nearest_neighbor(client_mailbox.nearestNeighbor);
 
   if (mailbox->IsValid()) {
     *release_callback = cc::SingleReleaseCallback::Create(
         base::Bind(&WebExternalTextureLayerImpl::DidReleaseMailbox,
                    this->AsWeakPtr(),
                    client_mailbox,
                    bitmap));
   }
 
   return true;
 }
 
 WebExternalBitmapImpl* WebExternalTextureLayerImpl::AllocateBitmap() {
   if (!free_bitmaps_.empty()) {
     WebExternalBitmapImpl* result = free_bitmaps_.back();
     free_bitmaps_.weak_erase(free_bitmaps_.end() - 1);
     return result;
   }
   return new WebExternalBitmapImpl;
 }
 
 // static
 void WebExternalTextureLayerImpl::DidReleaseMailbox(
     base::WeakPtr<WebExternalTextureLayerImpl> layer,
     const blink::WebExternalTextureMailbox& mailbox,
     WebExternalBitmapImpl* bitmap,
     unsigned sync_point,
+    const gpu::SyncToken& sync_token,
     bool lost_resource) {
   DCHECK(layer);
   blink::WebExternalTextureMailbox available_mailbox;
+  static_assert(sizeof(sync_token) <= sizeof(available_mailbox.syncToken),
+                "Size of web external sync token too small.");
   memcpy(available_mailbox.name, mailbox.name, sizeof(available_mailbox.name));
   available_mailbox.syncPoint = sync_point;
+  memcpy(available_mailbox.syncToken, sync_token.GetConstData(),
+         sizeof(sync_token));
+  available_mailbox.validSyncToken = sync_token.HasData();
   if (bitmap)
     layer->free_bitmaps_.push_back(bitmap);
   layer->client_->mailboxReleased(available_mailbox, lost_resource);
 }
 
 }  // namespace cc_blink