<!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>[56798] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/56798">56798</a></dd>
<dt>Author</dt> <dd>pfeldman@chromium.org</dd>
<dt>Date</dt> <dd>2010-03-30 10:32:44 -0700 (Tue, 30 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-30  Pavel Feldman  &lt;pfeldman@chromium.org&gt;

        Reviewed by Timothy Hatcher.

        Web Inspector: Do not send empty matching rules for pseudo elements to frontend.

        https://bugs.webkit.org/show_bug.cgi?id=36834

        * inspector/InspectorDOMAgent.cpp:
        (WebCore::InspectorDOMAgent::buildArrayForPseudoElements):
        * inspector/front-end/StylesSidebarPane.js:
        (WebInspector.StylesSidebarPane.prototype._update):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformchromiumtest_expectationstxt">trunk/LayoutTests/platform/chromium/test_expectations.txt</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreinspectorInspectorDOMAgentcpp">trunk/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkWebCoreinspectorfrontendStylesSidebarPanejs">trunk/WebCore/inspector/front-end/StylesSidebarPane.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (56797 => 56798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-03-30 17:09:52 UTC (rev 56797)
+++ trunk/LayoutTests/ChangeLog        2010-03-30 17:32:44 UTC (rev 56798)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2010-03-30  Pavel Feldman  &lt;pfeldman@chromium.org&gt;
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Do not send empty matching rules for pseudo elements to frontend.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36834
+
+        * platform/chromium/test_expectations.txt:
+
</ins><span class="cx"> 2010-03-30  Jian Li  &lt;jianli@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dmitry Titov.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformchromiumtest_expectationstxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (56797 => 56798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/chromium/test_expectations.txt        2010-03-30 17:09:52 UTC (rev 56797)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt        2010-03-30 17:32:44 UTC (rev 56798)
</span><span class="lines">@@ -2848,5 +2848,4 @@
</span><span class="cx"> // Need rebaseline. See https://bugs.webkit.org/show_bug.cgi?id=36461
</span><span class="cx"> BUG_HAMAJI : fast/repaint/overflow-scroll-body-appear.html = IMAGE+TEXT IMAGE
</span><span class="cx"> BUGWK36807 WIN : http/tests/inspector-enabled/console-log-before-frame-navigation.html = TEXT
</span><del>-BUGWK36806 WIN : inspector/elements-panel-styles.html = TEXT
</del><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56797 => 56798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-30 17:09:52 UTC (rev 56797)
+++ trunk/WebCore/ChangeLog        2010-03-30 17:32:44 UTC (rev 56798)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2010-03-30  Pavel Feldman  &lt;pfeldman@chromium.org&gt;
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Do not send empty matching rules for pseudo elements to frontend.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36834
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::buildArrayForPseudoElements):
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylesSidebarPane.prototype._update):
+
</ins><span class="cx"> 2010-03-30  Dirk Schulze  &lt;krit@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Nikolas Zimmermann.
</span></span></pre></div>
<a id="trunkWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/InspectorDOMAgent.cpp (56797 => 56798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/InspectorDOMAgent.cpp        2010-03-30 17:09:52 UTC (rev 56797)
+++ trunk/WebCore/inspector/InspectorDOMAgent.cpp        2010-03-30 17:32:44 UTC (rev 56798)
</span><span class="lines">@@ -881,9 +881,12 @@
</span><span class="cx"> 
</span><span class="cx">     for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId &lt; AFTER_LAST_INTERNAL_PSEUDOID; pseudoId = static_cast&lt;PseudoId&gt;(pseudoId + 1)) {
</span><span class="cx">         RefPtr&lt;CSSRuleList&gt; matchedRules = selector-&gt;pseudoStyleRulesForElement(element, pseudoId, authorOnly);
</span><del>-        ScriptArray matchedArray = buildArrayForCSSRules(matchedRules.get());
-        static_cast&lt;ScriptObject&gt;(matchedArray).set(&quot;pseudoId&quot;, static_cast&lt;int&gt;(pseudoId));
-        result.set(counter++, matchedArray);
</del><ins>+        if (matchedRules &amp;&amp; matchedRules-&gt;length()) {
+            ScriptObject pseudoStyles = m_frontend-&gt;newScriptObject();
+            pseudoStyles.set(&quot;pseudoId&quot;, static_cast&lt;int&gt;(pseudoId));
+            pseudoStyles.set(&quot;rules&quot;, buildArrayForCSSRules(matchedRules.get()));
+            result.set(counter++, pseudoStyles);
+        }
</ins><span class="cx">     }
</span><span class="cx">     return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendStylesSidebarPanejs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/StylesSidebarPane.js (56797 => 56798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/StylesSidebarPane.js        2010-03-30 17:09:52 UTC (rev 56797)
+++ trunk/WebCore/inspector/front-end/StylesSidebarPane.js        2010-03-30 17:32:44 UTC (rev 56798)
</span><span class="lines">@@ -164,17 +164,16 @@
</span><span class="cx"> 
</span><span class="cx">             for (var i = 0; i &lt; styles.pseudoElements.length; ++i) {
</span><span class="cx">                 var pseudoElementCSSRules = styles.pseudoElements[i];
</span><del>-                if (!pseudoElementCSSRules.length)
-                        continue;
</del><span class="cx"> 
</span><span class="cx">                 styleRules = [];
</span><span class="cx">                 var pseudoId = pseudoElementCSSRules.pseudoId;
</span><ins>+
</ins><span class="cx">                 var entry = { isStyleSeparator: true, pseudoId: pseudoId };
</span><span class="cx">                 styleRules.push(entry);
</span><span class="cx"> 
</span><span class="cx">                 // Add rules in reverse order to match the cascade order.
</span><del>-                for (var j = pseudoElementCSSRules.length - 1; j &gt;= 0; --j) {
-                    var rule = WebInspector.CSSStyleDeclaration.parseRule(pseudoElementCSSRules[j]);
</del><ins>+                for (var j = pseudoElementCSSRules.rules.length - 1; j &gt;= 0; --j) {
+                    var rule = WebInspector.CSSStyleDeclaration.parseRule(pseudoElementCSSRules.rules[j]);
</ins><span class="cx">                     styleRules.push({ style: rule.style, selectorText: rule.selectorText, parentStyleSheet: rule.parentStyleSheet, rule: rule });
</span><span class="cx">                 }
</span><span class="cx">                 usedProperties = {};
</span></span></pre>
</div>
</div>

</body>
</html>