Remove WebKit::Platform dependencies from cc

cc/layer_tree_host_unittest.cc

 // Copyright 2011 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 "config.h"
 
 #include "cc/layer_tree_host.h"
 
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
 #include "cc/graphics_context.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test_common.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/resource_update_queue.h"
 #include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
-#include <public/Platform.h>
 #include <public/WebLayerScrollClient.h>
 #include <public/WebSize.h>
 
 using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
 namespace {
 
 class LayerTreeHostTest : public ThreadedTest { };
@@ skipping 1037 matching lines @@
     }
 
     virtual void drawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
         impl->rootLayer()->setScrollable(true);
         impl->rootLayer()->setScrollPosition(IntPoint());
         impl->setPageScaleFactorAndLimits(impl->pageScaleFactor(), 0.5, 2);
 
         // We request animation only once.
         if (!m_animationRequested) {
-            m_mainThreadProxy->postTask(createThreadTask(this, &LayerTreeHostTestStartPageScaleAnimation::requestStartPageScaleAnimation));
+            m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&LayerTreeHostTestStartPageScaleAnimation::requestStartPageScaleAnimation, base::Unretained(this)));
             m_animationRequested = true;
         }
     }
 
     virtual void applyScrollAndScale(const IntSize& scrollDelta, float scale) OVERRIDE
     {
         IntPoint position = m_layerTreeHost->rootLayer()->scrollPosition();
         m_layerTreeHost->rootLayer()->setScrollPosition(position + scrollDelta);
         m_layerTreeHost->setPageScaleFactorAndLimits(scale, 0.5, 2);
     }
@@ skipping 1605 matching lines @@
     {
         m_layerTreeHost->setRootLayer(m_layer);
         m_layerTreeHost->setViewportSize(IntSize(10, 20), IntSize(10, 20));
 
         WebTransformationMatrix identityMatrix;
         setLayerPropertiesForTesting(m_layer.get(), 0, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(10, 20), true);
 
         postSetNeedsCommitToMainThread();
     }
 
-    class EvictTexturesTask : public WebKit::WebThread::Task {
-    public:
-        EvictTexturesTask(LayerTreeHostTestEvictTextures* test) : m_test(test) { }
-        virtual ~EvictTexturesTask() { }
-        virtual void run() OVERRIDE
-        {
-            DCHECK(m_test->m_implForEvictTextures);
-            m_test->m_implForEvictTextures->enforceManagedMemoryPolicy(ManagedMemoryPolicy(0));
-        }
-
-    private:
-        LayerTreeHostTestEvictTextures* m_test;
-    };
-
     void postEvictTextures()
     {
-        DCHECK(webThread());
-        webThread()->postTask(new EvictTexturesTask(this));
+        DCHECK(implThread());
+        implThread()->postTask(base::Bind(&LayerTreeHostTestEvictTextures::evictTexturesOnImplThread,
+                               base::Unretained(this)));
+    }
+
+    void evictTexturesOnImplThread()
+    {
+        DCHECK(m_implForEvictTextures);
+        m_implForEvictTextures->enforceManagedMemoryPolicy(ManagedMemoryPolicy(0));
     }
 
     // Commit 1: Just commit and draw normally, then post an eviction at the end
     // that will trigger a commit.
     // Commit 2: Triggered by the eviction, let it go through and then set
     // needsCommit.
     // Commit 3: Triggered by the setNeedsCommit. In layout(), post an eviction
     // task, which will be handled before the commit. Don't set needsCommit, it
     // should have been posted. A frame should not be drawn (note,
     // didCommitAndDrawFrame may be called anyway).
@@ skipping 102 matching lines @@
     {
         m_layerTreeHost->setRootLayer(m_layer);
         m_layerTreeHost->setViewportSize(IntSize(10, 20), IntSize(10, 20));
 
         WebTransformationMatrix identityMatrix;
         setLayerPropertiesForTesting(m_layer.get(), 0, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(10, 20), true);
 
         postSetNeedsCommitToMainThread();
     }
 
-    class EvictTexturesTask : public WebKit::WebThread::Task {
-    public:
-        EvictTexturesTask(LayerTreeHostTestLostContextAfterEvictTextures* test) : m_test(test) { }
-        virtual ~EvictTexturesTask() { }
-        virtual void run() OVERRIDE
-        {
-            m_test->evictTexturesOnImplThread();
-        }
-
-    private:
-        LayerTreeHostTestLostContextAfterEvictTextures* m_test;
-    };
-
     void postEvictTextures()
     {
-        if (webThread())
-            webThread()->postTask(new EvictTexturesTask(this));
-        else {
+        if (implThread()) {
+            implThread()->postTask(base::Bind(&LayerTreeHostTestLostContextAfterEvictTextures::evictTexturesOnImplThread,
+                                              base::Unretained(this)));
+        } else {
             DebugScopedSetImplThread impl;
             evictTexturesOnImplThread();
         }
     }
 
     void evictTexturesOnImplThread()
     {
         DCHECK(m_implForEvictTextures);
         m_implForEvictTextures->enforceManagedMemoryPolicy(ManagedMemoryPolicy(0));
     }
@@ skipping 350 matching lines @@
     int m_numCommitsDeferred;
     int m_numCompleteCommits;
 };
 
 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread)
 {
     runTest(true);
 }
 
 } // namespace