<!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>[178636] 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/178636">178636</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-18 16:03:33 -0800 (Sun, 18 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Attempt to fix the iOS build after <http://trac.webkit.org/changeset/178631>
(https://bugs.webkit.org/show_bug.cgi?id=129441)
Source/WebKit/mac:
Pass lvalue reference to WebCore::Highlight instead of pointer in call to InspectorController::getHighlight().
Also substitute HighlightType::Node and HighlightType::Rects for HighlightTypeNode and HighlightTypeRects, respectively.
* WebInspector/WebNodeHighlightView.mm:
(-[WebNodeHighlightView layoutSublayers:]):
Source/WebKit2:
* UIProcess/WKInspectorHighlightView.mm:
(-[WKInspectorHighlightView update:]): Substitute HighlightType::Node and
HighlightType::Rects for HighlightTypeNode and HighlightTypeRects, respectively.
* WebProcess/WebCoreSupport/WebInspectorClient.cpp:
(WebKit::WebInspectorClient::highlight): Pass lvalue reference to WebCore::Highlight
instead of pointer in call to InspectorController::getHighlight().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebNodeHighlightViewmm">trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWKInspectorHighlightViewmm">trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebInspectorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (178635 => 178636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-19 00:03:33 UTC (rev 178636)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-18 Daniel Bates <dabates@apple.com>
+
+ Attempt to fix the iOS build after <http://trac.webkit.org/changeset/178631>
+ (https://bugs.webkit.org/show_bug.cgi?id=129441)
+
+ Pass lvalue reference to WebCore::Highlight instead of pointer in call to InspectorController::getHighlight().
+ Also substitute HighlightType::Node and HighlightType::Rects for HighlightTypeNode and HighlightTypeRects, respectively.
+
+ * WebInspector/WebNodeHighlightView.mm:
+ (-[WebNodeHighlightView layoutSublayers:]):
+
</ins><span class="cx"> 2015-01-16 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure early cancellation of immediate action actually does that in WK1
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebNodeHighlightViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm (178635 => 178636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2015-01-19 00:03:33 UTC (rev 178636)
</span><span class="lines">@@ -315,11 +315,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Highlight h;
</span><del>- [_webNodeHighlight inspectorController]->getHighlight(&h, InspectorOverlay::CoordinateSystem::View);
</del><ins>+ [_webNodeHighlight inspectorController]->getHighlight(h, InspectorOverlay::CoordinateSystem::View);
</ins><span class="cx">
</span><del>- if (h.type == HighlightTypeNode)
</del><ins>+ if (h.type == HighlightType::Node)
</ins><span class="cx"> [self _layoutForNodeHighlight:&h parent:parentLayer];
</span><del>- else if (h.type == HighlightTypeRects)
</del><ins>+ else if (h.type == HighlightType::Rects)
</ins><span class="cx"> [self _layoutForRectsHighlight:&h parent:parentLayer];
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178635 => 178636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-19 00:03:33 UTC (rev 178636)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-18 Daniel Bates <dabates@apple.com>
+
+ Attempt to fix the iOS build after <http://trac.webkit.org/changeset/178631>
+ (https://bugs.webkit.org/show_bug.cgi?id=129441)
+
+ * UIProcess/WKInspectorHighlightView.mm:
+ (-[WKInspectorHighlightView update:]): Substitute HighlightType::Node and
+ HighlightType::Rects for HighlightTypeNode and HighlightTypeRects, respectively.
+ * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+ (WebKit::WebInspectorClient::highlight): Pass lvalue reference to WebCore::Highlight
+ instead of pointer in call to InspectorController::getHighlight().
+
</ins><span class="cx"> 2015-01-18 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix style issues and add availability macros missed in r178634
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWKInspectorHighlightViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm (178635 => 178636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm 2015-01-19 00:03:33 UTC (rev 178636)
</span><span class="lines">@@ -257,9 +257,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)update:(const Highlight&)highlight
</span><span class="cx"> {
</span><del>- if (highlight.type == HighlightTypeNode)
</del><ins>+ if (highlight.type == HighlightType::Node)
</ins><span class="cx"> [self _layoutForNodeHighlight:highlight];
</span><del>- else if (highlight.type == HighlightTypeRects)
</del><ins>+ else if (highlight.type == HighlightType::Rects)
</ins><span class="cx"> [self _layoutForRectsHighlight:highlight];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp (178635 => 178636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2015-01-18 22:16:35 UTC (rev 178635)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2015-01-19 00:03:33 UTC (rev 178636)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> Highlight highlight;
</span><del>- m_page->corePage()->inspectorController().getHighlight(&highlight, InspectorOverlay::CoordinateSystem::Document);
</del><ins>+ m_page->corePage()->inspectorController().getHighlight(highlight, InspectorOverlay::CoordinateSystem::Document);
</ins><span class="cx"> m_page->showInspectorHighlight(highlight);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>