| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 #include "public/platform/WebLayerTreeView.h" | 41 #include "public/platform/WebLayerTreeView.h" |
| 42 #include "public/platform/WebUnitTestSupport.h" | 42 #include "public/platform/WebUnitTestSupport.h" |
| 43 | 43 |
| 44 using namespace WebCore; | 44 using namespace WebCore; |
| 45 using namespace blink; | 45 using namespace blink; |
| 46 | 46 |
| 47 namespace { | 47 namespace { |
| 48 | 48 |
| 49 class MockGraphicsLayerClient : public GraphicsLayerClient { | 49 class MockGraphicsLayerClient : public GraphicsLayerClient { |
| 50 public: | 50 public: |
| 51 virtual void notifyAnimationStarted(const GraphicsLayer*, double wallClockTi
me, double monotonicTime) OVERRIDE { } | 51 virtual void notifyAnimationStarted(const GraphicsLayer*, double monotonicTi
me) OVERRIDE { } |
| 52 virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsL
ayerPaintingPhase, const IntRect& inClip) OVERRIDE { } | 52 virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsL
ayerPaintingPhase, const IntRect& inClip) OVERRIDE { } |
| 53 virtual String debugName(const GraphicsLayer*) OVERRIDE { return String(); } | 53 virtual String debugName(const GraphicsLayer*) OVERRIDE { return String(); } |
| 54 }; | 54 }; |
| 55 | 55 |
| 56 class GraphicsLayerForTesting : public GraphicsLayer { | 56 class GraphicsLayerForTesting : public GraphicsLayer { |
| 57 public: | 57 public: |
| 58 explicit GraphicsLayerForTesting(GraphicsLayerClient* client) | 58 explicit GraphicsLayerForTesting(GraphicsLayerClient* client) |
| 59 : GraphicsLayer(client) { }; | 59 : GraphicsLayer(client) { }; |
| 60 | 60 |
| 61 virtual blink::WebLayer* contentsLayer() const { return GraphicsLayer::conte
ntsLayer(); } | 61 virtual blink::WebLayer* contentsLayer() const { return GraphicsLayer::conte
ntsLayer(); } |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 m_graphicsLayer->setScrollableArea(&scrollableArea, false); | 159 m_graphicsLayer->setScrollableArea(&scrollableArea, false); |
| 160 | 160 |
| 161 WebPoint scrollPosition(7, 9); | 161 WebPoint scrollPosition(7, 9); |
| 162 m_platformLayer->setScrollPosition(scrollPosition); | 162 m_platformLayer->setScrollPosition(scrollPosition); |
| 163 m_graphicsLayer->didScroll(); | 163 m_graphicsLayer->didScroll(); |
| 164 | 164 |
| 165 EXPECT_EQ(scrollPosition, WebPoint(scrollableArea.scrollPosition())); | 165 EXPECT_EQ(scrollPosition, WebPoint(scrollableArea.scrollPosition())); |
| 166 } | 166 } |
| 167 | 167 |
| 168 } // namespace | 168 } // namespace |
| OLD | NEW |