<!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>[179483] 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/179483">179483</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-02 12:07:02 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Extend CSS.getSupportedCSSProperties to provide values for properties for CSS Augmented JSContext
https://bugs.webkit.org/show_bug.cgi?id=141064
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-02-02
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/protocol/CSS.json:
Source/WebInspectorUI:
* UserInterface/Models/CSSCompletions.js:
* UserInterface/Models/CSSKeywordCompletions.js:
(WebInspector.CSSKeywordCompletions.addCustomCompletions):
(WebInspector.CSSKeywordCompletions.addPropertyCompletionValues):
If a property is specified with custom values, extend the
keyword completions map to make those values available
in autocompletion.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolCSSjson">trunk/Source/JavaScriptCore/inspector/protocol/CSS.json</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSCompletionsjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179482 => 179483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-02 20:05:37 UTC (rev 179482)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-02 20:07:02 UTC (rev 179483)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-02-02 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Extend CSS.getSupportedCSSProperties to provide values for properties for CSS Augmented JSContext
+ https://bugs.webkit.org/show_bug.cgi?id=141064
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/protocol/CSS.json:
+
</ins><span class="cx"> 2015-02-02 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] ASSERTION FAILED: m_scriptExecutionContext->isContextThread() in ContextDestructionObserver::observeContext
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolCSSjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/CSS.json (179482 => 179483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/CSS.json 2015-02-02 20:05:37 UTC (rev 179482)
+++ trunk/Source/JavaScriptCore/inspector/protocol/CSS.json 2015-02-02 20:07:02 UTC (rev 179483)
</span><span class="lines">@@ -148,7 +148,8 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "name", "type": "string", "description": "Property name." },
</span><del>- { "name": "longhands", "type": "array", "optional": true, "items": { "type": "string" }, "description": "Longhand property names." }
</del><ins>+ { "name": "longhands", "type": "array", "optional": true, "items": { "type": "string" }, "description": "Longhand property names." },
+ { "name": "values", "type": "array", "optional": true, "items": { "type": "string" }, "description": "Supported values for this property." }
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (179482 => 179483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-02-02 20:05:37 UTC (rev 179482)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-02-02 20:07:02 UTC (rev 179483)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-02 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Extend CSS.getSupportedCSSProperties to provide values for properties for CSS Augmented JSContext
+ https://bugs.webkit.org/show_bug.cgi?id=141064
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/CSSCompletions.js:
+ * UserInterface/Models/CSSKeywordCompletions.js:
+ (WebInspector.CSSKeywordCompletions.addCustomCompletions):
+ (WebInspector.CSSKeywordCompletions.addPropertyCompletionValues):
+ If a property is specified with custom values, extend the
+ keyword completions map to make those values available
+ in autocompletion.
+
</ins><span class="cx"> 2015-01-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remote Web Inspector should not show undock toolbar buttons
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSCompletionsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js (179482 => 179483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js 2015-02-02 20:05:37 UTC (rev 179482)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js 2015-02-02 20:07:02 UTC (rev 179483)
</span><span class="lines">@@ -86,6 +86,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSCompletions.cssNameCompletions = new WebInspector.CSSCompletions(names, false);
</span><span class="cx">
</span><ins>+ WebInspector.CSSKeywordCompletions.addCustomCompletions(names);
+
</ins><span class="cx"> // CodeMirror is not included by tests so we shouldn't assume it always exists.
</span><span class="cx"> // If it isn't available we skip MIME type associations.
</span><span class="cx"> if (!window.CodeMirror)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (179482 => 179483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-02-02 20:05:37 UTC (rev 179482)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-02-02 20:07:02 UTC (rev 179483)
</span><span class="lines">@@ -65,6 +65,35 @@
</span><span class="cx"> return WebInspector.CSSKeywordCompletions._colorAwareProperties[propertyName] === true;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.CSSKeywordCompletions.addCustomCompletions = function(properties)
+{
+ // COMPATIBILITY (iOS 6): This used to be an array of strings. They won't have custom values.
+ if (properties.length && typeof properties[0] === "string")
+ return;
+
+ for (var property of properties) {
+ if (property.values)
+ WebInspector.CSSKeywordCompletions.addPropertyCompletionValues(property.name, property.values);
+ }
+};
+
+WebInspector.CSSKeywordCompletions.addPropertyCompletionValues = function(propertyName, newValues)
+{
+ var existingValues = WebInspector.CSSKeywordCompletions._propertyKeywordMap[propertyName];
+ if (!existingValues) {
+ WebInspector.CSSKeywordCompletions._propertyKeywordMap[propertyName] = newValues;
+ return;
+ }
+
+ var union = new Set;
+ for (var value of existingValues)
+ union.add(value);
+ for (var value of newValues)
+ union.add(value);
+
+ WebInspector.CSSKeywordCompletions._propertyKeywordMap[propertyName] = [...union.values()];
+};
+
</ins><span class="cx"> WebInspector.CSSKeywordCompletions.AllPropertyNamesPlaceholder = "__all-properties__";
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSKeywordCompletions.InheritedProperties = [
</span></span></pre>
</div>
</div>
</body>
</html>