diff options
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/port/platform/graphics/ImageBufferSkia.cpp | 1 | ||||
-rw-r--r-- | webkit/tools/layout_tests/test_lists/win/tests_fixable.txt | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/webkit/port/platform/graphics/ImageBufferSkia.cpp b/webkit/port/platform/graphics/ImageBufferSkia.cpp index e0f97b4..b9c54e6 100644 --- a/webkit/port/platform/graphics/ImageBufferSkia.cpp +++ b/webkit/port/platform/graphics/ImageBufferSkia.cpp @@ -50,6 +50,7 @@ ImageBufferData::ImageBufferData(const IntSize& size) ImageBuffer::ImageBuffer(const IntSize& size, bool grayScale, bool& success) : m_data(size) + , m_size(size) { m_context.set(new GraphicsContext(&m_data.m_platformContext)); diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt index 14a38bf..3c91e53 100644 --- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt @@ -824,17 +824,6 @@ V8 | KJS # SKIP : LayoutTests/transitions/opacity-transition-zindex.html = PASS # http://code.google.com/p/chromium/issues/detail?id=3273 V8 | KJS # LayoutTests/editing/selection/move-left-right.html = FAIL -# Regressed during Skia refactoring. Brettw is investigating. -V8 | KJS # LayoutTests/fast/canvas/canvas-alphaImageData-behavior.html = FAIL -V8 | KJS # LayoutTests/fast/canvas/canvas-invalid-fillstyle.html = FAIL -V8 | KJS # LayoutTests/fast/canvas/canvas-invalid-strokestyle.html = FAIL -V8 | KJS # LayoutTests/fast/canvas/canvas-longlived-context.html = FAIL -V8 | KJS # LayoutTests/fast/canvas/canvas-path-with-inf-nan-dimensions.html = FAIL -V8 | KJS # LayoutTests/fast/canvas/canvas-putImageData.html = FAIL -V8 | KJS # LayoutTests/fast/canvas/canvas-save-restore-with-path.html = FAIL -V8 | KJS # LayoutTests/fast/canvas/gradient-with-clip.html = FAIL -V8 | KJS # LayoutTests/fast/canvas/pattern-with-transform.html = FAIL - // ---------------------------------------------------------------------------- // NEW FOR THE MERGE // |