Title: [104585] trunk
- Revision
- 104585
- Author
- [email protected]
- Date
- 2012-01-10 08:54:29 -0800 (Tue, 10 Jan 2012)
Log Message
[Chromium] Shift PathSkia to use Skia's new RawIter
https://bugs.webkit.org/show_bug.cgi?id=75703
Patch by Stephen Chenney <[email protected]> on 2012-01-10
Reviewed by Nikolas Zimmermann.
Source/WebCore:
No new tests required - covered by existing tests.
* platform/graphics/Path.h: Added comments ont he return values from iteration.
* platform/graphics/skia/PathSkia.cpp:
(WebCore::Path::apply): Switched to SkPath::RawIter
LayoutTests:
* platform/chromium/test_expectations.txt: Updated epxectation for
tests that may change after this modification.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (104584 => 104585)
--- trunk/LayoutTests/ChangeLog 2012-01-10 16:47:59 UTC (rev 104584)
+++ trunk/LayoutTests/ChangeLog 2012-01-10 16:54:29 UTC (rev 104585)
@@ -1,3 +1,13 @@
+2012-01-10 Stephen Chenney <[email protected]>
+
+ [Chromium] Shift PathSkia to use Skia's new RawIter
+ https://bugs.webkit.org/show_bug.cgi?id=75703
+
+ Reviewed by Nikolas Zimmermann.
+
+ * platform/chromium/test_expectations.txt: Updated epxectation for
+ tests that may change after this modification.
+
2012-01-10 Sheriff Bot <[email protected]>
Unreviewed, rolling out r104572.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104584 => 104585)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-01-10 16:47:59 UTC (rev 104584)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-01-10 16:54:29 UTC (rev 104585)
@@ -879,6 +879,11 @@
// Merge 39744:39829 - regression
BUGCR10284 MAC : svg/custom/path-bad-data.svg = FAIL
+// Needs rebaselining after BUGWK75703. Old results are, in fact, incorrect.
+BUGWK75703 : svg/custom/shapes-supporting-markers.svg = PASS IMAGE+TEXT TEXT IMAGE
+BUGWK75703 : svg/W3C-SVG-1.1/painting-marker-02-f.svg = PASS IMAGE
+BUGWK75703 : svg/W3C-SVG-1.1/painting-marker-03-f.svg = PASS IMAGE
+
// Text mismatch since r65370.
// There was also an unnoticed image mismatch before this revision
// (wrong baseline was committed). No idea about when it really started to fail.
Modified: trunk/Source/WebCore/ChangeLog (104584 => 104585)
--- trunk/Source/WebCore/ChangeLog 2012-01-10 16:47:59 UTC (rev 104584)
+++ trunk/Source/WebCore/ChangeLog 2012-01-10 16:54:29 UTC (rev 104585)
@@ -1,3 +1,16 @@
+2012-01-10 Stephen Chenney <[email protected]>
+
+ [Chromium] Shift PathSkia to use Skia's new RawIter
+ https://bugs.webkit.org/show_bug.cgi?id=75703
+
+ Reviewed by Nikolas Zimmermann.
+
+ No new tests required - covered by existing tests.
+
+ * platform/graphics/Path.h: Added comments ont he return values from iteration.
+ * platform/graphics/skia/PathSkia.cpp:
+ (WebCore::Path::apply): Switched to SkPath::RawIter
+
2012-01-10 Peter Beverloo <[email protected]>
[Chromium] Use SkFontHost::GetUnitsPerEm instead of advanced type
Modified: trunk/Source/WebCore/platform/graphics/Path.h (104584 => 104585)
--- trunk/Source/WebCore/platform/graphics/Path.h 2012-01-10 16:47:59 UTC (rev 104584)
+++ trunk/Source/WebCore/platform/graphics/Path.h 2012-01-10 16:54:29 UTC (rev 104585)
@@ -80,13 +80,16 @@
class StrokeStyleApplier;
enum PathElementType {
- PathElementMoveToPoint,
- PathElementAddLineToPoint,
- PathElementAddQuadCurveToPoint,
- PathElementAddCurveToPoint,
- PathElementCloseSubpath
+ PathElementMoveToPoint, // The points member will contain 1 value.
+ PathElementAddLineToPoint, // The points member will contain 1 value.
+ PathElementAddQuadCurveToPoint, // The points member will contain 2 values.
+ PathElementAddCurveToPoint, // The points member will contain 3 values.
+ PathElementCloseSubpath // The points member will contain no values.
};
+ // The points in the sturcture are the same as those that would be used with the
+ // add... method. For example, a line returns the endpoint, while a cubic returns
+ // two tangent points and the endpoint.
struct PathElement {
PathElementType type;
FloatPoint* points;
Modified: trunk/Source/WebCore/platform/graphics/skia/PathSkia.cpp (104584 => 104585)
--- trunk/Source/WebCore/platform/graphics/skia/PathSkia.cpp 2012-01-10 16:47:59 UTC (rev 104584)
+++ trunk/Source/WebCore/platform/graphics/skia/PathSkia.cpp 2012-01-10 16:54:29 UTC (rev 104585)
@@ -197,7 +197,7 @@
void Path::apply(void* info, PathApplierFunction function) const
{
- SkPath::Iter iter(*m_path, false);
+ SkPath::RawIter iter(*m_path);
SkPoint pts[4];
PathElement pathElement;
FloatPoint pathPoints[3];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
