<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187492] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187492">187492</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-07-28 11:22:00 -0700 (Tue, 28 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>PathApplierFunction should take a reference to a PathElement
https://bugs.webkit.org/show_bug.cgi?id=147337
Reviewed by Dan Bates.
Convert PathApplierFunction to take a const PathElement&, since it can never be null.
Source/WebCore:
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
(ConvertPathToScreenSpaceFunction):
* inspector/InspectorOverlay.cpp:
(WebCore::appendPathSegment):
* platform/graphics/Path.cpp:
(WebCore::pathLengthApplierFunction):
* platform/graphics/Path.h:
* platform/graphics/PathTraversalState.h:
(WebCore::PathTraversalState::processPathElement):
* platform/graphics/cg/PathCG.cpp:
(WebCore::CGPathApplierToPathApplier):
* rendering/svg/SVGMarkerData.h:
(WebCore::SVGMarkerData::updateFromPathElement):
(WebCore::SVGMarkerData::updateMarkerDataForPathElement):
* rendering/svg/SVGSubpathData.h:
(WebCore::SVGSubpathData::updateFromPathElement):
* svg/SVGPathUtilities.cpp:
(WebCore::pathIteratorForBuildingString):
Source/WebKit2:
* Shared/WebCoreArgumentCoders.cpp:
(IPC::pathPointCountApplierFunction):
(IPC::pathEncodeApplierFunction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPathcpp">trunk/Source/WebCore/platform/graphics/Path.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPathh">trunk/Source/WebCore/platform/graphics/Path.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPathTraversalStateh">trunk/Source/WebCore/platform/graphics/PathTraversalState.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoFontCairocpp">trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPathCGcpp">trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGMarkerDatah">trunk/Source/WebCore/rendering/svg/SVGMarkerData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGSubpathDatah">trunk/Source/WebCore/rendering/svg/SVGSubpathData.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGPathUtilitiescpp">trunk/Source/WebCore/svg/SVGPathUtilities.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/ChangeLog 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-07-27 Simon Fraser <simon.fraser@apple.com>
+
+ PathApplierFunction should take a reference to a PathElement
+ https://bugs.webkit.org/show_bug.cgi?id=147337
+
+ Reviewed by Dan Bates.
+
+ Convert PathApplierFunction to take a const PathElement&, since it can never be null.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+ (ConvertPathToScreenSpaceFunction):
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::appendPathSegment):
+ * platform/graphics/Path.cpp:
+ (WebCore::pathLengthApplierFunction):
+ * platform/graphics/Path.h:
+ * platform/graphics/PathTraversalState.h:
+ (WebCore::PathTraversalState::processPathElement):
+ * platform/graphics/cg/PathCG.cpp:
+ (WebCore::CGPathApplierToPathApplier):
+ * rendering/svg/SVGMarkerData.h:
+ (WebCore::SVGMarkerData::updateFromPathElement):
+ (WebCore::SVGMarkerData::updateMarkerDataForPathElement):
+ * rendering/svg/SVGSubpathData.h:
+ (WebCore::SVGSubpathData::updateFromPathElement):
+ * svg/SVGPathUtilities.cpp:
+ (WebCore::pathIteratorForBuildingString):
+
</ins><span class="cx"> 2015-07-28 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Notify fullscreen controller in UIProcess whether external playback is allowed
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -247,36 +247,36 @@
</span><span class="cx"> CGMutablePathRef path;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static void ConvertPathToScreenSpaceFunction(void* info, const PathElement* element)
</del><ins>+static void ConvertPathToScreenSpaceFunction(void* info, const PathElement& element)
</ins><span class="cx"> {
</span><span class="cx"> PathConversionInfo* conversion = (PathConversionInfo*)info;
</span><span class="cx"> WebAccessibilityObjectWrapperBase *wrapper = conversion->wrapper;
</span><span class="cx"> CGMutablePathRef newPath = conversion->path;
</span><del>- switch (element->type) {
</del><ins>+ switch (element.type) {
</ins><span class="cx"> case PathElementMoveToPoint:
</span><span class="cx"> {
</span><del>- CGPoint newPoint = [wrapper convertPointToScreenSpace:element->points[0]];
</del><ins>+ CGPoint newPoint = [wrapper convertPointToScreenSpace:element.points[0]];
</ins><span class="cx"> CGPathMoveToPoint(newPath, nil, newPoint.x, newPoint.y);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case PathElementAddLineToPoint:
</span><span class="cx"> {
</span><del>- CGPoint newPoint = [wrapper convertPointToScreenSpace:element->points[0]];
</del><ins>+ CGPoint newPoint = [wrapper convertPointToScreenSpace:element.points[0]];
</ins><span class="cx"> CGPathAddLineToPoint(newPath, nil, newPoint.x, newPoint.y);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case PathElementAddQuadCurveToPoint:
</span><span class="cx"> {
</span><del>- CGPoint newPoint1 = [wrapper convertPointToScreenSpace:element->points[0]];
- CGPoint newPoint2 = [wrapper convertPointToScreenSpace:element->points[1]];
</del><ins>+ CGPoint newPoint1 = [wrapper convertPointToScreenSpace:element.points[0]];
+ CGPoint newPoint2 = [wrapper convertPointToScreenSpace:element.points[1]];
</ins><span class="cx"> CGPathAddQuadCurveToPoint(newPath, nil, newPoint1.x, newPoint1.y, newPoint2.x, newPoint2.y);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case PathElementAddCurveToPoint:
</span><span class="cx"> {
</span><del>- CGPoint newPoint1 = [wrapper convertPointToScreenSpace:element->points[0]];
- CGPoint newPoint2 = [wrapper convertPointToScreenSpace:element->points[1]];
- CGPoint newPoint3 = [wrapper convertPointToScreenSpace:element->points[2]];
</del><ins>+ CGPoint newPoint1 = [wrapper convertPointToScreenSpace:element.points[0]];
+ CGPoint newPoint2 = [wrapper convertPointToScreenSpace:element.points[1]];
+ CGPoint newPoint3 = [wrapper convertPointToScreenSpace:element.points[2]];
</ins><span class="cx"> CGPathAddCurveToPoint(newPath, nil, newPoint1.x, newPoint1.y, newPoint2.x, newPoint2.y, newPoint3.x, newPoint3.y);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -609,26 +609,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Used as a functor for Shape::apply, which has not been cleaned up to use modern C++.
</span><del>-static void appendPathSegment(void* info, const PathElement* pathElement)
</del><ins>+static void appendPathSegment(void* info, const PathElement& pathElement)
</ins><span class="cx"> {
</span><span class="cx"> PathApplyInfo& pathApplyInfo = *static_cast<PathApplyInfo*>(info);
</span><span class="cx"> FloatPoint point;
</span><del>- switch (pathElement->type) {
</del><ins>+ switch (pathElement.type) {
</ins><span class="cx"> // The points member will contain 1 value.
</span><span class="cx"> case PathElementMoveToPoint:
</span><del>- appendPathCommandAndPoints(pathApplyInfo, ASCIILiteral("M"), pathElement->points, 1);
</del><ins>+ appendPathCommandAndPoints(pathApplyInfo, ASCIILiteral("M"), pathElement.points, 1);
</ins><span class="cx"> break;
</span><span class="cx"> // The points member will contain 1 value.
</span><span class="cx"> case PathElementAddLineToPoint:
</span><del>- appendPathCommandAndPoints(pathApplyInfo, ASCIILiteral("L"), pathElement->points, 1);
</del><ins>+ appendPathCommandAndPoints(pathApplyInfo, ASCIILiteral("L"), pathElement.points, 1);
</ins><span class="cx"> break;
</span><span class="cx"> // The points member will contain 3 values.
</span><span class="cx"> case PathElementAddCurveToPoint:
</span><del>- appendPathCommandAndPoints(pathApplyInfo, ASCIILiteral("C"), pathElement->points, 3);
</del><ins>+ appendPathCommandAndPoints(pathApplyInfo, ASCIILiteral("C"), pathElement.points, 3);
</ins><span class="cx"> break;
</span><span class="cx"> // The points member will contain 2 values.
</span><span class="cx"> case PathElementAddQuadCurveToPoint:
</span><del>- appendPathCommandAndPoints(pathApplyInfo, ASCIILiteral("Q"), pathElement->points, 2);
</del><ins>+ appendPathCommandAndPoints(pathApplyInfo, ASCIILiteral("Q"), pathElement.points, 2);
</ins><span class="cx"> break;
</span><span class="cx"> // The points member will contain no values.
</span><span class="cx"> case PathElementCloseSubpath:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Path.cpp (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Path.cpp 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/platform/graphics/Path.cpp 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static void pathLengthApplierFunction(void* info, const PathElement* element)
</del><ins>+static void pathLengthApplierFunction(void* info, const PathElement& element)
</ins><span class="cx"> {
</span><span class="cx"> PathTraversalState& traversalState = *static_cast<PathTraversalState*>(info);
</span><span class="cx"> traversalState.processPathElement(element);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Path.h (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Path.h 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/platform/graphics/Path.h 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> FloatPoint* points;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- typedef void (*PathApplierFunction)(void* info, const PathElement*);
</del><ins>+ typedef void (*PathApplierFunction)(void* info, const PathElement&);
</ins><span class="cx">
</span><span class="cx"> class Path {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathTraversalStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PathTraversalState.h (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PathTraversalState.h 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/platform/graphics/PathTraversalState.h 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> bool processPathElement(PathElementType, const FloatPoint*);
</span><del>- bool processPathElement(const PathElement* element) { return processPathElement(element->type, element->points); }
</del><ins>+ bool processPathElement(const PathElement& element) { return processPathElement(element.type, element.points); }
</ins><span class="cx">
</span><span class="cx"> Action action() const { return m_action; }
</span><span class="cx"> void setAction(Action action) { m_action = action; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoFontCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -174,27 +174,27 @@
</span><span class="cx"> // pseudo-contour and the vertical center of the underline found in GlyphIterationState::centerOfLine.
</span><span class="cx"> // It keeps track of the leftmost and rightmost intersection in GlyphIterationState::minX and
</span><span class="cx"> // GlyphIterationState::maxX.
</span><del>-static void findPathIntersections(void* stateAsVoidPointer, const PathElement* element)
</del><ins>+static void findPathIntersections(void* stateAsVoidPointer, const PathElement& element)
</ins><span class="cx"> {
</span><span class="cx"> auto& state = *static_cast<GlyphIterationState*>(stateAsVoidPointer);
</span><span class="cx"> bool doIntersection = false;
</span><span class="cx"> FloatPoint point = FloatPoint();
</span><del>- switch (element->type) {
</del><ins>+ switch (element.type) {
</ins><span class="cx"> case PathElementMoveToPoint:
</span><del>- state.startingPoint = element->points[0];
- state.currentPoint = element->points[0];
</del><ins>+ state.startingPoint = element.points[0];
+ state.currentPoint = element.points[0];
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddLineToPoint:
</span><span class="cx"> doIntersection = true;
</span><del>- point = element->points[0];
</del><ins>+ point = element.points[0];
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddQuadCurveToPoint:
</span><span class="cx"> doIntersection = true;
</span><del>- point = element->points[1];
</del><ins>+ point = element.points[1];
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddCurveToPoint:
</span><span class="cx"> doIntersection = true;
</span><del>- point = element->points[2];
</del><ins>+ point = element.points[2];
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementCloseSubpath:
</span><span class="cx"> doIntersection = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPathCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> PathApplierFunction function;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static void CGPathApplierToPathApplier(void *info, const CGPathElement *element)
</del><ins>+static void CGPathApplierToPathApplier(void *info, const CGPathElement* element)
</ins><span class="cx"> {
</span><span class="cx"> PathApplierInfo* pinfo = (PathApplierInfo*)info;
</span><span class="cx"> FloatPoint points[3];
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> case kCGPathElementCloseSubpath:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- pinfo->function(pinfo->info, &pelement);
</del><ins>+ pinfo->function(pinfo->info, pelement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Path::apply(void* info, PathApplierFunction function) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGMarkerDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGMarkerData.h (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGMarkerData.h 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/rendering/svg/SVGMarkerData.h 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -54,12 +54,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void updateFromPathElement(void* info, const PathElement* element)
</del><ins>+ static void updateFromPathElement(void* info, const PathElement& element)
</ins><span class="cx"> {
</span><span class="cx"> SVGMarkerData* markerData = static_cast<SVGMarkerData*>(info);
</span><span class="cx">
</span><span class="cx"> // First update the outslope for the previous element.
</span><del>- markerData->updateOutslope(element->points[0]);
</del><ins>+ markerData->updateOutslope(element.points[0]);
</ins><span class="cx">
</span><span class="cx"> // Record the marker for the previous element.
</span><span class="cx"> if (markerData->m_elementIndex > 0) {
</span><span class="lines">@@ -109,11 +109,11 @@
</span><span class="cx"> m_outslopePoints[1] = point;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void updateMarkerDataForPathElement(const PathElement* element)
</del><ins>+ void updateMarkerDataForPathElement(const PathElement& element)
</ins><span class="cx"> {
</span><del>- FloatPoint* points = element->points;
</del><ins>+ FloatPoint* points = element.points;
</ins><span class="cx">
</span><del>- switch (element->type) {
</del><ins>+ switch (element.type) {
</ins><span class="cx"> case PathElementAddQuadCurveToPoint:
</span><span class="cx"> // FIXME: https://bugs.webkit.org/show_bug.cgi?id=33115 (PathElementAddQuadCurveToPoint not handled for <marker>)
</span><span class="cx"> m_origin = points[1];
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGSubpathDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGSubpathData.h (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGSubpathData.h 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/rendering/svg/SVGSubpathData.h 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -36,35 +36,35 @@
</span><span class="cx"> m_movePoint.set(0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void updateFromPathElement(void* info, const PathElement* element)
</del><ins>+ static void updateFromPathElement(void* info, const PathElement& element)
</ins><span class="cx"> {
</span><span class="cx"> SVGSubpathData* subpathFinder = static_cast<SVGSubpathData*>(info);
</span><del>- switch (element->type) {
</del><ins>+ switch (element.type) {
</ins><span class="cx"> case PathElementMoveToPoint:
</span><span class="cx"> if (subpathFinder->m_pathIsZeroLength && !subpathFinder->m_haveSeenMoveOnly)
</span><span class="cx"> subpathFinder->m_zeroLengthSubpathLocations.append(subpathFinder->m_lastPoint);
</span><del>- subpathFinder->m_lastPoint = subpathFinder->m_movePoint = element->points[0];
</del><ins>+ subpathFinder->m_lastPoint = subpathFinder->m_movePoint = element.points[0];
</ins><span class="cx"> subpathFinder->m_haveSeenMoveOnly = true;
</span><span class="cx"> subpathFinder->m_pathIsZeroLength = true;
</span><span class="cx"> break;
</span><span class="cx"> case PathElementAddLineToPoint:
</span><del>- if (subpathFinder->m_lastPoint != element->points[0]) {
</del><ins>+ if (subpathFinder->m_lastPoint != element.points[0]) {
</ins><span class="cx"> subpathFinder->m_pathIsZeroLength = false;
</span><del>- subpathFinder->m_lastPoint = element->points[0];
</del><ins>+ subpathFinder->m_lastPoint = element.points[0];
</ins><span class="cx"> }
</span><span class="cx"> subpathFinder->m_haveSeenMoveOnly = false;
</span><span class="cx"> break;
</span><span class="cx"> case PathElementAddQuadCurveToPoint:
</span><del>- if (subpathFinder->m_lastPoint != element->points[0] || element->points[0] != element->points[1]) {
</del><ins>+ if (subpathFinder->m_lastPoint != element.points[0] || element.points[0] != element.points[1]) {
</ins><span class="cx"> subpathFinder->m_pathIsZeroLength = false;
</span><del>- subpathFinder->m_lastPoint = element->points[1];
</del><ins>+ subpathFinder->m_lastPoint = element.points[1];
</ins><span class="cx"> }
</span><span class="cx"> subpathFinder->m_haveSeenMoveOnly = false;
</span><span class="cx"> break;
</span><span class="cx"> case PathElementAddCurveToPoint:
</span><del>- if (subpathFinder->m_lastPoint != element->points[0] || element->points[0] != element->points[1] || element->points[1] != element->points[2]) {
</del><ins>+ if (subpathFinder->m_lastPoint != element.points[0] || element.points[0] != element.points[1] || element.points[1] != element.points[2]) {
</ins><span class="cx"> subpathFinder->m_pathIsZeroLength = false;
</span><del>- subpathFinder->m_lastPoint = element->points[2];
</del><ins>+ subpathFinder->m_lastPoint = element.points[2];
</ins><span class="cx"> }
</span><span class="cx"> subpathFinder->m_haveSeenMoveOnly = false;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGPathUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGPathUtilities.cpp (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGPathUtilities.cpp 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebCore/svg/SVGPathUtilities.cpp 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -331,22 +331,22 @@
</span><span class="cx"> return ok;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void pathIteratorForBuildingString(void* info, const PathElement* pathElement)
</del><ins>+static void pathIteratorForBuildingString(void* info, const PathElement& pathElement)
</ins><span class="cx"> {
</span><span class="cx"> SVGPathConsumer* consumer = static_cast<SVGPathConsumer*>(info);
</span><span class="cx">
</span><del>- switch (pathElement->type) {
</del><ins>+ switch (pathElement.type) {
</ins><span class="cx"> case PathElementMoveToPoint:
</span><del>- consumer->moveTo(pathElement->points[0], false, AbsoluteCoordinates);
</del><ins>+ consumer->moveTo(pathElement.points[0], false, AbsoluteCoordinates);
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddLineToPoint:
</span><del>- consumer->lineTo(pathElement->points[0], AbsoluteCoordinates);
</del><ins>+ consumer->lineTo(pathElement.points[0], AbsoluteCoordinates);
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddQuadCurveToPoint:
</span><del>- consumer->curveToQuadratic(pathElement->points[0], pathElement->points[1], AbsoluteCoordinates);
</del><ins>+ consumer->curveToQuadratic(pathElement.points[0], pathElement.points[1], AbsoluteCoordinates);
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddCurveToPoint:
</span><del>- consumer->curveToCubic(pathElement->points[0], pathElement->points[1], pathElement->points[2], AbsoluteCoordinates);
</del><ins>+ consumer->curveToCubic(pathElement.points[0], pathElement.points[1], pathElement.points[2], AbsoluteCoordinates);
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementCloseSubpath:
</span><span class="cx"> consumer->closePath();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-27 Simon Fraser <simon.fraser@apple.com>
+
+ PathApplierFunction should take a reference to a PathElement
+ https://bugs.webkit.org/show_bug.cgi?id=147337
+
+ Reviewed by Dan Bates.
+
+ Convert PathApplierFunction to take a const PathElement&, since it can never be null.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::pathPointCountApplierFunction):
+ (IPC::pathEncodeApplierFunction):
+
</ins><span class="cx"> 2015-07-28 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Notify fullscreen controller in UIProcess whether external playback is allowed
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (187491 => 187492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-07-28 18:20:50 UTC (rev 187491)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-07-28 18:22:00 UTC (rev 187492)
</span><span class="lines">@@ -373,33 +373,33 @@
</span><span class="cx"> return SimpleArgumentCoder<IntSize>::decode(decoder, intSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void pathPointCountApplierFunction(void* info, const PathElement*)
</del><ins>+static void pathPointCountApplierFunction(void* info, const PathElement&)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t* pointCount = static_cast<uint64_t*>(info);
</span><span class="cx"> ++*pointCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void pathEncodeApplierFunction(void* info, const PathElement* element)
</del><ins>+static void pathEncodeApplierFunction(void* info, const PathElement& element)
</ins><span class="cx"> {
</span><span class="cx"> ArgumentEncoder& encoder = *static_cast<ArgumentEncoder*>(info);
</span><span class="cx">
</span><del>- encoder.encodeEnum(element->type);
</del><ins>+ encoder.encodeEnum(element.type);
</ins><span class="cx">
</span><del>- switch (element->type) {
</del><ins>+ switch (element.type) {
</ins><span class="cx"> case PathElementMoveToPoint: // The points member will contain 1 value.
</span><del>- encoder << element->points[0];
</del><ins>+ encoder << element.points[0];
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddLineToPoint: // The points member will contain 1 value.
</span><del>- encoder << element->points[0];
</del><ins>+ encoder << element.points[0];
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddQuadCurveToPoint: // The points member will contain 2 values.
</span><del>- encoder << element->points[0];
- encoder << element->points[1];
</del><ins>+ encoder << element.points[0];
+ encoder << element.points[1];
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementAddCurveToPoint: // The points member will contain 3 values.
</span><del>- encoder << element->points[0];
- encoder << element->points[1];
- encoder << element->points[2];
</del><ins>+ encoder << element.points[0];
+ encoder << element.points[1];
+ encoder << element.points[2];
</ins><span class="cx"> break;
</span><span class="cx"> case PathElementCloseSubpath: // The points member will contain no values.
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>