<!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>[187430] branches/safari-601.1-branch</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/187430">187430</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 00:10:06 -0700 (Mon, 27 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187352">r187352</a>. rdar://problem/21964842</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsChangeLog">branches/safari-601.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreinspectorInspectorStyleSheetcpp">branches/safari-601.1-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsinspectorcssmodifyruleselectorexpectedtxt">branches/safari-601.1-branch/LayoutTests/inspector/css/modify-rule-selector-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestsinspectorcssmodifyruleselectorhtml">branches/safari-601.1-branch/LayoutTests/inspector/css/modify-rule-selector.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (187429 => 187430)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-27 07:09:00 UTC (rev 187429)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-27 07:10:06 UTC (rev 187430)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-07-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187352.
+
+ 2015-07-24 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Editing non-inspector-stylesheet rule selectors fails after the first change
+ https://bugs.webkit.org/show_bug.cgi?id=147229
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/css/modify-rule-selector-expected.txt: Added.
+ * inspector/css/modify-rule-selector.html: Added.
+
+2015-07-27 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r187371.
</span><span class="cx">
</span><span class="cx"> 2015-07-24 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestsinspectorcssmodifyruleselectorexpectedtxtfromrev187352trunkLayoutTestsinspectorcssmodifyruleselectorexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1-branch/LayoutTests/inspector/css/modify-rule-selector-expected.txt (from rev 187352, trunk/LayoutTests/inspector/css/modify-rule-selector-expected.txt) (0 => 187430)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/inspector/css/modify-rule-selector-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/inspector/css/modify-rule-selector-expected.txt 2015-07-27 07:10:06 UTC (rev 187430)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Testing that selectors are able to be modified more than once.
+
+
+Selector before mutation: .foo
+Selector after mutation: span.foo
+
+Selector before mutation: span.foo
+Selector after mutation: body > .foo
+
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsinspectorcssmodifyruleselectorhtmlfromrev187352trunkLayoutTestsinspectorcssmodifyruleselectorhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1-branch/LayoutTests/inspector/css/modify-rule-selector.html (from rev 187352, trunk/LayoutTests/inspector/css/modify-rule-selector.html) (0 => 187430)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/inspector/css/modify-rule-selector.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/inspector/css/modify-rule-selector.html 2015-07-27 07:10:06 UTC (rev 187430)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ .foo {}
+</style>
+<script type="text/javascript" src="../../http/tests/inspector/inspector-test.js"></script>
+<script>
+function test() {
+ var nodeStyles;
+ var selectors = ["span.foo", "body > .foo"];
+ var index = 0;
+
+ function modifyRuleSelector(selector) {
+ if (!nodeStyles.matchedRules.length) {
+ InspectorTest.log("ERROR: missing matched rules");
+ InspectorTest.completeTest();
+ return;
+ }
+
+ var rule = nodeStyles.matchedRules[0];
+ CSSAgent.setRuleSelector(rule.id, selector, function(error, payload) {
+ if (error) {
+ InspectorTest.log("ERROR: " + error);
+ InspectorTest.completeTest();
+ return;
+ }
+
+ var newSelector = payload.selectorList.text;
+ InspectorTest.log("\nSelector before mutation: " + rule.selectorText);
+ InspectorTest.log("Selector after mutation: " + newSelector);
+ InspectorTest.assert(newSelector === selector, "FAIL: Selector " + newSelector + " should be updated to " + selector + ".");
+
+ nodeStyles.refresh();
+ });
+ }
+
+ // Every time the nodeStyles refreshes, attempt to change the selector
+ // of the first rule to the next selector in the list.
+ function onStylesRefreshed()
+ {
+ if (index >= selectors.length) {
+ InspectorTest.completeTest();
+ return;
+ }
+
+ modifyRuleSelector(selectors[index]);
+ ++index;
+ }
+
+ WebInspector.domTreeManager.requestDocument(function(documentNode) {
+ if (!documentNode) {
+ InspectorTest.log("ERROR: document not found.");
+ InspectorTest.completeTest();
+ return;
+ }
+
+ WebInspector.domTreeManager.querySelector(documentNode.id, ".foo", function(contentNodeId) {
+ if (!contentNodeId) {
+ InspectorTest.log("ERROR: DOM node not found.");
+ InspectorTest.completeTest();
+ return;
+ }
+
+ var domNode = WebInspector.domTreeManager.nodeForId(contentNodeId);
+ nodeStyles = WebInspector.cssStyleManager.stylesForNode(domNode);
+
+ nodeStyles.addEventListener(WebInspector.DOMNodeStyles.Event.Refreshed, onStylesRefreshed, this);
+ if (!nodeStyles.needsRefresh)
+ onStylesRefreshed();
+ });
+ });
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Testing that selectors are able to be modified more than once.</p>
+
+ <span class="foo"></span>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187429 => 187430)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-27 07:09:00 UTC (rev 187429)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-27 07:10:06 UTC (rev 187430)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-07-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187352.
+
+ 2015-07-24 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Editing non-inspector-stylesheet rule selectors fails after the first change
+ https://bugs.webkit.org/show_bug.cgi?id=147229
+
+ Reviewed by Timothy Hatcher.
+
+ Test: inspector/css/modify-rule-selector.html
+
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::setRuleSelector):
+ Now checks to see if the stylesheet is not mutated before making the change to the
+ rule's selector, and if so mark it as not mutated to allow future edits.
+
+2015-07-27 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r187393.
</span><span class="cx">
</span><span class="cx"> 2015-07-25 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp (187429 => 187430)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-07-27 07:09:00 UTC (rev 187429)
+++ branches/safari-601.1-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-07-27 07:10:06 UTC (rev 187430)
</span><span class="lines">@@ -652,6 +652,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If the stylesheet is already mutated at this point, that must mean that our data has been modified
+ // elsewhere. This should never happen as ensureParsedDataReady would return false in that case.
+ ASSERT(!styleSheetMutated());
+
</ins><span class="cx"> rule->setSelectorText(selector);
</span><span class="cx"> RefPtr<CSSRuleSourceData> sourceData = ruleSourceDataFor(&rule->style());
</span><span class="cx"> if (!sourceData) {
</span><span class="lines">@@ -662,6 +666,7 @@
</span><span class="cx"> String sheetText = m_parsedStyleSheet->text();
</span><span class="cx"> sheetText.replace(sourceData->ruleHeaderRange.start, sourceData->ruleHeaderRange.length(), selector);
</span><span class="cx"> m_parsedStyleSheet->setText(sheetText);
</span><ins>+ m_pageStyleSheet->clearHadRulesMutation();
</ins><span class="cx"> fireStyleSheetChanged();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>