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

components/test_runner/test_plugin.cc

 // Copyright 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 "components/test_runner/test_plugin.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
@@ skipping 296 matching lines @@
     context_->framebufferTexture2D(
         GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, color_texture_, 0);
 
     DrawSceneGL();
 
     gpu::Mailbox mailbox;
     context_->genMailboxCHROMIUM(mailbox.name);
     context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     context_->flush();
     uint32 sync_point = context_->insertSyncPoint();
-    texture_mailbox_ = cc::TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point);
+    texture_mailbox_ = cc::TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point,
+                                          gpu::SyncToken());
   } else {
     scoped_ptr<cc::SharedBitmap> bitmap =
         delegate_->GetSharedBitmapManager()->AllocateSharedBitmap(
             gfx::Rect(rect_).size());
     if (!bitmap) {
       texture_mailbox_ = cc::TextureMailbox();
     } else {
       DrawSceneSoftware(bitmap->pixels());
       texture_mailbox_ = cc::TextureMailbox(
           bitmap.get(), gfx::Size(rect_.width, rect_.height));
       shared_bitmap_ = bitmap.Pass();
     }
   }
 
   mailbox_changed_ = true;
   layer_->SetNeedsDisplay();
 }
 
 bool TestPlugin::acceptsInputEvents() {
   return true;
 }
 
 bool TestPlugin::isPlaceholder() {
   return false;
 }
 
-static void IgnoreReleaseCallback(uint32 sync_point, bool lost) {
-}
+static void IgnoreReleaseCallback(uint32 sync_point,
+                                  const gpu::SyncToken& sync_token,
+                                  bool lost) {}
 
 static void ReleaseSharedMemory(scoped_ptr<cc::SharedBitmap> bitmap,
                                 uint32 sync_point,
-                                bool lost) {
-}
+                                const gpu::SyncToken& sync_token,
+                                bool lost) {}
 
 bool TestPlugin::PrepareTextureMailbox(
     cc::TextureMailbox* mailbox,
     scoped_ptr<cc::SingleReleaseCallback>* release_callback,
     bool use_shared_memory) {
   if (!mailbox_changed_)
     return false;
   *mailbox = texture_mailbox_;
   if (texture_mailbox_.IsTexture()) {
     *release_callback =
@@ skipping 418 matching lines @@
   return kPluginPersistsMimeType;
 }
 
 bool TestPlugin::IsSupportedMimeType(const blink::WebString& mime_type) {
   return mime_type == TestPlugin::MimeType() ||
          mime_type == PluginPersistsMimeType() ||
          mime_type == CanCreateWithoutRendererMimeType();
 }
 
 }  // namespace test_runner