<!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>[178631] 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/178631">178631</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2015-01-18 09:07:05 -0800 (Sun, 18 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: highlight data for overlay should use protocol type builders
https://bugs.webkit.org/show_bug.cgi?id=129441
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
Add a new domain for overlay types.
* CMakeLists.txt:
* DerivedSources.make:
* inspector/protocol/OverlayTypes.json: Added.
Source/WebCore:
As a first step towards cleaning up the inspector overlay, convert highlight
data construction to use protocol type builders. It's now really obvious what
data is being sent to the inspector overlay page.
This change paves the way towards using inspector protocol commands and events
if we want to support more interactive functionality in the inspector overlay.
This patch makes a few style cleanups, such as standardizing variable names,
using default member initializers, passing by reference, and fixing casts.
No new tests, no behavior changed.
* WebCore.exp.in:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::getHighlight):
(WebCore::InspectorController::buildObjectForHighlightedNode):
(WebCore::InspectorController::inspect): Deleted.
* inspector/InspectorController.h:
* inspector/InspectorOverlay.cpp:
(WebCore::buildRendererHighlight):
(WebCore::buildNodeHighlight):
(WebCore::buildQuadHighlight):
(WebCore::InspectorOverlay::InspectorOverlay):
(WebCore::InspectorOverlay::getHighlight):
(WebCore::buildObjectForPoint):
(WebCore::buildObjectForRect):
(WebCore::buildArrayForQuad):
(WebCore::buildObjectForHighlight):
(WebCore::buildObjectForRegion):
(WebCore::buildObjectForFlowRegions):
(WebCore::buildObjectForSize):
(WebCore::buildQuadObjectForCSSRegionContentClip):
Simplify how the clipping area is encoded. It's now 'regionClippingArea'
stored on a FragmentHighlightData instance.
(WebCore::InspectorOverlay::updatePaintRectsTimerFired):
(WebCore::InspectorOverlay::drawPaintRects):
(WebCore::buildArrayForRendererFragments):
(WebCore::appendPathCommandAndPoints):
(WebCore::appendPathSegment):
(WebCore::buildObjectForShapeOutside):
(WebCore::buildObjectForElementData):
(WebCore::InspectorOverlay::buildObjectForHighlightedNode):
(WebCore::InspectorOverlay::drawNodeHighlight):
(WebCore::InspectorOverlay::drawQuadHighlight):
(WebCore::InspectorOverlay::reset):
(WebCore::buildObjectForRegionHighlight): Deleted.
(WebCore::buildObjectForCSSRegionsHighlight): Deleted.
(WebCore::buildObjectForCSSRegionContentClip): Deleted.
(WebCore::buildObjectForRendererFragments): Deleted.
(WebCore::buildObjectForElementInfo): Deleted.
* inspector/InspectorOverlay.h:
(WebCore::Highlight::Highlight):
* inspector/InspectorOverlayPage.js:
(_createElementTitle):
(_drawElementTitle):
(_drawFragmentHighlight):
(drawNodeHighlight):
* testing/Internals.cpp:
(WebCore::Internals::inspectorHighlightRects):
(WebCore::Internals::inspectorHighlightObject):
Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Update symbol.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayh">trunk/Source/WebCore/inspector/InspectorOverlay.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayPagejs">trunk/Source/WebCore/inspector/InspectorOverlayPage.js</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolOverlayTypesjson">trunk/Source/JavaScriptCore/inspector/protocol/OverlayTypes.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -1024,6 +1024,7 @@
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Inspector.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/LayerTree.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Network.json
</span><ins>+ ${JAVASCRIPTCORE_DIR}/inspector/protocol/OverlayTypes.json
</ins><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Page.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Runtime.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Timeline.json
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-17 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: highlight data for overlay should use protocol type builders
+ https://bugs.webkit.org/show_bug.cgi?id=129441
+
+ Reviewed by Timothy Hatcher.
+
+ Add a new domain for overlay types.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * inspector/protocol/OverlayTypes.json: Added.
+
</ins><span class="cx"> 2015-01-17 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in JSScope::resolve() on tools.ups.com
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -125,6 +125,7 @@
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Inspector.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/LayerTree.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Network.json \
</span><ins>+ $(JavaScriptCore)/inspector/protocol/OverlayTypes.json \
</ins><span class="cx"> $(JavaScriptCore)/inspector/protocol/Page.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Runtime.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Timeline.json \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolOverlayTypesjson"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/protocol/OverlayTypes.json (0 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/OverlayTypes.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/protocol/OverlayTypes.json 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -0,0 +1,129 @@
</span><ins>+{
+ "domain": "OverlayTypes",
+ "description": "Exposes types to be used by the inspector overlay.",
+ "types": [
+ {
+ "id": "Point",
+ "type": "object",
+ "properties": [
+ { "name": "x", "type": "number" },
+ { "name": "y", "type": "number" }
+ ]
+ },
+ {
+ "id": "Size",
+ "type": "object",
+ "properties": [
+ { "name": "width", "type": "integer" },
+ { "name": "height", "type": "integer" }
+ ]
+ },
+ {
+ "id": "Quad",
+ "description": "A quad is a collection of 4 points. When initialized from a rect, the points are in clockwise order from top left.",
+ "type": "array",
+ "items": { "$ref": "Point" }
+ },
+ {
+ "id": "Rect",
+ "description": "A rectangle specified by a reference coordinate and width/height offsets.",
+ "type": "object",
+ "properties": [
+ { "name": "x", "type": "number" },
+ { "name": "y", "type": "number" },
+ { "name": "width", "type": "number" },
+ { "name": "height", "type": "number" }
+ ]
+ },
+ {
+ "id": "Region",
+ "description": "A single region in a flow thread.",
+ "type": "object",
+ "properties": [
+ { "name": "borderQuad", "$ref": "Quad" },
+ { "name": "incomingQuad", "$ref": "Quad" },
+ { "name": "outgoingQuad", "$ref": "Quad" },
+ { "name": "isHighlighted", "type": "boolean", "optional": true }
+ ]
+ },
+ {
+ "id": "DisplayPath",
+ "description": "A vector path described using SVG path syntax.",
+ "type": "array",
+ "items": { "type": "any" }
+ },
+ {
+ "id": "RegionFlowData",
+ "type": "object",
+ "properties": [
+ { "name": "regions", "type": "array", "items": { "$ref": "Region"} },
+ { "name": "name", "type": "string" }
+ ]
+ },
+ {
+ "id": "ContentFlowData",
+ "type": "object",
+ "properties": [
+ { "name": "name", "type": "string" }
+ ]
+ },
+ {
+ "id": "ShapeOutsideData",
+ "type": "object",
+ "properties": [
+ { "name": "bounds", "$ref": "Quad", "description": "Bounds for the shape-outside paths." },
+ { "name": "shape", "$ref": "DisplayPath", "description": "Path for the element's shape.", "optional": true },
+ { "name": "marginShape", "$ref": "DisplayPath", "description": "Path for the element's margin shape.", "optional": true }
+ ]
+ },
+ {
+ "id": "ElementData",
+ "description": "Data that describes an element to be highlighted.",
+ "type": "object",
+ "properties": [
+ { "name": "tagName", "type": "string" },
+ { "name": "idValue", "type": "string", "description": "The value of the element's 'id' attribute." },
+ { "name": "className", "type": "string", "optional": true },
+ { "name": "size", "$ref": "Size", "optional": true },
+ { "name": "role", "type": "string", "description": "Computed accessibility role for the element.", "optional": true },
+ { "name": "regionFlowData", "$ref": "RegionFlowData", "optional": true },
+ { "name": "contentFlowData", "$ref": "ContentFlowData", "optional": true },
+ { "name": "shapeOutsideData", "$ref": "ShapeOutsideData", "optional": true }
+ ]
+ },
+ {
+ "id": "FragmentHighlightData",
+ "description": "Data required to highlight multiple quads.",
+ "type": "object",
+ "properties": [
+ { "name": "quads", "type": "array", "items": { "$ref": "Quad" }, "description": "Quads for which the highlight should be applied."},
+ { "name": "contentColor", "type": "string" },
+ { "name": "contentOutlineColor", "type": "string" },
+ { "name": "paddingColor", "type": "string" },
+ { "name": "borderColor", "type": "string" },
+ { "name": "marginColor", "type": "string" },
+ { "name": "regionClippingArea", "$ref": "Quad", "optional": true }
+ ]
+ },
+ {
+ "id": "NodeHighlightData",
+ "description": "Data required to highlight a DOM node.",
+ "type": "object",
+ "properties": [
+ { "name": "scrollOffset", "$ref": "Point", "description": "Scroll offset for the MainFrame's FrameView that is shared across all quads." },
+ { "name": "fragments", "type": "array", "items": { "$ref": "FragmentHighlightData" } },
+ { "name": "elementData", "$ref": "ElementData", "optional": true }
+ ]
+ },
+ {
+ "id": "OverlayConfiguration",
+ "description": "Data required to configure the overlay's size and scaling behavior.",
+ "type": "object",
+ "properties": [
+ { "name": "deviceScaleFactor", "type": "number" },
+ { "name": "viewportSize", "$ref": "Size" },
+ { "name": "frameViewFullSize", "$ref": "Size" }
+ ]
+ }
+ ]
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebCore/ChangeLog 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -1,3 +1,72 @@
</span><ins>+2015-01-17 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: highlight data for overlay should use protocol type builders
+ https://bugs.webkit.org/show_bug.cgi?id=129441
+
+ Reviewed by Timothy Hatcher.
+
+ As a first step towards cleaning up the inspector overlay, convert highlight
+ data construction to use protocol type builders. It's now really obvious what
+ data is being sent to the inspector overlay page.
+
+ This change paves the way towards using inspector protocol commands and events
+ if we want to support more interactive functionality in the inspector overlay.
+
+ This patch makes a few style cleanups, such as standardizing variable names,
+ using default member initializers, passing by reference, and fixing casts.
+
+ No new tests, no behavior changed.
+
+ * WebCore.exp.in:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::getHighlight):
+ (WebCore::InspectorController::buildObjectForHighlightedNode):
+ (WebCore::InspectorController::inspect): Deleted.
+ * inspector/InspectorController.h:
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::buildRendererHighlight):
+ (WebCore::buildNodeHighlight):
+ (WebCore::buildQuadHighlight):
+ (WebCore::InspectorOverlay::InspectorOverlay):
+ (WebCore::InspectorOverlay::getHighlight):
+ (WebCore::buildObjectForPoint):
+ (WebCore::buildObjectForRect):
+ (WebCore::buildArrayForQuad):
+ (WebCore::buildObjectForHighlight):
+ (WebCore::buildObjectForRegion):
+ (WebCore::buildObjectForFlowRegions):
+ (WebCore::buildObjectForSize):
+ (WebCore::buildQuadObjectForCSSRegionContentClip):
+ Simplify how the clipping area is encoded. It's now 'regionClippingArea'
+ stored on a FragmentHighlightData instance.
+
+ (WebCore::InspectorOverlay::updatePaintRectsTimerFired):
+ (WebCore::InspectorOverlay::drawPaintRects):
+ (WebCore::buildArrayForRendererFragments):
+ (WebCore::appendPathCommandAndPoints):
+ (WebCore::appendPathSegment):
+ (WebCore::buildObjectForShapeOutside):
+ (WebCore::buildObjectForElementData):
+ (WebCore::InspectorOverlay::buildObjectForHighlightedNode):
+ (WebCore::InspectorOverlay::drawNodeHighlight):
+ (WebCore::InspectorOverlay::drawQuadHighlight):
+ (WebCore::InspectorOverlay::reset):
+ (WebCore::buildObjectForRegionHighlight): Deleted.
+ (WebCore::buildObjectForCSSRegionsHighlight): Deleted.
+ (WebCore::buildObjectForCSSRegionContentClip): Deleted.
+ (WebCore::buildObjectForRendererFragments): Deleted.
+ (WebCore::buildObjectForElementInfo): Deleted.
+ * inspector/InspectorOverlay.h:
+ (WebCore::Highlight::Highlight):
+ * inspector/InspectorOverlayPage.js:
+ (_createElementTitle):
+ (_drawElementTitle):
+ (_drawFragmentHighlight):
+ (drawNodeHighlight):
+ * testing/Internals.cpp:
+ (WebCore::Internals::inspectorHighlightRects):
+ (WebCore::Internals::inspectorHighlightObject):
+
</ins><span class="cx"> 2015-01-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [SVG -> OTF Converter] Crashes when SVG font is invalid
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -1859,7 +1859,7 @@
</span><span class="cx"> __ZNK7WebCore19HTMLOptGroupElement14groupLabelTextEv
</span><span class="cx"> __ZNK7WebCore19HTMLTextAreaElement5valueEv
</span><span class="cx"> __ZNK7WebCore19IDBDatabaseMetadata12isolatedCopyEv
</span><del>-__ZNK7WebCore19InspectorController12getHighlightEPNS_9HighlightENS_16InspectorOverlay16CoordinateSystemE
</del><ins>+__ZNK7WebCore19InspectorController12getHighlightERNS_9HighlightENS_16InspectorOverlay16CoordinateSystemE
</ins><span class="cx"> __ZNK7WebCore19InspectorController29buildObjectForHighlightedNodeEv
</span><span class="cx"> __ZNK7WebCore19MediaSessionManager30applicationWillEnterBackgroundEv
</span><span class="cx"> __ZNK7WebCore19MediaSessionManager30applicationWillEnterForegroundEv
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -321,12 +321,12 @@
</span><span class="cx"> m_overlay->paint(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::getHighlight(Highlight* highlight, InspectorOverlay::CoordinateSystem coordinateSystem) const
</del><ins>+void InspectorController::getHighlight(Highlight& highlight, InspectorOverlay::CoordinateSystem coordinateSystem) const
</ins><span class="cx"> {
</span><span class="cx"> m_overlay->getHighlight(highlight, coordinateSystem);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorObject> InspectorController::buildObjectForHighlightedNode() const
</del><ins>+RefPtr<Inspector::Protocol::OverlayTypes::NodeHighlightData> InspectorController::buildObjectForHighlightedNode() const
</ins><span class="cx"> {
</span><span class="cx"> return m_overlay->buildObjectForHighlightedNode();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -48,7 +48,13 @@
</span><span class="cx"> class InspectorBackendDispatcher;
</span><span class="cx"> class InspectorFrontendChannel;
</span><span class="cx"> class InspectorObject;
</span><ins>+
+namespace Protocol {
+namespace OverlayTypes {
+class NodeHighlightData;
</ins><span class="cx"> }
</span><ins>+}
+}
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -104,13 +110,13 @@
</span><span class="cx">
</span><span class="cx"> void inspect(Node*);
</span><span class="cx"> WEBCORE_EXPORT void drawHighlight(GraphicsContext&) const;
</span><del>- WEBCORE_EXPORT void getHighlight(Highlight*, InspectorOverlay::CoordinateSystem) const;
</del><ins>+ WEBCORE_EXPORT void getHighlight(Highlight&, InspectorOverlay::CoordinateSystem) const;
</ins><span class="cx"> void hideHighlight();
</span><span class="cx"> Node* highlightedNode() const;
</span><span class="cx">
</span><span class="cx"> void setIndicating(bool);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT RefPtr<Inspector::InspectorObject> buildObjectForHighlightedNode() const;
</del><ins>+ WEBCORE_EXPORT RefPtr<Inspector::Protocol::OverlayTypes::NodeHighlightData> buildObjectForHighlightedNode() const;
</ins><span class="cx">
</span><span class="cx"> bool isUnderTest() const { return m_isUnderTest; }
</span><span class="cx"> void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "StyledElement.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><ins>+#include <inspector/InspectorProtocolObjects.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -80,13 +81,13 @@
</span><span class="cx"> contentsQuadToCoordinateSystem(mainView, view, quad, InspectorOverlay::CoordinateSystem::View);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void buildRendererHighlight(RenderObject* renderer, RenderRegion* region, const HighlightConfig& highlightConfig, Highlight* highlight, InspectorOverlay::CoordinateSystem coordinateSystem)
</del><ins>+static void buildRendererHighlight(RenderObject* renderer, RenderRegion* region, const HighlightConfig& highlightConfig, Highlight& highlight, InspectorOverlay::CoordinateSystem coordinateSystem)
</ins><span class="cx"> {
</span><span class="cx"> Frame* containingFrame = renderer->document().frame();
</span><span class="cx"> if (!containingFrame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- highlight->setDataFromConfig(highlightConfig);
</del><ins>+ highlight.setDataFromConfig(highlightConfig);
</ins><span class="cx"> FrameView* containingView = containingFrame->view();
</span><span class="cx"> FrameView* mainView = containingFrame->page()->mainFrame().view();
</span><span class="cx">
</span><span class="lines">@@ -94,10 +95,10 @@
</span><span class="cx"> bool isSVGRenderer = renderer->node() && renderer->node()->isSVGElement() && !renderer->isSVGRoot();
</span><span class="cx">
</span><span class="cx"> if (isSVGRenderer) {
</span><del>- highlight->type = HighlightTypeRects;
- renderer->absoluteQuads(highlight->quads);
- for (size_t i = 0; i < highlight->quads.size(); ++i)
- contentsQuadToCoordinateSystem(mainView, containingView, highlight->quads[i], coordinateSystem);
</del><ins>+ highlight.type = HighlightType::Rects;
+ renderer->absoluteQuads(highlight.quads);
+ for (size_t i = 0; i < highlight.quads.size(); ++i)
+ contentsQuadToCoordinateSystem(mainView, containingView, highlight.quads[i], coordinateSystem);
</ins><span class="cx"> } else if (is<RenderBox>(*renderer) || is<RenderInline>(*renderer)) {
</span><span class="cx"> LayoutRect contentBox;
</span><span class="cx"> LayoutRect paddingBox;
</span><span class="lines">@@ -178,35 +179,34 @@
</span><span class="cx"> contentsQuadToCoordinateSystem(mainView, containingView, absBorderQuad, coordinateSystem);
</span><span class="cx"> contentsQuadToCoordinateSystem(mainView, containingView, absMarginQuad, coordinateSystem);
</span><span class="cx">
</span><del>- highlight->type = HighlightTypeNode;
- highlight->quads.append(absMarginQuad);
- highlight->quads.append(absBorderQuad);
- highlight->quads.append(absPaddingQuad);
- highlight->quads.append(absContentQuad);
</del><ins>+ highlight.type = HighlightType::Node;
+ highlight.quads.append(absMarginQuad);
+ highlight.quads.append(absBorderQuad);
+ highlight.quads.append(absPaddingQuad);
+ highlight.quads.append(absContentQuad);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void buildNodeHighlight(Node* node, RenderRegion* region, const HighlightConfig& highlightConfig, Highlight* highlight, InspectorOverlay::CoordinateSystem coordinateSystem)
</del><ins>+static void buildNodeHighlight(Node& node, RenderRegion* region, const HighlightConfig& highlightConfig, Highlight& highlight, InspectorOverlay::CoordinateSystem coordinateSystem)
</ins><span class="cx"> {
</span><del>- RenderObject* renderer = node->renderer();
</del><ins>+ RenderObject* renderer = node.renderer();
</ins><span class="cx"> if (!renderer)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> buildRendererHighlight(renderer, region, highlightConfig, highlight, coordinateSystem);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void buildQuadHighlight(const FloatQuad& quad, const HighlightConfig& highlightConfig, Highlight *highlight)
</del><ins>+static void buildQuadHighlight(const FloatQuad& quad, const HighlightConfig& highlightConfig, Highlight& highlight)
</ins><span class="cx"> {
</span><del>- highlight->setDataFromConfig(highlightConfig);
- highlight->type = HighlightTypeRects;
- highlight->quads.append(quad);
</del><ins>+ highlight.setDataFromConfig(highlightConfig);
+ highlight.type = HighlightType::Rects;
+ highlight.quads.append(quad);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorOverlay::InspectorOverlay(Page& page, InspectorClient* client)
</span><span class="cx"> : m_page(page)
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_paintRectUpdateTimer(*this, &InspectorOverlay::updatePaintRectsTimerFired)
</span><del>- , m_indicating(false)
- , m_showingPaintRects(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -225,14 +225,14 @@
</span><span class="cx"> view->paint(&context, IntRect(0, 0, view->width(), view->height()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorOverlay::getHighlight(Highlight* highlight, InspectorOverlay::CoordinateSystem coordinateSystem) const
</del><ins>+void InspectorOverlay::getHighlight(Highlight& highlight, InspectorOverlay::CoordinateSystem coordinateSystem) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_highlightNode && !m_highlightQuad)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- highlight->type = HighlightTypeRects;
</del><ins>+ highlight.type = HighlightType::Rects;
</ins><span class="cx"> if (m_highlightNode)
</span><del>- buildNodeHighlight(m_highlightNode.get(), nullptr, m_nodeHighlightConfig, highlight, coordinateSystem);
</del><ins>+ buildNodeHighlight(*m_highlightNode, nullptr, m_nodeHighlightConfig, highlight, coordinateSystem);
</ins><span class="cx"> else
</span><span class="cx"> buildQuadHighlight(*m_highlightQuad, m_quadHighlightConfig, highlight);
</span><span class="cx"> }
</span><span class="lines">@@ -331,50 +331,51 @@
</span><span class="cx"> forcePaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForPoint(const FloatPoint& point)
</del><ins>+static Ref<Inspector::Protocol::OverlayTypes::Point> buildObjectForPoint(const FloatPoint& point)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> object = InspectorObject::create();
- object->setDouble(ASCIILiteral("x"), point.x());
- object->setDouble(ASCIILiteral("y"), point.y());
- return WTF::move(object);
</del><ins>+ return Inspector::Protocol::OverlayTypes::Point::create()
+ .setX(point.x())
+ .setY(point.y())
+ .release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForRect(const FloatRect& rect)
</del><ins>+static Ref<Inspector::Protocol::OverlayTypes::Rect> buildObjectForRect(const FloatRect& rect)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> object = InspectorObject::create();
- object->setDouble(ASCIILiteral("x"), rect.x());
- object->setDouble(ASCIILiteral("y"), rect.y());
- object->setDouble(ASCIILiteral("width"), rect.width());
- object->setDouble(ASCIILiteral("height"), rect.height());
- return WTF::move(object);
</del><ins>+ return Inspector::Protocol::OverlayTypes::Rect::create()
+ .setX(rect.x())
+ .setY(rect.y())
+ .setWidth(rect.width())
+ .setHeight(rect.height())
+ .release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorArray> buildArrayForQuad(const FloatQuad& quad)
</del><ins>+static Ref<Inspector::Protocol::OverlayTypes::Quad> buildArrayForQuad(const FloatQuad& quad)
</ins><span class="cx"> {
</span><del>- Ref<InspectorArray> array = InspectorArray::create();
- array->pushObject(buildObjectForPoint(quad.p1()));
- array->pushObject(buildObjectForPoint(quad.p2()));
- array->pushObject(buildObjectForPoint(quad.p3()));
- array->pushObject(buildObjectForPoint(quad.p4()));
</del><ins>+ auto array = Inspector::Protocol::OverlayTypes::Quad::create();
+ array->addItem(buildObjectForPoint(quad.p1()));
+ array->addItem(buildObjectForPoint(quad.p2()));
+ array->addItem(buildObjectForPoint(quad.p3()));
+ array->addItem(buildObjectForPoint(quad.p4()));
</ins><span class="cx"> return WTF::move(array);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForHighlight(const Highlight& highlight)
</del><ins>+static Ref<Inspector::Protocol::OverlayTypes::FragmentHighlightData> buildObjectForHighlight(const Highlight& highlight)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> object = InspectorObject::create();
- Ref<InspectorArray> array = InspectorArray::create();
</del><ins>+ auto arrayOfQuads = Inspector::Protocol::Array<Inspector::Protocol::OverlayTypes::Quad>::create();
</ins><span class="cx"> for (size_t i = 0; i < highlight.quads.size(); ++i)
</span><del>- array->pushArray(buildArrayForQuad(highlight.quads[i]));
- object->setArray("quads", WTF::move(array));
- object->setString("contentColor", highlight.contentColor.serialized());
- object->setString("contentOutlineColor", highlight.contentOutlineColor.serialized());
- object->setString("paddingColor", highlight.paddingColor.serialized());
- object->setString("borderColor", highlight.borderColor.serialized());
- object->setString("marginColor", highlight.marginColor.serialized());
- return WTF::move(object);
</del><ins>+ arrayOfQuads->addItem(buildArrayForQuad(highlight.quads[i]));
+
+ return Inspector::Protocol::OverlayTypes::FragmentHighlightData::create()
+ .setQuads(WTF::move(arrayOfQuads))
+ .setContentColor(highlight.contentColor.serialized())
+ .setContentOutlineColor(highlight.contentOutlineColor.serialized())
+ .setPaddingColor(highlight.paddingColor.serialized())
+ .setBorderColor(highlight.borderColor.serialized())
+ .setMarginColor(highlight.marginColor.serialized())
+ .release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<InspectorObject> buildObjectForRegionHighlight(FrameView* mainView, RenderRegion* region)
</del><ins>+static RefPtr<Inspector::Protocol::OverlayTypes::Region> buildObjectForRegion(FrameView* mainView, RenderRegion* region)
</ins><span class="cx"> {
</span><span class="cx"> FrameView* containingView = region->frame().view();
</span><span class="cx"> if (!containingView)
</span><span class="lines">@@ -388,7 +389,7 @@
</span><span class="cx"> // Create incoming and outgoing boxes that we use to chain the regions toghether.
</span><span class="cx"> const LayoutSize linkBoxSize(10, 10);
</span><span class="cx"> const LayoutSize linkBoxMidpoint(linkBoxSize.width() / 2, linkBoxSize.height() / 2);
</span><del>-
</del><ins>+
</ins><span class="cx"> LayoutRect incomingRectBox = LayoutRect(borderBox.location() - linkBoxMidpoint, linkBoxSize);
</span><span class="cx"> LayoutRect outgoingRectBox = LayoutRect(borderBox.location() - linkBoxMidpoint + borderBox.size(), linkBoxSize);
</span><span class="cx">
</span><span class="lines">@@ -406,47 +407,45 @@
</span><span class="cx"> contentsQuadToPage(mainView, containingView, incomingRectQuad);
</span><span class="cx"> contentsQuadToPage(mainView, containingView, outgoingRectQuad);
</span><span class="cx">
</span><del>- Ref<InspectorObject> regionObject = InspectorObject::create();
-
- regionObject->setArray("borderQuad", buildArrayForQuad(borderRectQuad));
- regionObject->setArray("incomingQuad", buildArrayForQuad(incomingRectQuad));
- regionObject->setArray("outgoingQuad", buildArrayForQuad(outgoingRectQuad));
-
- return WTF::move(regionObject);
</del><ins>+ return Inspector::Protocol::OverlayTypes::Region::create()
+ .setBorderQuad(buildArrayForQuad(borderRectQuad))
+ .setIncomingQuad(buildArrayForQuad(incomingRectQuad))
+ .setOutgoingQuad(buildArrayForQuad(outgoingRectQuad))
+ .release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorArray> buildObjectForCSSRegionsHighlight(RenderRegion* region, RenderFlowThread* flowThread)
</del><ins>+static Ref<Inspector::Protocol::Array<Inspector::Protocol::OverlayTypes::Region>> buildObjectForFlowRegions(RenderRegion* region, RenderFlowThread* flowThread)
</ins><span class="cx"> {
</span><span class="cx"> FrameView* mainFrameView = region->document().page()->mainFrame().view();
</span><span class="cx">
</span><del>- Ref<InspectorArray> array = InspectorArray::create();
</del><ins>+ auto arrayOfRegions = Inspector::Protocol::Array<Inspector::Protocol::OverlayTypes::Region>::create();
</ins><span class="cx">
</span><span class="cx"> const RenderRegionList& regionList = flowThread->renderRegionList();
</span><span class="cx"> for (auto& iterRegion : regionList) {
</span><span class="cx"> if (!iterRegion->isValid())
</span><span class="cx"> continue;
</span><del>- RefPtr<InspectorObject> regionHighlightObject = buildObjectForRegionHighlight(mainFrameView, iterRegion);
- if (!regionHighlightObject)
</del><ins>+ RefPtr<Inspector::Protocol::OverlayTypes::Region> regionObject = buildObjectForRegion(mainFrameView, iterRegion);
+ if (!regionObject)
</ins><span class="cx"> continue;
</span><span class="cx"> if (region == iterRegion) {
</span><span class="cx"> // Let the script know that this is the currently highlighted node.
</span><del>- regionHighlightObject->setBoolean("isHighlighted", true);
</del><ins>+ regionObject->setIsHighlighted(true);
</ins><span class="cx"> }
</span><del>- array->pushObject(regionHighlightObject.release());
</del><ins>+ arrayOfRegions->addItem(WTF::move(regionObject));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(array);
</del><ins>+ return WTF::move(arrayOfRegions);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForSize(const IntSize& size)
</del><ins>+static Ref<Inspector::Protocol::OverlayTypes::Size> buildObjectForSize(const IntSize& size)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
- result->setInteger("width", size.width());
- result->setInteger("height", size.height());
- return WTF::move(result);
</del><ins>+ return Inspector::Protocol::OverlayTypes::Size::create()
+ .setWidth(size.width())
+ .setHeight(size.height())
+ .release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<InspectorObject> buildObjectForCSSRegionContentClip(RenderRegion* region)
</del><ins>+static RefPtr<Inspector::Protocol::OverlayTypes::Quad> buildQuadObjectForCSSRegionContentClip(RenderRegion* region)
</ins><span class="cx"> {
</span><span class="cx"> Frame* containingFrame = region->document().frame();
</span><span class="cx"> if (!containingFrame)
</span><span class="lines">@@ -466,9 +465,7 @@
</span><span class="cx"> FloatQuad clipQuad = region->localToAbsoluteQuad(FloatRect(flippedRegionRect));
</span><span class="cx"> contentsQuadToPage(mainView, containingView, clipQuad);
</span><span class="cx">
</span><del>- Ref<InspectorObject> regionObject = InspectorObject::create();
- regionObject->setArray("quad", buildArrayForQuad(clipQuad));
- return WTF::move(regionObject);
</del><ins>+ return buildArrayForQuad(clipQuad);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::setShowingPaintRects(bool showingPaintRects)
</span><span class="lines">@@ -514,7 +511,7 @@
</span><span class="cx"> m_paintRects.removeFirst();
</span><span class="cx"> rectsChanged = true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_paintRects.isEmpty())
</span><span class="cx"> m_paintRectUpdateTimer.stop();
</span><span class="cx">
</span><span class="lines">@@ -526,11 +523,11 @@
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::drawPaintRects()
</span><span class="cx"> {
</span><del>- Ref<InspectorArray> fragmentsArray = InspectorArray::create();
</del><ins>+ auto arrayOfRects = Inspector::Protocol::Array<Inspector::Protocol::OverlayTypes::Rect>::create();
</ins><span class="cx"> for (const auto& pair : m_paintRects)
</span><del>- fragmentsArray->pushObject(buildObjectForRect(pair.second));
</del><ins>+ arrayOfRects->addItem(buildObjectForRect(pair.second));
</ins><span class="cx">
</span><del>- evaluateInOverlay(ASCIILiteral("updatePaintRects"), WTF::move(fragmentsArray));
</del><ins>+ evaluateInOverlay(ASCIILiteral("updatePaintRects"), WTF::move(arrayOfRects));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::drawGutter()
</span><span class="lines">@@ -538,15 +535,15 @@
</span><span class="cx"> evaluateInOverlay(ASCIILiteral("drawGutter"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<InspectorArray> buildObjectForRendererFragments(RenderObject* renderer, const HighlightConfig& config)
</del><ins>+static RefPtr<Inspector::Protocol::Array<Inspector::Protocol::OverlayTypes::FragmentHighlightData>> buildArrayForRendererFragments(RenderObject* renderer, const HighlightConfig& config)
</ins><span class="cx"> {
</span><del>- Ref<InspectorArray> fragmentsArray = InspectorArray::create();
</del><ins>+ auto arrayOfFragments = Inspector::Protocol::Array<Inspector::Protocol::OverlayTypes::FragmentHighlightData>::create();
</ins><span class="cx">
</span><span class="cx"> RenderFlowThread* containingFlowThread = renderer->flowThreadContainingBlock();
</span><span class="cx"> if (!containingFlowThread) {
</span><span class="cx"> Highlight highlight;
</span><del>- buildRendererHighlight(renderer, nullptr, config, &highlight, InspectorOverlay::CoordinateSystem::View);
- fragmentsArray->pushObject(buildObjectForHighlight(highlight));
</del><ins>+ buildRendererHighlight(renderer, nullptr, config, highlight, InspectorOverlay::CoordinateSystem::View);
+ arrayOfFragments->addItem(buildObjectForHighlight(highlight));
</ins><span class="cx"> } else {
</span><span class="cx"> RenderRegion* startRegion = nullptr;
</span><span class="cx"> RenderRegion* endRegion = nullptr;
</span><span class="lines">@@ -561,19 +558,19 @@
</span><span class="cx"> if (region->isValid()) {
</span><span class="cx"> // Compute the highlight of the fragment inside the current region.
</span><span class="cx"> Highlight highlight;
</span><del>- buildRendererHighlight(renderer, region, config, &highlight, InspectorOverlay::CoordinateSystem::View);
- Ref<InspectorObject> fragmentObject = buildObjectForHighlight(highlight);
</del><ins>+ buildRendererHighlight(renderer, region, config, highlight, InspectorOverlay::CoordinateSystem::View);
+ Ref<Inspector::Protocol::OverlayTypes::FragmentHighlightData> fragmentHighlight = buildObjectForHighlight(highlight);
</ins><span class="cx">
</span><span class="cx"> // Compute the clipping area of the region.
</span><del>- fragmentObject->setObject("region", buildObjectForCSSRegionContentClip(region));
- fragmentsArray->pushObject(WTF::move(fragmentObject));
</del><ins>+ fragmentHighlight->setRegionClippingArea(buildQuadObjectForCSSRegionContentClip(region));
+ arrayOfFragments->addItem(WTF::move(fragmentHighlight));
</ins><span class="cx"> }
</span><span class="cx"> if (region == endRegion)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(fragmentsArray);
</del><ins>+ return WTF::move(arrayOfFragments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="lines">@@ -588,26 +585,27 @@
</span><span class="cx"> struct PathApplyInfo {
</span><span class="cx"> FrameView* rootView;
</span><span class="cx"> FrameView* view;
</span><del>- InspectorArray* array;
</del><ins>+ Inspector::Protocol::OverlayTypes::DisplayPath* pathArray;
</ins><span class="cx"> RenderObject* renderer;
</span><span class="cx"> const ShapeOutsideInfo* shapeOutsideInfo;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static void appendPathCommandAndPoints(PathApplyInfo* info, const String& command, const FloatPoint points[], unsigned length)
</del><ins>+static void appendPathCommandAndPoints(PathApplyInfo& info, const String& command, const FloatPoint points[], unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> FloatPoint point;
</span><del>- info->array->pushString(command);
</del><ins>+ info.pathArray->addItem(command);
</ins><span class="cx"> for (unsigned i = 0; i < length; i++) {
</span><del>- point = info->shapeOutsideInfo->shapeToRendererPoint(points[i]);
- point = localPointToRoot(info->renderer, info->rootView, info->view, point);
- info->array->pushDouble(point.x());
- info->array->pushDouble(point.y());
</del><ins>+ point = info.shapeOutsideInfo->shapeToRendererPoint(points[i]);
+ point = localPointToRoot(info.renderer, info.rootView, info.view, point);
+ info.pathArray->addItem(point.x());
+ info.pathArray->addItem(point.y());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Used as a functor for Shape::apply, which has not been cleaned up to use modern C++.
</ins><span class="cx"> static void appendPathSegment(void* info, const PathElement* pathElement)
</span><span class="cx"> {
</span><del>- PathApplyInfo* pathApplyInfo = static_cast<PathApplyInfo*>(info);
</del><ins>+ PathApplyInfo& pathApplyInfo = *static_cast<PathApplyInfo*>(info);
</ins><span class="cx"> FloatPoint point;
</span><span class="cx"> switch (pathElement->type) {
</span><span class="cx"> // The points member will contain 1 value.
</span><span class="lines">@@ -633,41 +631,43 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<InspectorObject> buildObjectForShapeOutside(Frame* containingFrame, RenderBox* renderer)
</del><ins>+static RefPtr<Inspector::Protocol::OverlayTypes::ShapeOutsideData> buildObjectForShapeOutside(Frame* containingFrame, RenderBox* renderer)
</ins><span class="cx"> {
</span><span class="cx"> const ShapeOutsideInfo* shapeOutsideInfo = renderer->shapeOutsideInfo();
</span><span class="cx"> if (!shapeOutsideInfo)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Ref<InspectorObject> shapeObject = InspectorObject::create();
</del><span class="cx"> LayoutRect shapeBounds = shapeOutsideInfo->computedShapePhysicalBoundingBox();
</span><span class="cx"> FloatQuad shapeQuad = renderer->localToAbsoluteQuad(FloatRect(shapeBounds));
</span><span class="cx"> contentsQuadToPage(containingFrame->page()->mainFrame().view(), containingFrame->view(), shapeQuad);
</span><del>- shapeObject->setArray(ASCIILiteral("bounds"), buildArrayForQuad(shapeQuad));
</del><span class="cx">
</span><ins>+ auto shapeObject = Inspector::Protocol::OverlayTypes::ShapeOutsideData::create()
+ .setBounds(buildArrayForQuad(shapeQuad))
+ .release();
+
</ins><span class="cx"> Shape::DisplayPaths paths;
</span><span class="cx"> shapeOutsideInfo->computedShape().buildDisplayPaths(paths);
</span><span class="cx">
</span><span class="cx"> if (paths.shape.length()) {
</span><del>- Ref<InspectorArray> shapePath = InspectorArray::create();
</del><ins>+ auto shapePath = Inspector::Protocol::OverlayTypes::DisplayPath::create();
</ins><span class="cx"> PathApplyInfo info;
</span><span class="cx"> info.rootView = containingFrame->page()->mainFrame().view();
</span><span class="cx"> info.view = containingFrame->view();
</span><del>- info.array = &shapePath.get();
</del><ins>+ info.pathArray = &shapePath.get();
</ins><span class="cx"> info.renderer = renderer;
</span><span class="cx"> info.shapeOutsideInfo = shapeOutsideInfo;
</span><span class="cx">
</span><span class="cx"> paths.shape.apply(&info, &appendPathSegment);
</span><span class="cx">
</span><del>- shapeObject->setArray(ASCIILiteral("shape"), shapePath.copyRef());
</del><ins>+ shapeObject->setShape(shapePath.copyRef());
</ins><span class="cx">
</span><span class="cx"> if (paths.marginShape.length()) {
</span><del>- shapePath = InspectorArray::create();
- info.array = &shapePath.get();
</del><ins>+ auto marginShapePath = Inspector::Protocol::OverlayTypes::DisplayPath::create();
+ info.pathArray = &marginShapePath.get();
</ins><span class="cx">
</span><span class="cx"> paths.marginShape.apply(&info, &appendPathSegment);
</span><span class="cx">
</span><del>- shapeObject->setArray(ASCIILiteral("marginShape"), shapePath.copyRef());
</del><ins>+ shapeObject->setMarginShape(shapePath.copyRef());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -675,18 +675,19 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static RefPtr<InspectorObject> buildObjectForElementInfo(Node* node)
</del><ins>+static RefPtr<Inspector::Protocol::OverlayTypes::ElementData> buildObjectForElementData(Node* node)
</ins><span class="cx"> {
</span><del>- ASSERT(node);
- if (!is<Element>(*node) || !node->document().frame())
</del><ins>+ if (!is<Element>(node) || !node->document().frame())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Ref<InspectorObject> elementInfo = InspectorObject::create();
-
</del><span class="cx"> Element& element = downcast<Element>(*node);
</span><span class="cx"> bool isXHTML = element.document().isXHTMLDocument();
</span><del>- elementInfo->setString("tagName", isXHTML ? element.nodeName() : element.nodeName().lower());
- elementInfo->setString("idValue", element.getIdAttribute());
</del><ins>+
+ auto elementData = Inspector::Protocol::OverlayTypes::ElementData::create()
+ .setTagName(isXHTML ? element.nodeName() : element.nodeName().lower())
+ .setIdValue(element.getIdAttribute())
+ .release();
+
</ins><span class="cx"> HashSet<AtomicString> usedClassNames;
</span><span class="cx"> if (element.hasClass() && is<StyledElement>(element)) {
</span><span class="cx"> StringBuilder classNames;
</span><span class="lines">@@ -700,40 +701,49 @@
</span><span class="cx"> classNames.append('.');
</span><span class="cx"> classNames.append(className);
</span><span class="cx"> }
</span><del>- elementInfo->setString("className", classNames.toString());
</del><ins>+ elementData->setClassName(classNames.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderElement* renderer = element.renderer();
</span><ins>+ if (!renderer)
+ return nullptr;
+
</ins><span class="cx"> Frame* containingFrame = node->document().frame();
</span><span class="cx"> FrameView* containingView = containingFrame->view();
</span><span class="cx"> IntRect boundingBox = snappedIntRect(containingView->contentsToRootView(renderer->absoluteBoundingBoxRect()));
</span><span class="cx"> RenderBoxModelObject* modelObject = is<RenderBoxModelObject>(*renderer) ? downcast<RenderBoxModelObject>(renderer) : nullptr;
</span><del>- elementInfo->setString("nodeWidth", String::number(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetWidth(), *modelObject) : boundingBox.width()));
- elementInfo->setString("nodeHeight", String::number(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetHeight(), *modelObject) : boundingBox.height()));
-
</del><ins>+ auto sizeObject = Inspector::Protocol::OverlayTypes::Size::create()
+ .setWidth(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetWidth(), *modelObject) : boundingBox.width())
+ .setHeight(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetHeight(), *modelObject) : boundingBox.height())
+ .release();
+ elementData->setSize(WTF::move(sizeObject));
+
</ins><span class="cx"> if (renderer->isRenderNamedFlowFragmentContainer()) {
</span><span class="cx"> RenderNamedFlowFragment& region = *downcast<RenderBlockFlow>(*renderer).renderNamedFlowFragment();
</span><span class="cx"> if (region.isValid()) {
</span><span class="cx"> RenderFlowThread* flowThread = region.flowThread();
</span><del>- RefPtr<InspectorObject> regionFlowInfo = InspectorObject::create();
- regionFlowInfo->setString("name", downcast<RenderNamedFlowThread>(*flowThread).flowThreadName());
- regionFlowInfo->setArray("regions", buildObjectForCSSRegionsHighlight(&region, flowThread));
- elementInfo->setObject("regionFlowInfo", regionFlowInfo.release());
</del><ins>+ auto regionFlowData = Inspector::Protocol::OverlayTypes::RegionFlowData::create()
+ .setName(downcast<RenderNamedFlowThread>(*flowThread).flowThreadName())
+ .setRegions(buildObjectForFlowRegions(&region, flowThread))
+ .release();
+ elementData->setRegionFlowData(WTF::move(regionFlowData));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderFlowThread* containingFlowThread = renderer->flowThreadContainingBlock();
</span><span class="cx"> if (is<RenderNamedFlowThread>(containingFlowThread)) {
</span><del>- RefPtr<InspectorObject> contentFlowInfo = InspectorObject::create();
- contentFlowInfo->setString("name", downcast<RenderNamedFlowThread>(*containingFlowThread).flowThreadName());
- elementInfo->setObject("contentFlowInfo", contentFlowInfo.release());
</del><ins>+ auto contentFlowData = Inspector::Protocol::OverlayTypes::ContentFlowData::create()
+ .setName(downcast<RenderNamedFlowThread>(*containingFlowThread).flowThreadName())
+ .release();
+
+ elementData->setContentFlowData(WTF::move(contentFlowData));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> if (is<RenderBox>(*renderer)) {
</span><span class="cx"> auto& renderBox = downcast<RenderBox>(*renderer);
</span><del>- if (RefPtr<InspectorObject> shapeObject = buildObjectForShapeOutside(containingFrame, &renderBox))
- elementInfo->setObject("shapeOutsideInfo", shapeObject.release());
</del><ins>+ if (RefPtr<Inspector::Protocol::OverlayTypes::ShapeOutsideData> shapeObject = buildObjectForShapeOutside(containingFrame, &renderBox))
+ elementData->setShapeOutsideData(WTF::move(shapeObject));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -743,13 +753,13 @@
</span><span class="cx">
</span><span class="cx"> if (AXObjectCache* axObjectCache = node->document().axObjectCache()) {
</span><span class="cx"> if (AccessibilityObject* axObject = axObjectCache->getOrCreate(node))
</span><del>- elementInfo->setString("role", axObject->computedRoleString());
</del><ins>+ elementData->setRole(axObject->computedRoleString());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(elementInfo);
</del><ins>+ return WTF::move(elementData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorObject> InspectorOverlay::buildObjectForHighlightedNode() const
</del><ins>+RefPtr<Inspector::Protocol::OverlayTypes::NodeHighlightData> InspectorOverlay::buildObjectForHighlightedNode() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_highlightNode)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -759,33 +769,30 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<InspectorArray> highlightFragments = buildObjectForRendererFragments(renderer, m_nodeHighlightConfig);
- if (!highlightFragments)
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::OverlayTypes::FragmentHighlightData>> arrayOfFragmentHighlights = buildArrayForRendererFragments(renderer, m_nodeHighlightConfig);
+ if (!arrayOfFragmentHighlights)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Ref<InspectorObject> highlightObject = InspectorObject::create();
-
</del><span class="cx"> // The main view's scroll offset is shared across all quads.
</span><span class="cx"> FrameView* mainView = m_page.mainFrame().view();
</span><del>- highlightObject->setObject("scroll", buildObjectForPoint(!mainView->delegatesScrolling() ? mainView->visibleContentRect().location() : FloatPoint()));
</del><span class="cx">
</span><del>- highlightObject->setArray("fragments", highlightFragments.release());
</del><ins>+ auto nodeHighlightObject = Inspector::Protocol::OverlayTypes::NodeHighlightData::create()
+ .setScrollOffset(buildObjectForPoint(!mainView->delegatesScrolling() ? mainView->visibleContentRect().location() : FloatPoint()))
+ .setFragments(WTF::move(arrayOfFragmentHighlights))
+ .release();
</ins><span class="cx">
</span><span class="cx"> if (m_nodeHighlightConfig.showInfo) {
</span><del>- RefPtr<InspectorObject> elementInfo = buildObjectForElementInfo(node);
- if (elementInfo)
- highlightObject->setObject("elementInfo", elementInfo.release());
</del><ins>+ if (RefPtr<Inspector::Protocol::OverlayTypes::ElementData> elementData = buildObjectForElementData(node))
+ nodeHighlightObject->setElementData(WTF::move(elementData));
</ins><span class="cx"> }
</span><del>-
- return WTF::move(highlightObject);
</del><ins>+
+ return WTF::move(nodeHighlightObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::drawNodeHighlight()
</span><span class="cx"> {
</span><del>- RefPtr<InspectorObject> highlightObject = buildObjectForHighlightedNode();
- if (!highlightObject)
- return;
- evaluateInOverlay("drawNodeHighlight", highlightObject);
</del><ins>+ if (RefPtr<Inspector::Protocol::OverlayTypes::NodeHighlightData> highlightObject = buildObjectForHighlightedNode())
+ evaluateInOverlay("drawNodeHighlight", WTF::move(highlightObject));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::drawQuadHighlight()
</span><span class="lines">@@ -794,7 +801,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Highlight highlight;
</span><del>- buildQuadHighlight(*m_highlightQuad, m_quadHighlightConfig, &highlight);
</del><ins>+ buildQuadHighlight(*m_highlightQuad, m_quadHighlightConfig, highlight);
</ins><span class="cx"> evaluateInOverlay("drawQuadHighlight", buildObjectForHighlight(highlight));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -859,11 +866,12 @@
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::reset(const IntSize& viewportSize, const IntSize& frameViewFullSize)
</span><span class="cx"> {
</span><del>- Ref<InspectorObject> resetData = InspectorObject::create();
- resetData->setDouble("deviceScaleFactor", m_page.deviceScaleFactor());
- resetData->setObject("viewportSize", buildObjectForSize(viewportSize));
- resetData->setObject("frameViewFullSize", buildObjectForSize(frameViewFullSize));
- evaluateInOverlay("reset", WTF::move(resetData));
</del><ins>+ auto configObject = Inspector::Protocol::OverlayTypes::OverlayConfiguration::create()
+ .setDeviceScaleFactor(m_page.deviceScaleFactor())
+ .setViewportSize(buildObjectForSize(viewportSize))
+ .setFrameViewFullSize(buildObjectForSize(frameViewFullSize))
+ .release();
+ evaluateInOverlay("reset", WTF::move(configObject));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::evaluateInOverlay(const String& method)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.h (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.h 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.h 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -41,7 +41,13 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx"> class InspectorObject;
</span><span class="cx"> class InspectorValue;
</span><ins>+
+namespace Protocol {
+namespace OverlayTypes {
+class NodeHighlightData;
</ins><span class="cx"> }
</span><ins>+}
+}
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -64,17 +70,13 @@
</span><span class="cx"> bool usePageCoordinates;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum HighlightType {
- HighlightTypeNode,
- HighlightTypeRects,
</del><ins>+enum class HighlightType {
+ Node, // Provides 4 quads: margin, border, padding, content.
+ Rects, // Provides a list of quads.
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct Highlight {
</span><del>- Highlight()
- : type(HighlightTypeNode)
- , usePageCoordinates(true)
- {
- }
</del><ins>+ Highlight() { }
</ins><span class="cx">
</span><span class="cx"> void setDataFromConfig(const HighlightConfig& highlightConfig)
</span><span class="cx"> {
</span><span class="lines">@@ -92,11 +94,9 @@
</span><span class="cx"> Color borderColor;
</span><span class="cx"> Color marginColor;
</span><span class="cx">
</span><del>- // When the type is Node, there are 4 quads (margin, border, padding, content).
- // When the type is Rects, this is just a list of quads.
- HighlightType type;
</del><ins>+ HighlightType type {HighlightType::Node};
</ins><span class="cx"> Vector<FloatQuad> quads;
</span><del>- bool usePageCoordinates;
</del><ins>+ bool usePageCoordinates {true};
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class InspectorOverlay {
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">
</span><span class="cx"> void update();
</span><span class="cx"> void paint(GraphicsContext&);
</span><del>- void getHighlight(Highlight*, CoordinateSystem) const;
</del><ins>+ void getHighlight(Highlight&, CoordinateSystem) const;
</ins><span class="cx">
</span><span class="cx"> void setPausedInDebuggerMessage(const String*);
</span><span class="cx">
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> void setIndicating(bool indicating);
</span><span class="cx">
</span><del>- RefPtr<Inspector::InspectorObject> buildObjectForHighlightedNode() const;
</del><ins>+ RefPtr<Inspector::Protocol::OverlayTypes::NodeHighlightData> buildObjectForHighlightedNode() const;
</ins><span class="cx">
</span><span class="cx"> void freePage();
</span><span class="cx"> private:
</span><span class="lines">@@ -161,8 +161,8 @@
</span><span class="cx"> typedef std::pair<std::chrono::steady_clock::time_point, FloatRect> TimeRectPair;
</span><span class="cx"> Deque<TimeRectPair> m_paintRects;
</span><span class="cx"> Timer m_paintRectUpdateTimer;
</span><del>- bool m_indicating;
- bool m_showingPaintRects;
</del><ins>+ bool m_indicating {false};
+ bool m_showingPaintRects {false};
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayPagejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlayPage.js (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlayPage.js 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebCore/inspector/InspectorOverlayPage.js 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -261,37 +261,37 @@
</span><span class="cx"> return value && value.length > maxLength ? value.substring(0, 50) + "\u2026" : value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function _createElementTitle(elementInfo)
</del><ins>+function _createElementTitle(elementData)
</ins><span class="cx"> {
</span><span class="cx"> var builder = new DOMBuilder("div", "element-title");
</span><span class="cx">
</span><del>- builder.appendSpanIfNotNull("tag-name", elementInfo.tagName);
- builder.appendSpanIfNotNull("node-id", elementInfo.idValue, "#");
- builder.appendSpanIfNotNull("class-name", _truncateString(elementInfo.className, 50));
</del><ins>+ builder.appendSpanIfNotNull("tag-name", elementData.tagName);
+ builder.appendSpanIfNotNull("node-id", elementData.idValue, "#");
+ builder.appendSpanIfNotNull("class-name", _truncateString(elementData.className, 50));
</ins><span class="cx">
</span><span class="cx"> builder.appendTextNode(" ");
</span><del>- builder.appendSpan("node-width", elementInfo.nodeWidth);
</del><ins>+ builder.appendSpan("node-width", elementData.size.width);
</ins><span class="cx"> // \xd7 is the code for the &times; HTML entity.
</span><span class="cx"> builder.appendSpan("px", "px \xd7 ");
</span><del>- builder.appendSpan("node-height", elementInfo.nodeHeight);
</del><ins>+ builder.appendSpan("node-height", elementData.size.height);
</ins><span class="cx"> builder.appendSpan("px", "px");
</span><span class="cx">
</span><del>- builder.appendPropertyIfNotNull("role-name", "Role", elementInfo.role);
- builder.appendPropertyIfNotNull("region-flow-name", "Region Flow", elementInfo.regionFlowInfo ? elementInfo.regionFlowInfo.name : null);
- builder.appendPropertyIfNotNull("content-flow-name", "Content Flow", elementInfo.contentFlowInfo ? elementInfo.contentFlowInfo.name : null);
</del><ins>+ builder.appendPropertyIfNotNull("role-name", "Role", elementData.role);
+ builder.appendPropertyIfNotNull("region-flow-name", "Region Flow", elementData.regionFlowData ? elementData.regionFlowData.name : null);
+ builder.appendPropertyIfNotNull("content-flow-name", "Content Flow", elementData.contentFlowData ? elementData.contentFlowData.name : null);
</ins><span class="cx">
</span><span class="cx"> document.getElementById("element-title-container").appendChild(builder.element);
</span><span class="cx">
</span><span class="cx"> return builder.element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function _drawElementTitle(elementInfo, fragmentHighlight, scroll)
</del><ins>+function _drawElementTitle(elementData, fragmentHighlight, scroll)
</ins><span class="cx"> {
</span><del>- if (!elementInfo || !fragmentHighlight.quads.length)
</del><ins>+ if (!elementData || !fragmentHighlight.quads.length)
</ins><span class="cx"> return;
</span><del>-
- var elementTitle = _createElementTitle(elementInfo);
</del><span class="cx">
</span><ins>+ var elementTitle = _createElementTitle(elementData);
+
</ins><span class="cx"> var marginQuad = fragmentHighlight.quads[0];
</span><span class="cx">
</span><span class="cx"> var titleWidth = elementTitle.offsetWidth + 6;
</span><span class="lines">@@ -305,11 +305,10 @@
</span><span class="cx"> var renderArrowDown = false;
</span><span class="cx">
</span><span class="cx"> var boxX = marginQuad[0].x;
</span><del>-
- var containingRegion = fragmentHighlight.region;
- if (containingRegion) {
</del><ins>+
+ var clipQuad = fragmentHighlight.regionClippingArea;
+ if (clipQuad) {
</ins><span class="cx"> // Restrict the position of the title box to the area of the containing region.
</span><del>- var clipQuad = containingRegion.quad;
</del><span class="cx"> anchorTop = Math.max(anchorTop, Math.min(clipQuad[0].y, clipQuad[1].y, clipQuad[2].y, clipQuad[3].y));
</span><span class="cx"> anchorBottom = Math.min(anchorBottom, Math.max(clipQuad[0].y, clipQuad[1].y, clipQuad[2].y, clipQuad[3].y));
</span><span class="cx"> boxX = Math.max(boxX, Math.min(clipQuad[0].x, clipQuad[1].x, clipQuad[2].x, clipQuad[3].x));
</span><span class="lines">@@ -430,9 +429,9 @@
</span><span class="cx">
</span><span class="cx"> context.save();
</span><span class="cx">
</span><del>- if (highlight.region) {
</del><ins>+ if (highlight.regionClippingArea) {
</ins><span class="cx"> // Clip to the containing region to avoid showing fragments that are not rendered by this region.
</span><del>- quadToPath(highlight.region.quad).clip();
</del><ins>+ quadToPath(highlight.regionClippingArea).clip();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var quads = highlight.quads.slice();
</span><span class="lines">@@ -491,23 +490,23 @@
</span><span class="cx"> function drawNodeHighlight(highlight)
</span><span class="cx"> {
</span><span class="cx"> context.save();
</span><del>- context.translate(-highlight.scroll.x, -highlight.scroll.y);
</del><ins>+ context.translate(-highlight.scrollOffset.x, -highlight.scrollOffset.y);
</ins><span class="cx">
</span><span class="cx"> for (var i = 0; i < highlight.fragments.length; ++i)
</span><span class="cx"> _drawFragmentHighlight(highlight.fragments[i]);
</span><span class="cx">
</span><del>- if (highlight.elementInfo && highlight.elementInfo.regionFlowInfo)
- _drawRegionsHighlight(highlight.elementInfo.regionFlowInfo.regions);
</del><ins>+ if (highlight.elementData && highlight.elementData.regionFlowData)
+ _drawRegionsHighlight(highlight.elementData.regionFlowData.regions);
</ins><span class="cx">
</span><del>- if (highlight.elementInfo && highlight.elementInfo.shapeOutsideInfo)
- _drawShapeHighlight(highlight.elementInfo.shapeOutsideInfo);
</del><ins>+ if (highlight.elementData && highlight.elementData.shapeOutsideData)
+ _drawShapeHighlight(highlight.elementData.shapeOutsideData);
</ins><span class="cx">
</span><span class="cx"> context.restore();
</span><span class="cx">
</span><span class="cx"> var elementTitleContainer = document.getElementById("element-title-container");
</span><span class="cx"> elementTitleContainer.innerHTML = "";
</span><span class="cx"> for (var i = 0; i < highlight.fragments.length; ++i)
</span><del>- _drawElementTitle(highlight.elementInfo, highlight.fragments[i], highlight.scroll);
</del><ins>+ _drawElementTitle(highlight.elementData, highlight.fragments[i], highlight.scrollOffset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function drawQuadHighlight(highlight)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -785,7 +785,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Highlight highlight;
</span><del>- document->page()->inspectorController().getHighlight(&highlight, InspectorOverlay::CoordinateSystem::View);
</del><ins>+ document->page()->inspectorController().getHighlight(highlight, InspectorOverlay::CoordinateSystem::View);
</ins><span class="cx"> return ClientRectList::create(highlight.quads);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(ec);
</span><span class="lines">@@ -801,7 +801,7 @@
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><del>- RefPtr<InspectorObject> object = document->page()->inspectorController().buildObjectForHighlightedNode();
</del><ins>+ auto object = document->page()->inspectorController().buildObjectForHighlightedNode();
</ins><span class="cx"> return object ? object->toJSONString() : String();
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(ec);
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebKit/ChangeLog 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-01-17 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: highlight data for overlay should use protocol type builders
+ https://bugs.webkit.org/show_bug.cgi?id=129441
+
+ Reviewed by Timothy Hatcher.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Update symbol.
+
</ins><span class="cx"> 2015-01-14 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix after r178459 and r178462.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (178630 => 178631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2015-01-18 01:41:15 UTC (rev 178630)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2015-01-18 17:07:05 UTC (rev 178631)
</span><span class="lines">@@ -208,8 +208,8 @@
</span><span class="cx"> symbolWithPointer(?item@StaticNodeList@WebCore@@UBEPAVNode@2@I@Z, ?item@StaticNodeList@WebCore@@UEBAPEAVNode@2@I@Z)
</span><span class="cx"> ?selectTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- symbolWithPointer(?buildObjectForHighlightedNode@InspectorController@WebCore@@QBE?AV?$RefPtr@VInspectorObject@Inspector@@@WTF@@XZ, ?buildObjectForHighlightedNode@InspectorController@WebCore@@QEBA?AV?$RefPtr@VInspectorObject@Inspector@@@WTF@@XZ)
- symbolWithPointer(?getHighlight@InspectorController@WebCore@@QBEXPAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z, ?getHighlight@InspectorController@WebCore@@QEBAXPEAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z)
</del><ins>+ symbolWithPointer(?buildObjectForHighlightedNode@InspectorController@WebCore@@QBE?AV?$RefPtr@VNodeHighlightData@OverlayTypes@Protocol@Inspector@@@WTF@@XZ, ?buildObjectForHighlightedNode@InspectorController@WebCore@@QBEA?AV?$RefPtr@VNodeHighlightData@OverlayTypes@Protocol@Inspector@@@WTF@@XZ)
+ symbolWithPointer(?getHighlight@InspectorController@WebCore@@QBEXAAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z, ?getHighlight@InspectorController@WebCore@@QBEXEAAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z)
</ins><span class="cx"> symbolWithPointer(?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@SAPAVInstrumentingAgents@2@PAVPage@2@@Z, ?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@SAPEAVInstrumentingAgents@2@PEAVPage@2@@Z)
</span><span class="cx"> ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
</span><span class="cx"> symbolWithPointer(?isUnderTest@InspectorFrontendClientLocal@WebCore@@UAE_NXZ, ?isUnderTest@InspectorFrontendClientLocal@WebCore@@UEAA_NXZ)
</span></span></pre>
</div>
</div>
</body>
</html>