diff options
38 files changed, 127 insertions, 31 deletions
diff --git a/skia/sgl/SkBitmapProcState.cpp b/skia/sgl/SkBitmapProcState.cpp index 428921d..eb87e7b 100644 --- a/skia/sgl/SkBitmapProcState.cpp +++ b/skia/sgl/SkBitmapProcState.cpp @@ -296,8 +296,9 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) { } const SkMatrix* m; - if (SkShader::kClamp_TileMode == fTileModeX && - SkShader::kClamp_TileMode == fTileModeY) { + if (inv.getType() <= SkMatrix::kTranslate_Mask || + (SkShader::kClamp_TileMode == fTileModeX && + SkShader::kClamp_TileMode == fTileModeY)) { m = &inv; } else { fUnitInvMatrix = inv; diff --git a/skia/sgl/SkBitmapProcState.h b/skia/sgl/SkBitmapProcState.h index 1366d3b..fabc0e5 100644 --- a/skia/sgl/SkBitmapProcState.h +++ b/skia/sgl/SkBitmapProcState.h @@ -39,7 +39,8 @@ struct SkBitmapProcState { int count, uint16_t colors[]); - typedef U16CPU (*FixedTileProc)(SkFixed); // returns 0..0xFFFF + typedef SkFixed (*FixedTileProc)(SkFixed, int); + typedef int (*IntTileProc)(int, int); MatrixProc fMatrixProc; // chooseProcs SampleProc32 fSampleProc32; // chooseProcs @@ -48,6 +49,8 @@ struct SkBitmapProcState { SkMatrix fUnitInvMatrix; // chooseProcs FixedTileProc fTileProcX; // chooseProcs FixedTileProc fTileProcY; // chooseProcs + IntTileProc iTileProcX; // chooseProcs + IntTileProc iTileProcY; // chooseProcs SkFixed fFilterOneX; SkFixed fFilterOneY; diff --git a/skia/sgl/SkBitmapProcState_matrix.h b/skia/sgl/SkBitmapProcState_matrix.h index 1212a41..80d3e97 100644 --- a/skia/sgl/SkBitmapProcState_matrix.h +++ b/skia/sgl/SkBitmapProcState_matrix.h @@ -1,4 +1,5 @@ +#define TRANSLATE_NOFILTER_NAME MAKENAME(_nofilter_translate) #define SCALE_NOFILTER_NAME MAKENAME(_nofilter_scale) #define SCALE_FILTER_NAME MAKENAME(_filter_scale) #define AFFINE_NOFILTER_NAME MAKENAME(_nofilter_affine) @@ -17,6 +18,38 @@ #define PREAMBLE_ARG_Y #endif +#ifndef PREAMBLE_TRANS + #define PREAMBLE_TRANS(state) +#endif + +static void TRANSLATE_NOFILTER_NAME(const SkBitmapProcState& s, + uint32_t xy[], int count, int x, int y) +{ + SkASSERT((s.fInvType & ~SkMatrix::kTranslate_Mask) == 0); + + PREAMBLE_TRANS(s); + + x += SkScalarFloor(s.fInvMatrix->getTranslateX()); + y += SkScalarFloor(s.fInvMatrix->getTranslateY()); + + *xy++ = (uint32_t)TILEY_TRANS(y, (s.fBitmap->height() - 1)); + + unsigned maxX = s.fBitmap->width() - 1; + int i; + uint16_t* xx = (uint16_t*)xy; + for (i = (count >> 2); i > 0; --i) + { + *xx++ = (uint16_t)TILEX_TRANS(x, maxX); x++; + *xx++ = (uint16_t)TILEX_TRANS(x, maxX); x++; + *xx++ = (uint16_t)TILEX_TRANS(x, maxX); x++; + *xx++ = (uint16_t)TILEX_TRANS(x, maxX); x++; + } + for (i = (count & 3); i > 0; --i) + { + *xx++ = (uint16_t)TILEX_TRANS(x, maxX); x++; + } +} + static void SCALE_NOFILTER_NAME(const SkBitmapProcState& s, uint32_t xy[], int count, int x, int y) { SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask | @@ -241,6 +274,9 @@ static void PERSP_FILTER_NAME(const SkBitmapProcState& s, } static SkBitmapProcState::MatrixProc MAKENAME(_Procs)[] = { + TRANSLATE_NOFILTER_NAME, + TRANSLATE_NOFILTER_NAME, // No need to do filtering if the matrix is no + // more complex than identity/translate. SCALE_NOFILTER_NAME, SCALE_FILTER_NAME, AFFINE_NOFILTER_NAME, @@ -256,6 +292,10 @@ static SkBitmapProcState::MatrixProc MAKENAME(_Procs)[] = { #undef CHECK_FOR_DECAL #endif +#undef TILEX_TRANS +#undef TILEY_TRANS + +#undef TRANSLATE_NOFILTER_NAME #undef SCALE_NOFILTER_NAME #undef SCALE_FILTER_NAME #undef AFFINE_NOFILTER_NAME @@ -269,5 +309,7 @@ static SkBitmapProcState::MatrixProc MAKENAME(_Procs)[] = { #undef PREAMBLE_ARG_X #undef PREAMBLE_ARG_Y +#undef PREAMBLE_TRANS + #undef TILEX_LOW_BITS #undef TILEY_LOW_BITS diff --git a/skia/sgl/SkBitmapProcState_matrixProcs.cpp b/skia/sgl/SkBitmapProcState_matrixProcs.cpp index beb21c8..a16c8b3 100644 --- a/skia/sgl/SkBitmapProcState_matrixProcs.cpp +++ b/skia/sgl/SkBitmapProcState_matrixProcs.cpp @@ -28,6 +28,8 @@ void decal_filter_scale(uint32_t dst[], SkFixed fx, SkFixed dx, int count); #define TILEX_LOW_BITS(fx, max) (((fx) >> 12) & 0xF) #define TILEY_LOW_BITS(fy, max) (((fy) >> 12) & 0xF) #define CHECK_FOR_DECAL +#define TILEX_TRANS(x, max) SkClampMax(x, max) +#define TILEY_TRANS(y, max) SkClampMax(y, max) #include "SkBitmapProcState_matrix.h" #define MAKENAME(suffix) RepeatX_RepeatY ## suffix @@ -35,6 +37,8 @@ void decal_filter_scale(uint32_t dst[], SkFixed fx, SkFixed dx, int count); #define TILEY_PROCF(fy, max) (((fy) & 0xFFFF) * ((max) + 1) >> 16) #define TILEX_LOW_BITS(fx, max) ((((fx) & 0xFFFF) * ((max) + 1) >> 12) & 0xF) #define TILEY_LOW_BITS(fy, max) ((((fy) & 0xFFFF) * ((max) + 1) >> 12) & 0xF) +#define TILEX_TRANS(x, max) ((x) % ((max) + 1)) +#define TILEY_TRANS(y, max) ((y) % ((max) + 1)) #include "SkBitmapProcState_matrix.h" #define MAKENAME(suffix) GeneralXY ## suffix @@ -44,13 +48,19 @@ void decal_filter_scale(uint32_t dst[], SkFixed fx, SkFixed dx, int count); #define PREAMBLE_PARAM_Y , SkBitmapProcState::FixedTileProc tileProcY #define PREAMBLE_ARG_X , tileProcX #define PREAMBLE_ARG_Y , tileProcY -#define TILEX_PROCF(fx, max) (tileProcX(fx) * ((max) + 1) >> 16) -#define TILEY_PROCF(fy, max) (tileProcY(fy) * ((max) + 1) >> 16) -#define TILEX_LOW_BITS(fx, max) ((tileProcX(fx) * ((max) + 1) >> 12) & 0xF) -#define TILEY_LOW_BITS(fy, max) ((tileProcY(fy) * ((max) + 1) >> 12) & 0xF) +#define TILEX_PROCF(fx, max) (tileProcX(fx, max) >> 16) +#define TILEY_PROCF(fy, max) (tileProcY(fy, max) >> 16) +#define TILEX_LOW_BITS(fx, max) ((tileProcX(fx, max) >> 14) & 0x3) +#define TILEY_LOW_BITS(fy, max) ((tileProcY(fy, max) >> 14) & 0x3) +#define PREAMBLE_TRANS(state) SkBitmapProcState::IntTileProc tileProcX = (state).iTileProcX; \ + SkBitmapProcState::IntTileProc tileProcY = (state).iTileProcY +#define TILEX_TRANS(x, max) tileProcX(x, max) +#define TILEY_TRANS(y, max) tileProcY(y, max) #include "SkBitmapProcState_matrix.h" -static inline U16CPU fixed_clamp(SkFixed x) + + +static inline SkFixed fixed_clamp(SkFixed x, int max) { #ifdef SK_CPU_HAS_CONDITIONAL_INSTR if (x >> 16) @@ -66,19 +76,20 @@ static inline U16CPU fixed_clamp(SkFixed x) x = 0xFFFF; } #endif - return x; + return x * (max + 1); } -static inline U16CPU fixed_repeat(SkFixed x) +static inline SkFixed fixed_repeat(SkFixed x, int max) { - return x & 0xFFFF; + return (x & 0xFFFF) * (max + 1); } -static inline U16CPU fixed_mirror(SkFixed x) +static inline SkFixed fixed_mirror(SkFixed x, int max) { SkFixed s = x << 15 >> 31; // s is FFFFFFFF if we're on an odd interval, or 0 if an even interval - return (x ^ s) & 0xFFFF; + x = ((x ^ s) & 0xFFFF) * (max + 1); + return s ? (x ^ 0xFFFF) : x; } static SkBitmapProcState::FixedTileProc choose_tile_proc(unsigned m) @@ -91,14 +102,51 @@ static SkBitmapProcState::FixedTileProc choose_tile_proc(unsigned m) return fixed_mirror; } +static inline int int_clamp(int x, int max) +{ + SkASSERT(max >= 0); + + return SkClampMax(x, max); +} + +static inline int int_repeat(int x, int max) +{ + SkASSERT(max >= 0); + + return x % (max + 1); +} + +static inline int int_mirror(int x, int max) +{ + SkASSERT(max >= 0); + + int dx = x % (max + 1); + if (dx < 0) + dx = -dx - 1; + + return (x / (max + 1) % 2) ? max - dx : dx; +} + +static SkBitmapProcState::IntTileProc choose_int_tile_proc(unsigned m) +{ + if (SkShader::kClamp_TileMode == m) + return int_clamp; + if (SkShader::kRepeat_TileMode == m) + return int_repeat; + SkASSERT(SkShader::kMirror_TileMode == m); + return int_mirror; +} + SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc() { int index = 0; if (fDoFilter) index = 1; if (fInvType & SkMatrix::kPerspective_Mask) - index |= 4; + index |= 6; else if (fInvType & SkMatrix::kAffine_Mask) + index |= 4; + else if (fInvType & SkMatrix::kScale_Mask) index |= 2; if (SkShader::kClamp_TileMode == fTileModeX && @@ -123,6 +171,8 @@ SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc() // only general needs these procs fTileProcX = choose_tile_proc(fTileModeX); fTileProcY = choose_tile_proc(fTileModeY); + iTileProcX = choose_int_tile_proc(fTileModeX); + iTileProcY = choose_int_tile_proc(fTileModeY); return GeneralXY_Procs[index]; } diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag-expected.checksum index 8106b24..86333e8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag-expected.checksum @@ -1 +1 @@ -bd7c5a1b79e1d3ed84f753236dacd0e0
\ No newline at end of file +cef8331f67daef13a1db622b00d15693
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png Binary files differindex ad46419..d3a0297 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.checksum index 6a1a293..2f50338 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.checksum @@ -1 +1 @@ -18550eab24047e0637783791d2abfd4d
\ No newline at end of file +72e6a9d3fd81a3e33d567c4be08db055
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.png Binary files differindex 5b24b5e..a48cbca 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum index ccd4f55..1a003a5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum @@ -1 +1 @@ -e19315294a9518cca7637435a3cc62f8
\ No newline at end of file +afcabff0579e23755d0daff42e60e3d5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png Binary files differindex fd009de..f570fea 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.checksum index dea9853..38ed173 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.checksum @@ -1 +1 @@ -78a6406729724e0808403c522f965403
\ No newline at end of file +7e950dd4c3d708a8bc517c3500a8751e
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.png Binary files differindex 21939fe..21579ef 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.checksum index 196f1ac1..92fa47f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.checksum @@ -1 +1 @@ -ba55619388339b7a30aaefb7bea64a9a
\ No newline at end of file +4c308f0c8ceacbfc7d2399eb42f4c15f
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.png Binary files differindex 6f906d8..bbd48d1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.checksum index 176947a..bd03e2f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.checksum @@ -1 +1 @@ -a482e7d796bb11310c305b7926bc9fe2
\ No newline at end of file +6044ea05b6f87031605dfb2dd8b3388d
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.png Binary files differindex f39f888..780c238 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.checksum index 40f498d..2565d3f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.checksum @@ -1 +1 @@ -dee845f888fa3763f4fff4d333ff1ccb
\ No newline at end of file +c4894b272e7afe37fac7d42a78abd28c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.png Binary files differindex 49cd0b9..79c6d61 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.checksum index 90f7d34..79131da 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.checksum @@ -1 +1 @@ -3b7765e76745b7a07b858ce833eea22f
\ No newline at end of file +236701009a38e57624bacca1371b046c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.png Binary files differindex dd32db1..4a41fb9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.checksum index 1928b41..b2c2504 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.checksum @@ -1 +1 @@ -928edee6ef3f7b389d95986a0846531c
\ No newline at end of file +9dfdc6a1e26116a4e9aa85307fcdda57
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.png Binary files differindex 03ba2a1..8eef4d5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.checksum index fa5ce05..d196876 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.checksum @@ -1 +1 @@ -cf301f8454014ab42d8a13a2f65141c3
\ No newline at end of file +573c6640d973154f9d7047c9560f0ce3
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.png Binary files differindex 829f503..3996d1e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize17-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize17-expected.checksum index 0b2281a..f9b2fa4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize17-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize17-expected.checksum @@ -1 +1 @@ -565f1fa24f04cf8f7a2f5db3ff85d24f
\ No newline at end of file +e88b08e44d59cf764e8a41b976869592
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize17-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize17-expected.png Binary files differindex 0f59fff..be219ff 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize17-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize17-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize18-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize18-expected.checksum index 47d3e00..acbf590 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize18-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize18-expected.checksum @@ -1 +1 @@ -107e906c52a0f753f9ae42937f9ec0b2
\ No newline at end of file +a9939e73040013dcde3ae41330afa8fe
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize18-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize18-expected.png Binary files differindex 8ec3f15..78489c0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize18-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize18-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize19-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize19-expected.checksum index 9d81334..7393cbe 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize19-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize19-expected.checksum @@ -1 +1 @@ -d4f0911b3fe300df0e827ca7b237bd7b
\ No newline at end of file +54599807b8b0e8b135de5a59e13c4b3e
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize19-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize19-expected.png Binary files differindex 51fa084..9d79a59 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize19-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/backgroundSize19-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/zero-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/zero-expected.checksum index de8680c..f02f317 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/zero-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/zero-expected.checksum @@ -1 +1 @@ -b292183585b609c8c55627110f00ef75
\ No newline at end of file +be51a64593c71d1b364db5d5d12a6b09
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/zero-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/zero-expected.png Binary files differindex 85bf41a..212cdd2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/zero-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/size/zero-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-bg-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-bg-expected.checksum index 30665fb..9b52c8f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-bg-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-bg-expected.checksum @@ -1 +1 @@ -618211aef1548538acbada2ce89eeac7
\ No newline at end of file +b3847e84948f400e39ae822687097ca8
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-bg-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-bg-expected.png Binary files differindex 9a4ff76..5023ea9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-bg-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-bg-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug1271-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug1271-expected.checksum index 2cf93cf..f45e07a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug1271-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug1271-expected.checksum @@ -1 +1 @@ -e08b342c5238d279a3619fa2dca1118f
\ No newline at end of file +f055bbe64811759745fd93c19df3cc8e
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug1271-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug1271-expected.png Binary files differindex 3802b32..404897a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug1271-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug1271-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column-expected.checksum index 9bf3e48..1f3ec09 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column-expected.checksum @@ -1 +1 @@ -d308d2bcd7e3cfc3a2bcf5d3985da7b7
\ No newline at end of file +05c4fb836c762a7bd4bc10e4a45b34a0
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column-expected.png Binary files differindex aef93a7..4874829 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column-expected.png |
