<!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>[206093] trunk/Source/WebCore</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/206093">206093</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-19 04:30:28 -0700 (Mon, 19 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: ⇧⌘C should highlight node under cursor without re-moving mouse
https://bugs.webkit.org/show_bug.cgi?id=162128
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-09-19
Reviewed by Brian Burg.
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorDOMAgent::mouseDidMoveOverElement):
(WebCore::InspectorDOMAgent::highlightMousedOverNode):
(WebCore::InspectorDOMAgent::setSearchingForNode):
When the inspector is connected, remember the last moused over node.
This produces far more consistent results of highlighting under
the cursor when pressing and releasing the keyboard shortcut keys,
without having to move the mouse. Even when using the shortcut to
first connect the inspector this produces far more consistent
results because releasing the keys for the shortcut produce new
mouseDidMoveOverElement events.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgenth">trunk/Source/WebCore/inspector/InspectorDOMAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206092 => 206093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-19 11:29:36 UTC (rev 206092)
+++ trunk/Source/WebCore/ChangeLog 2016-09-19 11:30:28 UTC (rev 206093)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-09-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: ⇧⌘C should highlight node under cursor without re-moving mouse
+ https://bugs.webkit.org/show_bug.cgi?id=162128
+
+ Reviewed by Brian Burg.
+
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorDOMAgent::mouseDidMoveOverElement):
+ (WebCore::InspectorDOMAgent::highlightMousedOverNode):
+ (WebCore::InspectorDOMAgent::setSearchingForNode):
+ When the inspector is connected, remember the last moused over node.
+ This produces far more consistent results of highlighting under
+ the cursor when pressing and releasing the keyboard shortcut keys,
+ without having to move the mouse. Even when using the shortcut to
+ first connect the inspector this produces far more consistent
+ results because releasing the keys for the shortcut produce new
+ mouseDidMoveOverElement events.
+
</ins><span class="cx"> 2016-09-19 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> JSDOMBindings' toArguments() should return a more descriptive object
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (206092 => 206093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-09-19 11:29:36 UTC (rev 206092)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-09-19 11:30:28 UTC (rev 206093)
</span><span class="lines">@@ -241,12 +241,13 @@
</span><span class="cx"> {
</span><span class="cx"> m_history.reset();
</span><span class="cx"> m_domEditor.reset();
</span><ins>+ m_mousedOverNode = nullptr;
</ins><span class="cx">
</span><span class="cx"> ErrorString unused;
</span><del>- setSearchingForNode(unused, false, 0);
</del><ins>+ setSearchingForNode(unused, false, nullptr);
</ins><span class="cx"> hideHighlight(unused);
</span><span class="cx">
</span><del>- m_instrumentingAgents.setInspectorDOMAgent(0);
</del><ins>+ m_instrumentingAgents.setInspectorDOMAgent(nullptr);
</ins><span class="cx"> m_documentRequested = false;
</span><span class="cx"> reset();
</span><span class="cx"> }
</span><span class="lines">@@ -1005,10 +1006,17 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::mouseDidMoveOverElement(const HitTestResult& result, unsigned)
</span><span class="cx"> {
</span><ins>+ m_mousedOverNode = result.innerNode();
+
</ins><span class="cx"> if (!m_searchingForNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Node* node = result.innerNode();
</del><ins>+ highlightMousedOverNode();
+}
+
+void InspectorDOMAgent::highlightMousedOverNode()
+{
+ Node* node = m_mousedOverNode.get();
</ins><span class="cx"> while (node && node->nodeType() == Node::TEXT_NODE)
</span><span class="cx"> node = node->parentNode();
</span><span class="cx"> if (node && m_inspectModeHighlightConfig)
</span><span class="lines">@@ -1026,6 +1034,7 @@
</span><span class="cx"> m_inspectModeHighlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject);
</span><span class="cx"> if (!m_inspectModeHighlightConfig)
</span><span class="cx"> return;
</span><ins>+ highlightMousedOverNode();
</ins><span class="cx"> } else
</span><span class="cx"> hideHighlight(errorString);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (206092 => 206093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2016-09-19 11:29:36 UTC (rev 206092)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2016-09-19 11:30:28 UTC (rev 206093)
</span><span class="lines">@@ -215,6 +215,7 @@
</span><span class="cx"> InspectorPageAgent* pageAgent() { return m_pageAgent; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void highlightMousedOverNode();
</ins><span class="cx"> void setSearchingForNode(ErrorString&, bool enabled, const Inspector::InspectorObject* highlightConfig);
</span><span class="cx"> std::unique_ptr<HighlightConfig> highlightConfigFromInspectorObject(ErrorString&, const Inspector::InspectorObject* highlightInspectorObject);
</span><span class="cx">
</span><span class="lines">@@ -270,6 +271,7 @@
</span><span class="cx"> SearchResults m_searchResults;
</span><span class="cx"> std::unique_ptr<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask;
</span><span class="cx"> RefPtr<Node> m_nodeToFocus;
</span><ins>+ RefPtr<Node> m_mousedOverNode;
</ins><span class="cx"> bool m_searchingForNode { false };
</span><span class="cx"> std::unique_ptr<HighlightConfig> m_inspectModeHighlightConfig;
</span><span class="cx"> std::unique_ptr<InspectorHistory> m_history;
</span></span></pre>
</div>
</div>
</body>
</html>