Changeset 123101 in webkit


Ignore:
Timestamp:
Jul 19, 2012 7:44:19 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Remove duplicate mock CCLayerTreeHostClient
https://bugs.webkit.org/show_bug.cgi?id=89457

Patch by Sami Kyostila <skyostil@chromium.org> on 2012-07-19
Reviewed by Adrienne Walker.

This test can reuse the existing CCFakeLayerTreeHostClient.

  • tests/GraphicsLayerChromiumTest.cpp:

(WebKitTests::MockLayerTreeHost::create):

Location:
trunk/Source/WebKit/chromium
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r123095 r123101  
     12012-07-19  Sami Kyostila  <skyostil@chromium.org>
     2
     3        [chromium] Remove duplicate mock CCLayerTreeHostClient
     4        https://bugs.webkit.org/show_bug.cgi?id=89457
     5
     6        Reviewed by Adrienne Walker.
     7
     8        This test can reuse the existing CCFakeLayerTreeHostClient.
     9
     10        * tests/GraphicsLayerChromiumTest.cpp:
     11        (WebKitTests::MockLayerTreeHost::create):
     12
    1132012-07-19  Peter Beverloo  <peter@chromium.org>
    214
  • trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp

    r121844 r123101  
    2929#include "CCAnimationTestCommon.h"
    3030#include "CompositorFakeWebGraphicsContext3D.h"
     31#include "FakeCCLayerTreeHostClient.h"
    3132#include "GraphicsContext3D.h"
    3233#include "GraphicsContext3DPrivate.h"
     
    6263};
    6364
    64 class MockLayerTreeHostClient : public CCLayerTreeHostClient {
    65 public:
    66     virtual void willBeginFrame() OVERRIDE { }
    67     virtual void didBeginFrame() OVERRIDE { }
    68     virtual void updateAnimations(double frameBeginTime) OVERRIDE { }
    69     virtual void layout() OVERRIDE { }
    70     virtual void applyScrollAndScale(const IntSize& scrollDelta, float pageScale) OVERRIDE { }
    71     virtual PassOwnPtr<WebGraphicsContext3D> createContext3D() OVERRIDE
    72     {
    73         return CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes());
    74     }
    75     virtual void didRecreateContext(bool success) OVERRIDE { }
    76     virtual void willCommit() OVERRIDE { }
    77     virtual void didCommit() OVERRIDE { }
    78     virtual void didCommitAndDrawFrame() OVERRIDE { }
    79     virtual void didCompleteSwapBuffers() OVERRIDE { }
    80     virtual void scheduleComposite() OVERRIDE { }
    81 };
    82 
    8365class MockLayerTreeHost : public CCLayerTreeHost {
    8466public:
     
    8668    {
    8769        CCLayerTreeSettings settings;
    88         OwnPtr<MockLayerTreeHost> layerTreeHost(adoptPtr(new MockLayerTreeHost(new MockLayerTreeHostClient(), settings)));
     70        OwnPtr<MockLayerTreeHost> layerTreeHost(adoptPtr(new MockLayerTreeHost(new FakeCCLayerTreeHostClient(), settings)));
    8971        bool success = layerTreeHost->initialize();
    9072        EXPECT_TRUE(success);
Note: See TracChangeset for help on using the changeset viewer.