<!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>[197079] releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI</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/197079">197079</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-25 02:02:13 -0800 (Thu, 25 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/196867">r196867</a> - Web Inspector: Visual Styles: Modifying background expands Font section
https://bugs.webkit.org/show_bug.cgi?id=154491
<rdar://problem/24755440>
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-02-20
Reviewed by Timothy Hatcher.
When the user selects a new style, the Visual sidebar examines the property
editors in each subsection to see if any have a value and expands/collapses
the subsection accordingly. This issue was happening because that logic was
also being triggered when the user didn't select a new style, which is
controlled by DOMNodeStyles and the significantChange value in refresh().
* UserInterface/Base/Utilities.js:
(String.prototype.toCamelCase):
Added utility function to transform a string into a camel-cased version.
* UserInterface/Models/DOMNodeStyles.js:
(WebInspector.DOMNodeStyles.prototype.refresh.fetchedComputedStyle):
Dropped unused variable and added checks to make sure doubly-matching styles
don't count as a significant change and cause refreshes of the styles sidebar.
* UserInterface/Views/VisualStyleDetailsPanel.js:
(WebInspector.VisualStyleDetailsPanel.prototype._updateSections):
If this function has an event, meaning it was triggered by a newly selected
selector in the selector section, loop through each subsection and perform
the logic described above, but instead only to open sections.
(WebInspector.VisualStyleDetailsPanel.prototype._generateSection.replaceDashWithCapital): Deleted.
(WebInspector.VisualStyleDetailsPanel.prototype._updateProperties):
Removed logic that was already being called by _sectionModified().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceBaseUtilitiesjs">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog (197078 => 197079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog 2016-02-25 10:00:32 UTC (rev 197078)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog 2016-02-25 10:02:13 UTC (rev 197079)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2016-02-20 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Visual Styles: Modifying background expands Font section
+ https://bugs.webkit.org/show_bug.cgi?id=154491
+ <rdar://problem/24755440>
+
+ Reviewed by Timothy Hatcher.
+
+ When the user selects a new style, the Visual sidebar examines the property
+ editors in each subsection to see if any have a value and expands/collapses
+ the subsection accordingly. This issue was happening because that logic was
+ also being triggered when the user didn't select a new style, which is
+ controlled by DOMNodeStyles and the significantChange value in refresh().
+
+ * UserInterface/Base/Utilities.js:
+ (String.prototype.toCamelCase):
+ Added utility function to transform a string into a camel-cased version.
+
+ * UserInterface/Models/DOMNodeStyles.js:
+ (WebInspector.DOMNodeStyles.prototype.refresh.fetchedComputedStyle):
+ Dropped unused variable and added checks to make sure doubly-matching styles
+ don't count as a significant change and cause refreshes of the styles sidebar.
+
+ * UserInterface/Views/VisualStyleDetailsPanel.js:
+ (WebInspector.VisualStyleDetailsPanel.prototype._updateSections):
+ If this function has an event, meaning it was triggered by a newly selected
+ selector in the selector section, loop through each subsection and perform
+ the logic described above, but instead only to open sections.
+
+ (WebInspector.VisualStyleDetailsPanel.prototype._generateSection.replaceDashWithCapital): Deleted.
+ (WebInspector.VisualStyleDetailsPanel.prototype._updateProperties):
+ Removed logic that was already being called by _sectionModified().
+
+2016-02-20 Devin Rousso <dcrousso+webkit@gmail.com>
+
</ins><span class="cx"> Web Inspector: Text Align segmented control blinks while editing other properties in Visual Styles sidebar
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154487
</span><span class="cx"> <rdar://problem/24754703>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Base/Utilities.js (197078 => 197079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-02-25 10:00:32 UTC (rev 197078)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-02-25 10:02:13 UTC (rev 197079)
</span><span class="lines">@@ -843,6 +843,14 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+Object.defineProperty(String.prototype, "toCamelCase",
+{
+ value: function()
+ {
+ return this.toLowerCase().replace(/[^\w]+(\w)/g, (match, group) => group.toUpperCase());
+ }
+});
+
</ins><span class="cx"> Object.defineProperty(Math, "roundTo",
</span><span class="cx"> {
</span><span class="cx"> value: function(num, step)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (197078 => 197079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2016-02-25 10:00:32 UTC (rev 197078)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2016-02-25 10:02:13 UTC (rev 197079)
</span><span class="lines">@@ -160,28 +160,42 @@
</span><span class="cx">
</span><span class="cx"> this._refreshPending = false;
</span><span class="cx">
</span><del>- var significantChange = this._previousSignificantChange || false;
- if (!significantChange) {
- for (var key in this._styleDeclarationsMap) {
- // Check if the same key exists in the previous map and has the same style objects.
- if (key in this._previousStyleDeclarationsMap && Object.shallowEqual(this._styleDeclarationsMap[key], this._previousStyleDeclarationsMap[key]))
</del><ins>+ let significantChange = false;
+ for (let key in this._styleDeclarationsMap) {
+ // Check if the same key exists in the previous map and has the same style objects.
+ if (key in this._previousStyleDeclarationsMap) {
+ if (Object.shallowEqual(this._styleDeclarationsMap[key], this._previousStyleDeclarationsMap[key]))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (!this._includeUserAgentRulesOnNextRefresh) {
- // We can assume all the styles with the same key are from the same stylesheet and rule, so we only check the first.
- var firstStyle = this._styleDeclarationsMap[key][0];
- if (firstStyle && firstStyle.ownerRule && firstStyle.ownerRule.type === WebInspector.CSSStyleSheet.Type.UserAgent) {
- // User Agent styles get different identifiers after some edits. This would cause us to fire a significant refreshed
- // event more than it is helpful. And since the user agent stylesheet is static it shouldn't match differently
- // between refreshes for the same node. This issue is tracked by: https://webkit.org/b/110055
- continue;
</del><ins>+ // Some styles have selectors such that they will match with the DOM node twice (for example "::before, ::after").
+ // In this case a second style for a second matching may be generated and added which will cause the shallowEqual
+ // to not return true, so in this case we just want to ensure that all the current styles existed previously.
+ let styleFound = false;
+ for (let style of this._styleDeclarationsMap[key]) {
+ if (this._previousStyleDeclarationsMap[key].includes(style)) {
+ styleFound = true;
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // This key is new or has different style objects than before. This is a significant change.
- significantChange = true;
- break;
</del><ins>+ if (styleFound)
+ continue;
</ins><span class="cx"> }
</span><ins>+
+ if (!this._includeUserAgentRulesOnNextRefresh) {
+ // We can assume all the styles with the same key are from the same stylesheet and rule, so we only check the first.
+ let firstStyle = this._styleDeclarationsMap[key][0];
+ if (firstStyle && firstStyle.ownerRule && firstStyle.ownerRule.type === WebInspector.CSSStyleSheet.Type.UserAgent) {
+ // User Agent styles get different identifiers after some edits. This would cause us to fire a significant refreshed
+ // event more than it is helpful. And since the user agent stylesheet is static it shouldn't match differently
+ // between refreshes for the same node. This issue is tracked by: https://webkit.org/b/110055
+ continue;
+ }
+ }
+
+ // This key is new or has different style objects than before. This is a significant change.
+ significantChange = true;
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!significantChange) {
</span><span class="lines">@@ -209,9 +223,6 @@
</span><span class="cx"> delete this._previousRulesMap;
</span><span class="cx"> delete this._previousStyleDeclarationsMap;
</span><span class="cx">
</span><del>- // Delete the previous saved significant change flag so we rescan for a significant change next time.
- delete this._previousSignificantChange;
-
</del><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMNodeStyles.Event.Refreshed, {significantChange});
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (197078 => 197079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2016-02-25 10:00:32 UTC (rev 197078)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2016-02-25 10:02:13 UTC (rev 197079)
</span><span class="lines">@@ -136,12 +136,8 @@
</span><span class="cx"> if (!id || !displayName)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- function replaceDashWithCapital(match) {
- return match.replace("-", "").toUpperCase();
- }
</del><ins>+ let camelCaseId = id.toCamelCase();
</ins><span class="cx">
</span><del>- let camelCaseId = id.replace(/-\b\w/g, replaceDashWithCapital);
-
</del><span class="cx"> function createOptionsElement() {
</span><span class="cx"> let container = document.createElement("div");
</span><span class="cx"> container.classList.add("visual-style-section-clear");
</span><span class="lines">@@ -178,12 +174,13 @@
</span><span class="cx"> let section = this._sections[key];
</span><span class="cx"> let oneSectionExpanded = false;
</span><span class="cx"> for (let group of section.groups) {
</span><del>- if (!group.collapsed) {
</del><ins>+ let camelCaseId = group.identifier.toCamelCase();
+ group.collapsed = !group.expandedByUser && !this._groupHasSetProperty(this._groups[camelCaseId]);
+ if (!group.collapsed)
</ins><span class="cx"> oneSectionExpanded = true;
</span><del>- break;
- }
</del><span class="cx"> }
</span><del>- section.collapsed = !oneSectionExpanded;
</del><ins>+ if (oneSectionExpanded)
+ section.collapsed = false;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -216,9 +213,6 @@
</span><span class="cx"> if (initialPropertyTextMissing)
</span><span class="cx"> initialTextList.set(group, initialPropertyText);
</span><span class="cx">
</span><del>- let groupHasSetProperty = this._groupHasSetProperty(group);
- group.section.collapsed = !groupHasSetProperty && !group.section.expandedByUser;
- group.section.element.classList.toggle("has-set-property", groupHasSetProperty);
</del><span class="cx"> this._sectionModified(group);
</span><span class="cx">
</span><span class="cx"> if (group.autocompleteCompatibleProperties) {
</span></span></pre>
</div>
</div>
</body>
</html>