<!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>[200629] trunk/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/200629">200629</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-10 10:42:58 -0700 (Tue, 10 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Cleanup super getter/setter now that underlying issue is fixed
https://bugs.webkit.org/show_bug.cgi?id=157488
<rdar://problem/26179120>
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-05-10
Reviewed by Brian Burg.
Addressed FIXMEs for bug 147064:
<https://webkit.org/b/147064> Getter and setter on super are called with wrong "this" object
* UserInterface/Views/VisualStyleKeywordPicker.js:
(WebInspector.VisualStyleKeywordPicker.prototype.get value):
(WebInspector.VisualStyleKeywordPicker.prototype.set value):
(WebInspector.VisualStyleKeywordPicker.prototype.get synthesizedValue):
(WebInspector.VisualStyleKeywordPicker.prototype._getValue): Deleted.
(WebInspector.VisualStyleKeywordPicker.prototype._setValue): Deleted.
(WebInspector.VisualStyleKeywordPicker.prototype._generateSynthesizedValue): Deleted.
* UserInterface/Views/VisualStyleNumberInputBox.js:
(WebInspector.VisualStyleNumberInputBox.prototype.set specialPropertyPlaceholderElementText):
* UserInterface/Views/VisualStyleTimingEditor.js:
(WebInspector.VisualStyleTimingEditor.prototype.get value):
(WebInspector.VisualStyleTimingEditor.prototype.set value):
(WebInspector.VisualStyleTimingEditor.prototype.get synthesizedValue):
(WebInspector.VisualStyleTimingEditor.prototype._getValue): Deleted.
(WebInspector.VisualStyleTimingEditor.prototype._setValue): Deleted.
(WebInspector.VisualStyleTimingEditor.prototype._generateSynthesizedValue): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleKeywordPickerjs">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordPicker.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleNumberInputBoxjs">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleTimingEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleTimingEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (200628 => 200629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-10 17:32:52 UTC (rev 200628)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-10 17:42:58 UTC (rev 200629)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-05-10 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Cleanup super getter/setter now that underlying issue is fixed
+ https://bugs.webkit.org/show_bug.cgi?id=157488
+ <rdar://problem/26179120>
+
+ Reviewed by Brian Burg.
+
+ Addressed FIXMEs for bug 147064:
+ <https://webkit.org/b/147064> Getter and setter on super are called with wrong "this" object
+
+ * UserInterface/Views/VisualStyleKeywordPicker.js:
+ (WebInspector.VisualStyleKeywordPicker.prototype.get value):
+ (WebInspector.VisualStyleKeywordPicker.prototype.set value):
+ (WebInspector.VisualStyleKeywordPicker.prototype.get synthesizedValue):
+ (WebInspector.VisualStyleKeywordPicker.prototype._getValue): Deleted.
+ (WebInspector.VisualStyleKeywordPicker.prototype._setValue): Deleted.
+ (WebInspector.VisualStyleKeywordPicker.prototype._generateSynthesizedValue): Deleted.
+
+ * UserInterface/Views/VisualStyleNumberInputBox.js:
+ (WebInspector.VisualStyleNumberInputBox.prototype.set specialPropertyPlaceholderElementText):
+
+ * UserInterface/Views/VisualStyleTimingEditor.js:
+ (WebInspector.VisualStyleTimingEditor.prototype.get value):
+ (WebInspector.VisualStyleTimingEditor.prototype.set value):
+ (WebInspector.VisualStyleTimingEditor.prototype.get synthesizedValue):
+ (WebInspector.VisualStyleTimingEditor.prototype._getValue): Deleted.
+ (WebInspector.VisualStyleTimingEditor.prototype._setValue): Deleted.
+ (WebInspector.VisualStyleTimingEditor.prototype._generateSynthesizedValue): Deleted.
+
</ins><span class="cx"> 2016-05-09 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Filtering by Errors/Warnings should not filter Breakpoints list
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleKeywordPickerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordPicker.js (200628 => 200629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordPicker.js 2016-05-10 17:32:52 UTC (rev 200628)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordPicker.js 2016-05-10 17:42:58 UTC (rev 200629)
</span><span class="lines">@@ -49,18 +49,31 @@
</span><span class="cx"> this.contentElement.appendChild(this._keywordSelectElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Public
</del><ins>+ // Protected
</ins><span class="cx">
</span><span class="cx"> get value()
</span><span class="cx"> {
</span><del>- // FIXME: <https://webkit.org/b/147064> Getter and setter on super are called with wrong "this" object
- return this._getValue();
</del><ins>+ return this._keywordSelectElement.value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set value(value)
</span><span class="cx"> {
</span><del>- // FIXME: <https://webkit.org/b/147064> Getter and setter on super are called with wrong "this" object
- this._setValue(value);
</del><ins>+ if (!value || !value.length) {
+ this._unchangedOptionElement.selected = true;
+ this.specialPropertyPlaceholderElement.hidden = false;
+ return;
+ }
+
+ if (this._propertyMissing || !this.valueIsSupportedKeyword(value))
+ return;
+
+ if (value === this._keywordSelectElement.value)
+ return;
+
+ if (this._valueIsSupportedAdvancedKeyword(value))
+ this._addAdvancedValues();
+
+ this._keywordSelectElement.value = value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set placeholder(placeholder)
</span><span class="lines">@@ -73,8 +86,7 @@
</span><span class="cx">
</span><span class="cx"> get synthesizedValue()
</span><span class="cx"> {
</span><del>- // FIXME: <https://webkit.org/b/147064> Getter and setter on super are called with wrong "this" object
- return this._generateSynthesizedValue();
</del><ins>+ return this._unchangedOptionElement.selected ? null : this._keywordSelectElement.value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateEditorValues(updatedValues)
</span><span class="lines">@@ -89,36 +101,6 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _getValue()
- {
- return this._keywordSelectElement.value;
- }
-
- _setValue(value)
- {
- if (!value || !value.length) {
- this._unchangedOptionElement.selected = true;
- this.specialPropertyPlaceholderElement.hidden = false;
- return;
- }
-
- if (this._propertyMissing || !this.valueIsSupportedKeyword(value))
- return;
-
- if (value === this._keywordSelectElement.value)
- return;
-
- if (this._valueIsSupportedAdvancedKeyword(value))
- this._addAdvancedValues();
-
- this._keywordSelectElement.value = value;
- }
-
- _generateSynthesizedValue()
- {
- return this._unchangedOptionElement.selected ? null : this._keywordSelectElement.value;
- }
-
</del><span class="cx"> _handleKeywordChanged()
</span><span class="cx"> {
</span><span class="cx"> this._valueDidChange();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleNumberInputBoxjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js (200628 => 200629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js 2016-05-10 17:32:52 UTC (rev 200628)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js 2016-05-10 17:42:58 UTC (rev 200629)
</span><span class="lines">@@ -215,8 +215,7 @@
</span><span class="cx"> {
</span><span class="cx"> this._unchangedOptionElement.selected = true;
</span><span class="cx">
</span><del>- // FIXME: <https://webkit.org/b/147064> Getter and setter on super are called with wrong "this" object
- WebInspector.VisualStylePropertyEditor.prototype.__lookupSetter__("specialPropertyPlaceholderElementText").call(this, text);
</del><ins>+ super.specialPropertyPlaceholderElementText = text;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> parseValue(text)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleTimingEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleTimingEditor.js (200628 => 200629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleTimingEditor.js 2016-05-10 17:32:52 UTC (rev 200628)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleTimingEditor.js 2016-05-10 17:42:58 UTC (rev 200629)
</span><span class="lines">@@ -41,13 +41,8 @@
</span><span class="cx"> this.contentElement.appendChild(this._bezierSwatch.element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Protected
</del><ins>+ // Public
</ins><span class="cx">
</span><del>- parseValue(text)
- {
- return /(cubic-bezier\(.+\))/.exec(text);
- }
-
</del><span class="cx"> get bezierValue()
</span><span class="cx"> {
</span><span class="cx"> let bezier = this._bezierSwatch.value;
</span><span class="lines">@@ -63,18 +58,18 @@
</span><span class="cx"> this._bezierSwatch.value = bezier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Private
</del><ins>+ // Protected
</ins><span class="cx">
</span><del>- _getValue()
</del><ins>+ get value()
</ins><span class="cx"> {
</span><del>- return this._customValueOptionElement.selected ? this.bezierValue : super._getValue();
</del><ins>+ return this._customValueOptionElement.selected ? this.bezierValue : super.value;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _setValue(value)
</del><ins>+ set value(value)
</ins><span class="cx"> {
</span><span class="cx"> this.bezierValue = value;
</span><span class="cx"> if (this.valueIsSupportedKeyword(value)) {
</span><del>- super._setValue(value);
</del><ins>+ super.value = value;
</ins><span class="cx"> this.contentElement.classList.remove("bezier-value");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -84,14 +79,21 @@
</span><span class="cx"> this.contentElement.classList.toggle("bezier-value", !!bezier);
</span><span class="cx"> this.specialPropertyPlaceholderElement.hidden = !!bezier;
</span><span class="cx"> if (!bezier)
</span><del>- super._setValue(value);
</del><ins>+ super.value = value;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _generateSynthesizedValue()
</del><ins>+ get synthesizedValue()
</ins><span class="cx"> {
</span><del>- return this._customValueOptionElement.selected ? this.bezierValue : super._generateSynthesizedValue();
</del><ins>+ return this._customValueOptionElement.selected ? this.bezierValue : super.synthesizedValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ parseValue(text)
+ {
+ return /(cubic-bezier\(.+\))/.exec(text);
+ }
+
+ // Private
+
</ins><span class="cx"> _handleKeywordChanged()
</span><span class="cx"> {
</span><span class="cx"> super._handleKeywordChanged();
</span></span></pre>
</div>
</div>
</body>
</html>