| Index: third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.h
|
| diff --git a/third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.h b/third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.h
|
| index 124ff01d6f390b89d5c70017c45d1592f57c23da..ecd68d232bf90521a4040d4e34bebf44194203de 100644
|
| --- a/third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.h
|
| +++ b/third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.h
|
| @@ -47,7 +47,10 @@ class PLATFORM_EXPORT TranslateTransformOperation final
|
| return adoptRef(new TranslateTransformOperation(tx, ty, tz, type));
|
| }
|
|
|
| - virtual bool canBlendWith(const TransformOperation& other) const;
|
| + bool canBlendWith(const TransformOperation& other) const override;
|
| + bool dependsOnBoxSize() const override {
|
| + return m_x.isPercentOrCalc() || m_y.isPercentOrCalc();
|
| + }
|
|
|
| double x(const FloatSize& borderBoxSize) const {
|
| return floatValueForLength(m_x, borderBoxSize.width());
|
| @@ -91,10 +94,6 @@ class PLATFORM_EXPORT TranslateTransformOperation final
|
| return zoomTranslate(factor);
|
| }
|
|
|
| - bool dependsOnBoxSize() const override {
|
| - return m_x.isPercentOrCalc() || m_y.isPercentOrCalc();
|
| - }
|
| -
|
| TranslateTransformOperation(const Length& tx,
|
| const Length& ty,
|
| double tz,
|
|
|