<!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>[188337] 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/188337">188337</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-08-12 10:53:55 -0700 (Wed, 12 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Implement selector highlighting for iOS
https://bugs.webkit.org/show_bug.cgi?id=147919
Reviewed by Timothy Hatcher.
Source/WebCore:
* inspector/InspectorOverlay.cpp:
(WebCore::InspectorOverlay::getHighlight):
If the current highlight is a nodeList, generate highlights for each node in the list and
return the concatenated value of those highlights.
Source/WebKit2:
* UIProcess/WKInspectorHighlightView.mm:
(-[WKInspectorHighlightView _layoutForNodeHighlight:offset:]):
Added offset parameter to start drawing the highlight at that index of the highlight quad list.
(-[WKInspectorHighlightView _layoutForNodeListHighlight:]):
Loops through the highlight quads and draws a new highlight for every 4 highlight quad objects.
(-[WKInspectorHighlightView update:]):
Now uses the light highlighting for both nodes and lists of nodes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWKInspectorHighlightViewmm">trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188336 => 188337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-12 14:28:25 UTC (rev 188336)
+++ trunk/Source/WebCore/ChangeLog 2015-08-12 17:53:55 UTC (rev 188337)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-08-12 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Implement selector highlighting for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=147919
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::getHighlight):
+ If the current highlight is a nodeList, generate highlights for each node in the list and
+ return the concatenated value of those highlights.
+
</ins><span class="cx"> 2015-08-12 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Remove promise attribute specific handling from binding generator
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (188336 => 188337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-08-12 14:28:25 UTC (rev 188336)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-08-12 17:53:55 UTC (rev 188337)
</span><span class="lines">@@ -226,13 +226,22 @@
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::getHighlight(Highlight& highlight, InspectorOverlay::CoordinateSystem coordinateSystem) const
</span><span class="cx"> {
</span><del>- if (!m_highlightNode && !m_highlightQuad)
</del><ins>+ if (!m_highlightNode && !m_highlightQuad && !m_highlightNodeList)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> highlight.type = HighlightType::Rects;
</span><span class="cx"> if (m_highlightNode)
</span><span class="cx"> buildNodeHighlight(*m_highlightNode, nullptr, m_nodeHighlightConfig, highlight, coordinateSystem);
</span><del>- else
</del><ins>+ else if (m_highlightNodeList) {
+ highlight.setDataFromConfig(m_nodeHighlightConfig);
+ for (unsigned i = 0; i < m_highlightNodeList->length(); ++i) {
+ Highlight nodeHighlight;
+ buildNodeHighlight(*(m_highlightNodeList->item(i)), nullptr, m_nodeHighlightConfig, nodeHighlight, coordinateSystem);
+ if (nodeHighlight.type == HighlightType::Node)
+ highlight.quads.appendVector(nodeHighlight.quads);
+ }
+ highlight.type = HighlightType::NodeList;
+ } else
</ins><span class="cx"> buildQuadHighlight(*m_highlightQuad, m_quadHighlightConfig, highlight);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188336 => 188337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-12 14:28:25 UTC (rev 188336)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-12 17:53:55 UTC (rev 188337)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-12 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Implement selector highlighting for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=147919
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/WKInspectorHighlightView.mm:
+ (-[WKInspectorHighlightView _layoutForNodeHighlight:offset:]):
+ Added offset parameter to start drawing the highlight at that index of the highlight quad list.
+
+ (-[WKInspectorHighlightView _layoutForNodeListHighlight:]):
+ Loops through the highlight quads and draws a new highlight for every 4 highlight quad objects.
+
+ (-[WKInspectorHighlightView update:]):
+ Now uses the light highlighting for both nodes and lists of nodes.
+
</ins><span class="cx"> 2015-08-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> NetworkProcess: DNS prefetch happens in the Web Process
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWKInspectorHighlightViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm (188336 => 188337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm 2015-08-12 14:28:25 UTC (rev 188336)
+++ trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm 2015-08-12 17:53:55 UTC (rev 188337)
</span><span class="lines">@@ -212,25 +212,23 @@
</span><span class="cx"> CGPathRelease(path);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_layoutForNodeHighlight:(const Highlight&)highlight
</del><ins>+- (void)_layoutForNodeHighlight:(const Highlight&)highlight offset:(unsigned)offset
</ins><span class="cx"> {
</span><del>- if (!highlight.quads.size()) {
- [self _removeAllLayers];
</del><ins>+ ASSERT([_layers count] >= offset + 4);
+ ASSERT(highlight.quads.size() >= offset + 4);
+ if ([_layers count] < offset + 4 || highlight.quads.size() < offset + 4)
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- [self _createLayers:4];
</del><ins>+ CAShapeLayer *marginLayer = [_layers objectAtIndex:offset];
+ CAShapeLayer *borderLayer = [_layers objectAtIndex:offset + 1];
+ CAShapeLayer *paddingLayer = [_layers objectAtIndex:offset + 2];
+ CAShapeLayer *contentLayer = [_layers objectAtIndex:offset + 3];
</ins><span class="cx">
</span><del>- CAShapeLayer *marginLayer = [_layers objectAtIndex:0];
- CAShapeLayer *borderLayer = [_layers objectAtIndex:1];
- CAShapeLayer *paddingLayer = [_layers objectAtIndex:2];
- CAShapeLayer *contentLayer = [_layers objectAtIndex:3];
</del><ins>+ FloatQuad marginQuad = highlight.quads[offset];
+ FloatQuad borderQuad = highlight.quads[offset + 1];
+ FloatQuad paddingQuad = highlight.quads[offset + 2];
+ FloatQuad contentQuad = highlight.quads[offset + 3];
</ins><span class="cx">
</span><del>- FloatQuad marginQuad = highlight.quads[0];
- FloatQuad borderQuad = highlight.quads[1];
- FloatQuad paddingQuad = highlight.quads[2];
- FloatQuad contentQuad = highlight.quads[3];
-
</del><span class="cx"> marginLayer.fillColor = cachedCGColor(highlight.marginColor, ColorSpaceDeviceRGB);
</span><span class="cx"> borderLayer.fillColor = cachedCGColor(highlight.borderColor, ColorSpaceDeviceRGB);
</span><span class="cx"> paddingLayer.fillColor = cachedCGColor(highlight.paddingColor, ColorSpaceDeviceRGB);
</span><span class="lines">@@ -242,6 +240,20 @@
</span><span class="cx"> layerPath(contentLayer, contentQuad);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_layoutForNodeListHighlight:(const Highlight&)highlight
+{
+ if (!highlight.quads.size()) {
+ [self _removeAllLayers];
+ return;
+ }
+
+ unsigned nodeCount = highlight.quads.size() / 4;
+ [self _createLayers:nodeCount * 4];
+
+ for (unsigned i = 0; i < nodeCount; ++i)
+ [self _layoutForNodeHighlight:highlight offset:i * 4];
+}
+
</ins><span class="cx"> - (void)_layoutForRectsHighlight:(const Highlight&)highlight
</span><span class="cx"> {
</span><span class="cx"> NSUInteger numLayers = highlight.quads.size();
</span><span class="lines">@@ -262,8 +274,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)update:(const Highlight&)highlight
</span><span class="cx"> {
</span><del>- if (highlight.type == HighlightType::Node)
- [self _layoutForNodeHighlight:highlight];
</del><ins>+ if (highlight.type == HighlightType::Node || highlight.type == HighlightType::NodeList)
+ [self _layoutForNodeListHighlight:highlight];
</ins><span class="cx"> else if (highlight.type == HighlightType::Rects)
</span><span class="cx"> [self _layoutForRectsHighlight:highlight];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>