| Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
|
| index 37560941691989bce939245140b9259d21f02287..0b2a34864524354b8fcebb9401d6b30f5cd42f48 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
|
| @@ -362,8 +362,9 @@ TEST_F(CanvasRenderingContext2DTest, detectOverdrawWithFillRect) {
|
| TEST_OVERDRAW_1(1, fillRect(-1, -1, 12, 12));
|
| TEST_OVERDRAW_1(1, fillRect(0, 0, 10, 10));
|
| TEST_OVERDRAW_1(
|
| - 0, strokeRect(0, 0, 10,
|
| - 10)); // stroking instead of filling does not overwrite
|
| + 0,
|
| + strokeRect(0, 0, 10,
|
| + 10)); // stroking instead of filling does not overwrite
|
| TEST_OVERDRAW_2(0, setGlobalAlpha(0.5f), fillRect(0, 0, 10, 10));
|
| TEST_OVERDRAW_1(0, fillRect(0, 0, 9, 9));
|
| TEST_OVERDRAW_2(0, translate(1, 1), fillRect(0, 0, 10, 10));
|
| @@ -401,31 +402,37 @@ TEST_F(CanvasRenderingContext2DTest, detectOverdrawWithDrawImage) {
|
| createContext(NonOpaque);
|
| NonThrowableExceptionState exceptionState;
|
|
|
| - TEST_OVERDRAW_1(1, drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10,
|
| - 0, 0, 10, 10, exceptionState));
|
| + TEST_OVERDRAW_1(1,
|
| + drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10, 0,
|
| + 0, 10, 10, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| - TEST_OVERDRAW_1(1, drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 1, 1, 0,
|
| - 0, 10, 10, exceptionState));
|
| + TEST_OVERDRAW_1(1,
|
| + drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 1, 1, 0, 0,
|
| + 10, 10, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| TEST_OVERDRAW_2(0, setGlobalAlpha(0.5f),
|
| drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10, 0,
|
| 0, 10, 10, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| - TEST_OVERDRAW_1(0, drawImage(getScriptState(), &m_alphaBitmap, 0, 0, 10, 10,
|
| - 0, 0, 10, 10, exceptionState));
|
| + TEST_OVERDRAW_1(0,
|
| + drawImage(getScriptState(), &m_alphaBitmap, 0, 0, 10, 10, 0,
|
| + 0, 10, 10, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| TEST_OVERDRAW_2(0, setGlobalAlpha(0.5f),
|
| drawImage(getScriptState(), &m_alphaBitmap, 0, 0, 10, 10, 0,
|
| 0, 10, 10, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| - TEST_OVERDRAW_1(0, drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10,
|
| - 1, 0, 10, 10, exceptionState));
|
| + TEST_OVERDRAW_1(0,
|
| + drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10, 1,
|
| + 0, 10, 10, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| - TEST_OVERDRAW_1(0, drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10,
|
| - 0, 0, 9, 9, exceptionState));
|
| + TEST_OVERDRAW_1(0,
|
| + drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10, 0,
|
| + 0, 9, 9, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| - TEST_OVERDRAW_1(1, drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10,
|
| - 0, 0, 11, 11, exceptionState));
|
| + TEST_OVERDRAW_1(1,
|
| + drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10, 0,
|
| + 0, 11, 11, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| TEST_OVERDRAW_2(1, translate(-1, 0),
|
| drawImage(getScriptState(), &m_opaqueBitmap, 0, 0, 10, 10, 1,
|
| @@ -462,8 +469,9 @@ TEST_F(CanvasRenderingContext2DTest, detectOverdrawWithPutImageData) {
|
| // Test putImageData
|
| TEST_OVERDRAW_1(1, putImageData(m_fullImageData.get(), 0, 0, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| - TEST_OVERDRAW_1(1, putImageData(m_fullImageData.get(), 0, 0, 0, 0, 10, 10,
|
| - exceptionState));
|
| + TEST_OVERDRAW_1(
|
| + 1,
|
| + putImageData(m_fullImageData.get(), 0, 0, 0, 0, 10, 10, exceptionState));
|
| EXPECT_FALSE(exceptionState.hadException());
|
| TEST_OVERDRAW_1(
|
| 0, putImageData(m_fullImageData.get(), 0, 0, 1, 1, 8, 8, exceptionState));
|
| @@ -1025,9 +1033,10 @@ TEST_F(CanvasRenderingContext2DTest, TextureUploadHeuristics) {
|
| DrawImageTextureUploadSoftSizeLimit)) +
|
| delta;
|
| int dstSize =
|
| - srcSize / std::sqrt(static_cast<float>(
|
| - ExpensiveCanvasHeuristicParameters::
|
| - DrawImageTextureUploadSoftSizeLimitScaleThreshold)) -
|
| + srcSize /
|
| + std::sqrt(static_cast<float>(
|
| + ExpensiveCanvasHeuristicParameters::
|
| + DrawImageTextureUploadSoftSizeLimitScaleThreshold)) -
|
| delta;
|
|
|
| createContext(NonOpaque);
|
|
|