Cleanup duplicated namespace in AnimationTranslationUtil

Review URL: https://codereview.chromium.org/453393002

git-svn-id: svn://svn.chromium.org/blink/trunk@180044 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent dd8c2a6b
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#include "platform/transforms/TranslateTransformOperation.h" #include "platform/transforms/TranslateTransformOperation.h"
#include "public/platform/WebTransformOperations.h" #include "public/platform/WebTransformOperations.h"
using namespace blink;
namespace blink { namespace blink {
void toWebTransformOperations(const TransformOperations& transformOperations, WebTransformOperations* webTransformOperations) void toWebTransformOperations(const TransformOperations& transformOperations, WebTransformOperations* webTransformOperations)
......
...@@ -31,18 +31,15 @@ ...@@ -31,18 +31,15 @@
#ifndef AnimationTranslationUtil_h #ifndef AnimationTranslationUtil_h
#define AnimationTranslationUtil_h #define AnimationTranslationUtil_h
namespace blink {
class WebTransformOperations;
class WebFilterOperations;
}
namespace blink { namespace blink {
class FilterOperations; class FilterOperations;
class TransformOperations; class TransformOperations;
class WebFilterOperations;
class WebTransformOperations;
void toWebTransformOperations(const TransformOperations& inOperations, blink::WebTransformOperations* outOperations); void toWebTransformOperations(const TransformOperations& inOperations, WebTransformOperations* outOperations);
void toWebFilterOperations(const FilterOperations& inOperations, blink::WebFilterOperations* outOperations); void toWebFilterOperations(const FilterOperations& inOperations, WebFilterOperations* outOperations);
} // namespace blink } // namespace blink
......
...@@ -42,12 +42,11 @@ ...@@ -42,12 +42,11 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
using namespace blink;
using namespace blink; using namespace blink;
namespace { namespace {
class WebTransformOperationsMock : public blink::WebTransformOperations { class WebTransformOperationsMock : public WebTransformOperations {
public: public:
MOCK_CONST_METHOD1(canBlendWith, bool(const WebTransformOperations&)); MOCK_CONST_METHOD1(canBlendWith, bool(const WebTransformOperations&));
MOCK_METHOD3(appendTranslate, void(double, double, double)); MOCK_METHOD3(appendTranslate, void(double, double, double));
...@@ -60,7 +59,7 @@ public: ...@@ -60,7 +59,7 @@ public:
MOCK_CONST_METHOD0(isIdentity, bool()); MOCK_CONST_METHOD0(isIdentity, bool());
}; };
class WebFilterOperationsMock : public blink::WebFilterOperations { class WebFilterOperationsMock : public WebFilterOperations {
public: public:
MOCK_METHOD1(appendGrayscaleFilter, void(float)); MOCK_METHOD1(appendGrayscaleFilter, void(float));
MOCK_METHOD1(appendSepiaFilter, void(float)); MOCK_METHOD1(appendSepiaFilter, void(float));
...@@ -88,7 +87,7 @@ TEST(AnimationTranslationUtilTest, transformsWork) ...@@ -88,7 +87,7 @@ TEST(AnimationTranslationUtilTest, transformsWork)
EXPECT_CALL(outOps, appendRotate(0.1, 0.2, 0.3, 200000.4)); EXPECT_CALL(outOps, appendRotate(0.1, 0.2, 0.3, 200000.4));
EXPECT_CALL(outOps, appendScale(50.2, 100, -4)); EXPECT_CALL(outOps, appendScale(50.2, 100, -4));
ops.operations().append(TranslateTransformOperation::create(Length(2, blink::Fixed), Length(0, blink::Fixed), TransformOperation::TranslateX)); ops.operations().append(TranslateTransformOperation::create(Length(2, Fixed), Length(0, Fixed), TransformOperation::TranslateX));
ops.operations().append(RotateTransformOperation::create(0.1, 0.2, 0.3, 200000.4, TransformOperation::Rotate3D)); ops.operations().append(RotateTransformOperation::create(0.1, 0.2, 0.3, 200000.4, TransformOperation::Rotate3D));
ops.operations().append(ScaleTransformOperation::create(50.2, 100, -4, TransformOperation::Scale3D)); ops.operations().append(ScaleTransformOperation::create(50.2, 100, -4, TransformOperation::Scale3D));
toWebTransformOperations(ops, &outOps); toWebTransformOperations(ops, &outOps);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment