Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot

1 files changed, 4 insertions, 5 deletions

diff --git a/Source/WebKit/chromium/tests/CCThreadedTest.h b/Source/WebKit/chromium/tests/CCThreadedTest.h
index 0f87de1f5..305c39293 100644
--- a/Source/WebKit/chromium/tests/CCThreadedTest.h
+++ b/Source/WebKit/chromium/tests/CCThreadedTest.h
@@ -31,6 +31,7 @@
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include <gtest/gtest.h>
 #include <public/WebAnimationDelegate.h>
+#include <public/WebThread.h>
 
 namespace WebCore {
 class CCLayerImpl;
@@ -40,10 +41,6 @@ class CCLayerTreeHostImpl;
 class GraphicsContext3D;
 }
 
-namespace WebKit {
-class WebThread;
-}
-
 namespace WebKitTests {
 
 // Used by test stubs to notify the test when something interesting happens.
@@ -56,7 +53,7 @@ public:
     virtual void animateLayers(WebCore::CCLayerTreeHostImpl*, double monotonicTime) { }
     virtual void willAnimateLayers(WebCore::CCLayerTreeHostImpl*, double monotonicTime) { }
     virtual void applyScrollAndScale(const WebCore::IntSize&, float) { }
-    virtual void updateAnimations(double monotonicTime) { }
+    virtual void animate(double monotonicTime) { }
     virtual void layout() { }
     virtual void didRecreateOutputSurface(bool succeeded) { }
     virtual void didAddAnimation() { }
@@ -117,6 +114,8 @@ public:
 protected:
     CCThreadedTest();
 
+    virtual void initializeSettings(WebCore::CCLayerTreeSettings&) { }
+
     virtual void scheduleComposite();
 
     static void onEndTest(void* self);