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

components/pdf_viewer/pdf_viewer.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/cpp/scoped_window_ptr.h"
 #include "components/mus/public/cpp/types.h"
@@ skipping 141 matching lines @@
                       0,
                       bitmap_size.width,
                       bitmap_size.height,
                       TextureFormat(),
                       GL_UNSIGNED_BYTE,
                       &((*bitmap_)[0]));
 
       GLbyte mailbox[GL_MAILBOX_SIZE_CHROMIUM];
       glGenMailboxCHROMIUM(mailbox);
       glProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox);
-      GLuint sync_point = glInsertSyncPointCHROMIUM();
+      gpu::SyncToken sync_token(glInsertSyncPointCHROMIUM());
 
       mus::mojom::TransferableResourcePtr resource =
           mus::mojom::TransferableResource::New();
       resource->id = next_resource_id_++;
       resource_to_texture_id_map_[resource->id] = texture_id;
       resource->format = mus::mojom::RESOURCE_FORMAT_RGBA_8888;
       resource->filter = GL_LINEAR;
       resource->size = bitmap_size.Clone();
       mus::mojom::MailboxHolderPtr mailbox_holder =
           mus::mojom::MailboxHolder::New();
       mailbox_holder->mailbox = mus::mojom::Mailbox::New();
       for (int i = 0; i < GL_MAILBOX_SIZE_CHROMIUM; ++i)
         mailbox_holder->mailbox->name.push_back(mailbox[i]);
       mailbox_holder->texture_target = GL_TEXTURE_2D;
-      mailbox_holder->sync_point = sync_point;
+      mailbox_holder->sync_token =
+          mus::mojom::SyncToken::From<gpu::SyncToken>(sync_token);
       resource->mailbox_holder = mailbox_holder.Pass();
       resource->is_repeated = false;
       resource->is_software = false;
 
       mus::mojom::QuadPtr quad = mus::mojom::Quad::New();
       quad->material = mus::mojom::MATERIAL_TEXTURE_CONTENT;
 
       mojo::RectPtr rect = mojo::Rect::New();
       if (width_ <= bounds.width() && height_ <= bounds.height()) {
         rect->width = width_;
@@ skipping 90 matching lines @@
   }
 
   // SurfaceClient implementation.
   void ReturnResources(
       mojo::Array<mus::mojom::ReturnedResourcePtr> resources) override {
     MojoGLES2MakeCurrent(gles2_context_);
     // TODO(jamesr): Recycle.
     for (size_t i = 0; i < resources.size(); ++i) {
       mus::mojom::ReturnedResourcePtr resource = resources[i].Pass();
       DCHECK_EQ(1, resource->count);
-      glWaitSyncPointCHROMIUM(resource->sync_point);
+      glWaitSyncTokenCHROMIUM(
+          resource->sync_token.To<gpu::SyncToken>().GetConstData());
       uint32_t texture_id = resource_to_texture_id_map_[resource->id];
       DCHECK_NE(0u, texture_id);
       resource_to_texture_id_map_.erase(resource->id);
       glDeleteTextures(1, &texture_id);
     }
   }
 
   mus::Window* view_;
   mus::mojom::GpuPtr gpu_service_;
   scoped_ptr<mus::WindowSurface> surface_;
@@ skipping 336 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PDFViewer);
 };
 }  // namespace
 }  // namespace pdf_viewer
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer());
   return runner.Run(application_request);
 }