Title: [184934] trunk/Source/WebInspectorUI
- Revision
- 184934
- Author
- [email protected]
- Date
- 2015-05-27 18:51:41 -0700 (Wed, 27 May 2015)
Log Message
Web Inspector: Toggling an inherited property sometimes stops working
https://bugs.webkit.org/show_bug.cgi?id=145416
Patch by Joseph Pecoraro <[email protected]> on 2015-05-27
Reviewed by Timothy Hatcher.
* UserInterface/Models/DOMNodeStyles.js:
(WebInspector.DOMNodeStyles.prototype._parseStyleDeclarationPayload):
Ensure we update the existing model objects with the new state information
before possibly bailing. This may produce changed events that update
parts of the inspector appropriately.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (184933 => 184934)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-28 01:30:58 UTC (rev 184933)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-28 01:51:41 UTC (rev 184934)
@@ -1,5 +1,18 @@
2015-05-27 Joseph Pecoraro <[email protected]>
+ Web Inspector: Toggling an inherited property sometimes stops working
+ https://bugs.webkit.org/show_bug.cgi?id=145416
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/DOMNodeStyles.js:
+ (WebInspector.DOMNodeStyles.prototype._parseStyleDeclarationPayload):
+ Ensure we update the existing model objects with the new state information
+ before possibly bailing. This may produce changed events that update
+ parts of the inspector appropriately.
+
+2015-05-27 Joseph Pecoraro <[email protected]>
+
Web Inspector: REGRESSION(r179286) Editing Style Metrics Values no longer works
https://bugs.webkit.org/show_bug.cgi?id=143164
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (184933 => 184934)
--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-05-28 01:30:58 UTC (rev 184933)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-05-28 01:51:41 UTC (rev 184934)
@@ -644,9 +644,6 @@
properties.push(property);
}
- if (inherited && !inheritedPropertyCount)
- return null;
-
var styleSheetTextRange = this._parseSourceRangePayload(payload.range);
if (styleDeclaration) {
@@ -661,6 +658,9 @@
styleSheet.addEventListener(WebInspector.CSSStyleSheet.Event.ContentDidChange, this._styleSheetContentDidChange, this);
}
+ if (inherited && !inheritedPropertyCount)
+ return null;
+
styleDeclaration = new WebInspector.CSSStyleDeclaration(this, styleSheet, id, type, node, inherited, text, properties, styleSheetTextRange);
if (mapKey) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
