Thread ui opacity animations

BUG=164206


Review URL: https://chromiumcodereview.appspot.com/11896017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184254 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 4 insertions, 44 deletions

diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp
index df98e44..51d2575 100644
--- a/webkit/compositor_bindings/compositor_bindings.gyp
+++ b/webkit/compositor_bindings/compositor_bindings.gyp
@@ -7,8 +7,6 @@
     'webkit_compositor_bindings_sources': [
       'web_animation_curve_common.cc',
       'web_animation_curve_common.h',
-      'web_animation_id_provider.cc',
-      'web_animation_id_provider.h',
       'web_animation_impl.cc',
       'web_animation_impl.h',
       'web_compositor_support_software_output_device.cc',
diff --git a/webkit/compositor_bindings/web_animation_id_provider.cc b/webkit/compositor_bindings/web_animation_id_provider.cc
deleted file mode 100644
index efd3f0f..0000000
--- a/webkit/compositor_bindings/web_animation_id_provider.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 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 "webkit/compositor_bindings/web_animation_id_provider.h"
-
-namespace webkit {
-
-int WebAnimationIdProvider::NextAnimationId() {
-  static int next_animation_id = 1;
-  return next_animation_id++;
-}
-
-int WebAnimationIdProvider::NextGroupId() {
-  static int next_group_id = 1;
-  return next_group_id++;
-}
-
-}  // namespace webkit
diff --git a/webkit/compositor_bindings/web_animation_id_provider.h b/webkit/compositor_bindings/web_animation_id_provider.h
deleted file mode 100644
index 631785c..0000000
--- a/webkit/compositor_bindings/web_animation_id_provider.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 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.
-
-#ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_ANIMATION_ID_PROVIDER
-#define WEBKIT_COMPOSITOR_BINDINGS_WEB_ANIMATION_ID_PROVIDER
-
-namespace webkit {
-
-class WebAnimationIdProvider {
- public:
-  // These functions each return monotonically increasing values.
-  static int NextAnimationId();
-  static int NextGroupId();
-};
-
-}
-
-#endif  // WEBKIT_COMPOSITOR_BINDINGS_WEB_ANIMATION_ID_PROVIDER
diff --git a/webkit/compositor_bindings/web_animation_impl.cc b/webkit/compositor_bindings/web_animation_impl.cc
index 21b0bc8..961df4d 100644
--- a/webkit/compositor_bindings/web_animation_impl.cc
+++ b/webkit/compositor_bindings/web_animation_impl.cc
@@ -6,23 +6,23 @@
 
 #include "cc/animation.h"
 #include "cc/animation_curve.h"
+#include "cc/animation_id_provider.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"
-#include "webkit/compositor_bindings/web_animation_id_provider.h"
 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
 #include "webkit/compositor_bindings/web_transform_animation_curve_impl.h"
 
 using cc::Animation;
-using webkit::WebAnimationIdProvider;
+using cc::AnimationIdProvider;
 
 namespace WebKit {
 
 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProperty targetProperty, int animationId, int groupId)
 {
     if (!animationId)
-        animationId = WebAnimationIdProvider::NextAnimationId();
+        animationId = AnimationIdProvider::NextAnimationId();
     if (!groupId)
-        groupId = WebAnimationIdProvider::NextGroupId();
+        groupId = AnimationIdProvider::NextGroupId();
 
     WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
     scoped_ptr<cc::AnimationCurve> curve;