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

cc/resources/texture_mailbox.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 "cc/resources/texture_mailbox.h"
 
 #include "base/logging.h"
 #include "cc/resources/shared_bitmap.h"
 
 namespace cc {
 
 TextureMailbox::TextureMailbox() : shared_bitmap_(NULL) {
 }
 
 TextureMailbox::TextureMailbox(const gpu::MailboxHolder& mailbox_holder)
     : mailbox_holder_(mailbox_holder),
       shared_bitmap_(NULL),
       is_overlay_candidate_(false),
       nearest_neighbor_(false) {}
 
 TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
                                uint32 target,
-                               uint32 sync_point)
-    : mailbox_holder_(mailbox, target, sync_point),
+                               uint32 sync_point,
+                               const gpu::SyncToken& sync_token)
+    : mailbox_holder_(mailbox, sync_point, sync_token, target),
       shared_bitmap_(NULL),
       is_overlay_candidate_(false),
       nearest_neighbor_(false) {}
 
 TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
                                uint32 target,
                                uint32 sync_point,
+                               const gpu::SyncToken& sync_token,
                                const gfx::Size& size_in_pixels,
                                bool is_overlay_candidate)
-    : mailbox_holder_(mailbox, target, sync_point),
+    : mailbox_holder_(mailbox, sync_point, sync_token, target),
       shared_bitmap_(nullptr),
       size_in_pixels_(size_in_pixels),
       is_overlay_candidate_(is_overlay_candidate),
       nearest_neighbor_(false) {
   DCHECK_IMPLIES(is_overlay_candidate, !size_in_pixels.IsEmpty());
 }
 
 TextureMailbox::TextureMailbox(SharedBitmap* shared_bitmap,
                                const gfx::Size& size_in_pixels)
     : shared_bitmap_(shared_bitmap),
@@ skipping 20 matching lines @@
   return !IsValid();
 }
 
 size_t TextureMailbox::SharedMemorySizeInBytes() const {
   // UncheckedSizeInBytes is okay because we VerifySizeInBytes in the
   // constructor and the field is immutable.
   return SharedBitmap::UncheckedSizeInBytes(size_in_pixels_);
 }
 
 }  // namespace cc