<!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>[160127] trunk</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/160127">160127</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2013-12-04 14:24:55 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: [CSS Shapes] Support raster shape visualizations
https://bugs.webkit.org/show_bug.cgi?id=124080
Reviewed by Joseph Pecoraro.
Source/WebCore:
Create an inspector visualization for a shape created from an image.
The visualization takes each line of the image, combining where possible.
Test added to inspector-protocol/model/highlight-shape-outside.html
* rendering/shapes/RasterShape.cpp:
(WebCore::RasterShapeIntervals::buildBoundsPath): Create a path representing the
RasterShapeIntervals.
* rendering/shapes/RasterShape.h:
LayoutTests:
Add a test for data sent to the inspector for a raster shape.
* inspector-protocol/model/highlight-shape-outside-expected.txt:
* inspector-protocol/model/highlight-shape-outside.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolmodelhighlightshapeoutsideexpectedtxt">trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolmodelhighlightshapeoutsidehtml">trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesRasterShapecpp">trunk/Source/WebCore/rendering/shapes/RasterShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesRasterShapeh">trunk/Source/WebCore/rendering/shapes/RasterShape.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160126 => 160127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-04 22:18:43 UTC (rev 160126)
+++ trunk/LayoutTests/ChangeLog 2013-12-04 22:24:55 UTC (rev 160127)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-04 Bear Travis <betravis@adobe.com>
+
+ Web Inspector: [CSS Shapes] Support raster shape visualizations
+ https://bugs.webkit.org/show_bug.cgi?id=124080
+
+ Reviewed by Joseph Pecoraro.
+
+ Add a test for data sent to the inspector for a raster shape.
+
+ * inspector-protocol/model/highlight-shape-outside-expected.txt:
+ * inspector-protocol/model/highlight-shape-outside.html:
+
</ins><span class="cx"> 2013-12-04 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow ImageBuffer to use an IOSurface that is larger than necessary
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolmodelhighlightshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside-expected.txt (160126 => 160127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside-expected.txt 2013-12-04 22:18:43 UTC (rev 160126)
+++ trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside-expected.txt 2013-12-04 22:24:55 UTC (rev 160127)
</span><span class="lines">@@ -7,4 +7,7 @@
</span><span class="cx"> PASS: Actual [M 175 75 L 175 125 L 75 125 L 75 75 L 175 75 Z] Expected [M 175 75 L 175 125 L 75 125 L 75 75 L 175 75 Z]
</span><span class="cx"> PASS: Actual [M 150 50 L 150 100 L 50 100 L 50 50 L 150 50 Z] Expected [M 150 50 L 150 100 L 50 100 L 50 50 L 150 50 Z]
</span><span class="cx"> PASS: Actual [M 25 25 L 125 25 L 125 125 L 25 125 L 25 25 Z] Expected [M 25 25 L 125 25 L 125 125 L 25 125 L 25 25 Z]
</span><ins>+PASS: Actual [M 50 50 L 100 50 L 100 100 L 50 100 Z] Expected [M 50 50 L 100 50 L 100 100 L 50 100 Z]
+PASS: Actual [M 35 35 L 115 35 L 115 65 L 35 65 Z M 35 85 L 115 85 L 115 115 L 35 115 Z] Expected [M 35 35 L 115 35 L 115 65 L 35 65 Z M 35 85 L 115 85 L 115 115 L 35 115 Z]
+PASS: Actual [M 50 50 L 100 50 L 100 100 L 50 100 Z] Expected [M 50 50 L 100 50 L 100 100 L 50 100 Z]
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolmodelhighlightshapeoutsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html (160126 => 160127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html 2013-12-04 22:18:43 UTC (rev 160126)
+++ trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html 2013-12-04 22:24:55 UTC (rev 160127)
</span><span class="lines">@@ -39,6 +39,16 @@
</span><span class="cx"> .content-box {
</span><span class="cx"> -webkit-shape-outside: content-box;
</span><span class="cx"> }
</span><ins>+.raster-svg {
+ -webkit-shape-outside: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='none' width='100px' height='100px'><rect x='25' y='25' width='50' height='50' fill='blue' /></svg>");
+}
+.raster-svg-complex {
+ -webkit-shape-outside: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='none' width='100px' height='100px'><rect x='10' y='10' width='30' height='30' fill='blue' /><rect x='60' y='10' width='30' height='30' fill='blue' /><rect x='10' y='60' width='30' height='30' fill='blue' /><rect x='60' y='60' width='30' height='30' fill='blue' /></svg>");
+}
+.raster-png {
+ /* png version of raster-svg */
+ -webkit-shape-outside: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAMAAABHPGVmAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRFAAD/////e9yZLAAAAAJ0Uk5T/wDltzBKAAAASUlEQVR42uzYsQ0AMAgEsWf/pTMDBURIvgXcX2qhQCAQCAQCgUA+I2kHgUAgEAgEAoFAIBAIBAKBQOYRoxMCgUAgEAjkHPIEGAA2ih1NVnaDGgAAAABJRU5ErkJggg==");
+}
</ins><span class="cx"> </style>
</span><span class="cx"> <script type="text/javascript" src="../../http/tests/inspector-protocol/resources/protocol-test.js"></script>
</span><span class="cx"> <script type="text/javascript" src="../resources/shape-info-helper.js"></script>
</span><span class="lines">@@ -80,6 +90,18 @@
</span><span class="cx"> {
</span><span class="cx"> 'selector' : '.content-box.padded',
</span><span class="cx"> 'path' : ['M', 25, 25, 'L', 125, 25, 'L', 125, 125, 'L', 25, 125, 'L', 25, 25, 'Z']
</span><ins>+ },
+ {
+ 'selector' : '.raster-svg.padded',
+ 'path' : ['M', 50, 50, 'L', 100, 50, 'L', 100, 100, 'L', 50, 100, 'Z']
+ },
+ {
+ 'selector' : '.raster-svg-complex.padded',
+ 'path' : ['M', 35, 35, 'L', 115, 35, 'L', 115, 65, 'L', 35, 65, 'Z', 'M', 35, 85, 'L', 115, 85, 'L', 115, 115, 'L', 35, 115, 'Z']
+ },
+ {
+ 'selector' : '.raster-png.padded',
+ 'path' : ['M', 50, 50, 'L', 100, 50, 'L', 100, 100, 'L', 50, 100, 'Z']
</ins><span class="cx"> }
</span><span class="cx"> ];
</span><span class="cx">
</span><span class="lines">@@ -113,5 +135,8 @@
</span><span class="cx"> <div class='shape padded rectangle vertical-rl'></div>
</span><span class="cx"> <div class='shape padded rectangle vertical-rl border-box'></div>
</span><span class="cx"> <div class='shape padded content-box'></div>
</span><ins>+ <div class='shape padded raster-svg'></div>
+ <div class='shape padded raster-svg-complex'></div>
+ <div class='shape padded raster-png'></div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160126 => 160127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-04 22:18:43 UTC (rev 160126)
+++ trunk/Source/WebCore/ChangeLog 2013-12-04 22:24:55 UTC (rev 160127)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-12-04 Bear Travis <betravis@adobe.com>
+
+ Web Inspector: [CSS Shapes] Support raster shape visualizations
+ https://bugs.webkit.org/show_bug.cgi?id=124080
+
+ Reviewed by Joseph Pecoraro.
+
+ Create an inspector visualization for a shape created from an image.
+ The visualization takes each line of the image, combining where possible.
+
+ Test added to inspector-protocol/model/highlight-shape-outside.html
+
+ * rendering/shapes/RasterShape.cpp:
+ (WebCore::RasterShapeIntervals::buildBoundsPath): Create a path representing the
+ RasterShapeIntervals.
+ * rendering/shapes/RasterShape.h:
+
</ins><span class="cx"> 2013-12-04 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Remove explicit numbering from BasicShape::Type and CSSBasicShape::Type enums
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesRasterShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/RasterShape.cpp (160126 => 160127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/RasterShape.cpp 2013-12-04 22:18:43 UTC (rev 160126)
+++ trunk/Source/WebCore/rendering/shapes/RasterShape.cpp 2013-12-04 22:24:55 UTC (rev 160127)
</span><span class="lines">@@ -252,6 +252,23 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RasterShapeIntervals::buildBoundsPath(Path& path) const
+{
+ for (int y = bounds().y(); y < bounds().maxY(); y++) {
+ if (intervalsAt(y).isEmpty())
+ continue;
+
+ IntShapeInterval extent = limitIntervalAt(y);
+ int endY = y + 1;
+ for (; endY < bounds().maxY(); endY++) {
+ if (intervalsAt(endY).isEmpty() || limitIntervalAt(endY) != extent)
+ break;
+ }
+ path.addRect(FloatRect(extent.x1(), y, extent.width(), endY - y));
+ y = endY - 1;
+ }
+}
+
</ins><span class="cx"> const RasterShapeIntervals& RasterShape::marginIntervals() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(shapeMargin() >= 0);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesRasterShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/RasterShape.h (160126 => 160127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/RasterShape.h 2013-12-04 22:18:43 UTC (rev 160126)
+++ trunk/Source/WebCore/rendering/shapes/RasterShape.h 2013-12-04 22:24:55 UTC (rev 160127)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx"> bool firstIncludedIntervalY(int minY, const IntSize& minSize, LayoutUnit& result) const;
</span><span class="cx"> PassOwnPtr<RasterShapeIntervals> computeShapeMarginIntervals(unsigned shapeMargin) const;
</span><span class="cx">
</span><ins>+ void buildBoundsPath(Path&) const;
+
</ins><span class="cx"> private:
</span><span class="cx"> int size() const { return m_intervalLists.size(); }
</span><span class="cx">
</span><span class="lines">@@ -101,8 +103,7 @@
</span><span class="cx"> virtual void getIncludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalHeight, SegmentList&) const OVERRIDE;
</span><span class="cx"> virtual bool firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTop, const LayoutSize& minLogicalIntervalSize, LayoutUnit&) const OVERRIDE;
</span><span class="cx">
</span><del>- // FIXME: Bug 124080 - RasterShapes are not yet supported and only display their shape bounds
- virtual void buildPath(Path& path) const OVERRIDE { UNUSED_PARAM(path); }
</del><ins>+ virtual void buildPath(Path& path) const OVERRIDE { m_intervals->buildBoundsPath(path); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> const RasterShapeIntervals& marginIntervals() const;
</span></span></pre>
</div>
</div>
</body>
</html>