From aa89259dae26c54d540ce53e65fc64b26f9c028c Mon Sep 17 00:00:00 2001 From: "jhaas@chromium.org" Date: Thu, 23 Oct 2008 01:06:54 +0000 Subject: Fixed SVG path fill rule (even-odd or winding) which broke with the merge Review URL: http://codereview.chromium.org/7904 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3806 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/port/platform/graphics/GraphicsContextSkia.cpp | 3 +++ webkit/tools/layout_tests/test_lists/win/tests_fixable.txt | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/webkit/port/platform/graphics/GraphicsContextSkia.cpp b/webkit/port/platform/graphics/GraphicsContextSkia.cpp index ba9cdba..8547756 100644 --- a/webkit/port/platform/graphics/GraphicsContextSkia.cpp +++ b/webkit/port/platform/graphics/GraphicsContextSkia.cpp @@ -477,6 +477,9 @@ void GraphicsContext::fillPath() if (colorSpace == SolidColorSpace && !fillColor().alpha()) return; + m_data->setFillRule(state.fillRule == RULE_EVENODD ? + SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType); + SkPaint paint; m_data->setup_paint_fill(&paint); 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 b1c002e..a11108b 100644 --- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt @@ -986,15 +986,9 @@ V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/linking-a-07-t.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/linking-uri-03-t.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/painting-fill-01-t.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/painting-fill-02-t.svg = FAIL -V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/painting-fill-03-t.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/painting-marker-03-f.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/painting-render-01-b.svg = FAIL -V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/paths-data-04-t.svg = FAIL -V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/paths-data-05-t.svg = FAIL -V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/paths-data-08-t.svg = FAIL -V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/paths-data-09-t.svg = FAIL -V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/paths-data-14-t.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/pservers-grad-01-b.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/pservers-grad-02-b.svg = FAIL V8 | KJS # LayoutTests/svg/W3C-SVG-1.1/pservers-grad-04-b.svg = FAIL -- cgit v1.1