Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Unified Diff: Source/platform/graphics/GraphicsLayerTest.cpp

Issue 1184673003: Fix unit test style in Source/platform/, part 2. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/graphics/GraphicsLayerTest.cpp
diff --git a/Source/platform/graphics/GraphicsLayerTest.cpp b/Source/platform/graphics/GraphicsLayerTest.cpp
index 53d1505adcaf9742ab545399016c5f305933f448..3f495b6e9d5b8ac43369c454b1e764d33b38a7ac 100644
--- a/Source/platform/graphics/GraphicsLayerTest.cpp
+++ b/Source/platform/graphics/GraphicsLayerTest.cpp
@@ -23,7 +23,6 @@
*/
#include "config.h"
-
#include "platform/graphics/GraphicsLayer.h"
#include "platform/scroll/ScrollableArea.h"
@@ -38,17 +37,16 @@
#include "public/platform/WebLayerTreeView.h"
#include "public/platform/WebUnitTestSupport.h"
#include "wtf/PassOwnPtr.h"
-
#include <gtest/gtest.h>
-using namespace blink;
+namespace blink {
namespace {
class MockGraphicsLayerClient : public GraphicsLayerClient {
public:
- virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) override { }
- virtual String debugName(const GraphicsLayer*) override { return String(); }
+ void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) override { }
+ String debugName(const GraphicsLayer*) override { return String(); }
};
class GraphicsLayerForTesting : public GraphicsLayer {
@@ -56,9 +54,11 @@ public:
explicit GraphicsLayerForTesting(GraphicsLayerClient* client)
: GraphicsLayer(client) { };
- virtual WebLayer* contentsLayer() const { return GraphicsLayer::contentsLayer(); }
+ WebLayer* contentsLayer() const override { return GraphicsLayer::contentsLayer(); }
};
+} // anonymous namespace
+
class GraphicsLayerTest : public testing::Test {
public:
GraphicsLayerTest()
@@ -79,7 +79,7 @@ public:
m_layerTreeView->setViewportSize(WebSize(1, 1));
}
- virtual ~GraphicsLayerTest()
+ ~GraphicsLayerTest() override
{
m_graphicsLayer.clear();
m_layerTreeView.clear();
@@ -127,30 +127,30 @@ TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)
class FakeScrollableArea : public ScrollableArea {
public:
- virtual bool isActive() const override { return false; }
- virtual int scrollSize(ScrollbarOrientation) const override { return 100; }
- virtual bool isScrollCornerVisible() const override { return false; }
- virtual IntRect scrollCornerRect() const override { return IntRect(); }
- virtual int visibleWidth() const override { return 10; }
- virtual int visibleHeight() const override { return 10; }
- virtual IntSize contentsSize() const override { return IntSize(100, 100); }
- virtual bool scrollbarsCanBeActive() const override { return false; }
- virtual IntRect scrollableAreaBoundingBox() const override { return IntRect(); }
- virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) override { }
- virtual void invalidateScrollCornerRect(const IntRect&) override { }
- virtual bool userInputScrollable(ScrollbarOrientation) const override { return true; }
- virtual bool shouldPlaceVerticalScrollbarOnLeft() const override { return false; }
- virtual int pageStep(ScrollbarOrientation) const override { return 0; }
- virtual IntPoint minimumScrollPosition() const override { return IntPoint(); }
- virtual IntPoint maximumScrollPosition() const override
+ bool isActive() const override { return false; }
+ int scrollSize(ScrollbarOrientation) const override { return 100; }
+ bool isScrollCornerVisible() const override { return false; }
+ IntRect scrollCornerRect() const override { return IntRect(); }
+ int visibleWidth() const override { return 10; }
+ int visibleHeight() const override { return 10; }
+ IntSize contentsSize() const override { return IntSize(100, 100); }
+ bool scrollbarsCanBeActive() const override { return false; }
+ IntRect scrollableAreaBoundingBox() const override { return IntRect(); }
+ void invalidateScrollbarRect(Scrollbar*, const IntRect&) override { }
+ void invalidateScrollCornerRect(const IntRect&) override { }
+ bool userInputScrollable(ScrollbarOrientation) const override { return true; }
+ bool shouldPlaceVerticalScrollbarOnLeft() const override { return false; }
+ int pageStep(ScrollbarOrientation) const override { return 0; }
+ IntPoint minimumScrollPosition() const override { return IntPoint(); }
+ IntPoint maximumScrollPosition() const override
{
return IntPoint(contentsSize().width() - visibleWidth(), contentsSize().height() - visibleHeight());
}
- virtual void setScrollOffset(const IntPoint& scrollOffset, ScrollType) override { m_scrollPosition = scrollOffset; }
- virtual void setScrollOffset(const DoublePoint& scrollOffset, ScrollType) override { m_scrollPosition = scrollOffset; }
- virtual DoublePoint scrollPositionDouble() const override { return m_scrollPosition; }
- virtual IntPoint scrollPosition() const override { return flooredIntPoint(m_scrollPosition); }
+ void setScrollOffset(const IntPoint& scrollOffset, ScrollType) override { m_scrollPosition = scrollOffset; }
+ void setScrollOffset(const DoublePoint& scrollOffset, ScrollType) override { m_scrollPosition = scrollOffset; }
+ DoublePoint scrollPositionDouble() const override { return m_scrollPosition; }
+ IntPoint scrollPosition() const override { return flooredIntPoint(m_scrollPosition); }
private:
DoublePoint m_scrollPosition;
@@ -169,4 +169,4 @@ TEST_F(GraphicsLayerTest, applyScrollToScrollableArea)
EXPECT_FLOAT_EQ(scrollPosition.y, scrollableArea.scrollPositionDouble().y());
}
-} // namespace
+} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698