Title: [210650] branches/safari-603-branch/Source/WebCore
- Revision
- 210650
- Author
- [email protected]
- Date
- 2017-01-12 08:45:34 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210472. rdar://problem/29767412
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210649 => 210650)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:45:32 UTC (rev 210649)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:45:34 UTC (rev 210650)
@@ -1,5 +1,23 @@
2017-01-12 Matthew Hanson <[email protected]>
+ Merge r210472. rdar://problem/29767412
+
+ 2017-01-06 Joseph Pecoraro <[email protected]>
+
+ REGRESSION(r208886) Web Inspector: Toggling CSS Properties in Styles Sidebar (comment / uncomment)
+ https://bugs.webkit.org/show_bug.cgi?id=166786
+ <rdar://problem/29767412>
+
+ Reviewed by Brian Burg.
+
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyle::populateAllProperties):
+ Match earlier behavior and don't send the frontend information about
+ disabled (commented out) properties. Follow-up later to send this
+ information when implementing proper handling of them in the frontend.
+
+2017-01-12 Matthew Hanson <[email protected]>
+
Merge r210468. rdar://problem/29859121
2017-01-06 Chris Dumez <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp (210649 => 210650)
--- branches/safari-603-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2017-01-12 16:45:32 UTC (rev 210649)
+++ branches/safari-603-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2017-01-12 16:45:34 UTC (rev 210650)
@@ -604,6 +604,9 @@
ASSERT(!styleDeclarationOrException.hasException());
String styleDeclaration = styleDeclarationOrException.hasException() ? emptyString() : styleDeclarationOrException.releaseReturnValue();
for (auto& sourceData : *sourcePropertyData) {
+ // FIXME: <https://webkit.org/b/166787> Web Inspector: Frontend should be made to expect and handle disabled properties
+ if (sourceData.disabled)
+ continue;
InspectorStyleProperty p(sourceData, true, sourceData.disabled);
p.setRawTextFromStyleDeclaration(styleDeclaration);
result->append(p);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
