Title: [222318] tags/Safari-605.1.7/Source/WebCore
- Revision
- 222318
- Author
- [email protected]
- Date
- 2017-09-21 07:32:10 -0700 (Thu, 21 Sep 2017)
Log Message
Cherry-pick r222314. rdar://problem/34559968
Modified Paths
Diff
Modified: tags/Safari-605.1.7/Source/WebCore/ChangeLog (222317 => 222318)
--- tags/Safari-605.1.7/Source/WebCore/ChangeLog 2017-09-21 13:43:28 UTC (rev 222317)
+++ tags/Safari-605.1.7/Source/WebCore/ChangeLog 2017-09-21 14:32:10 UTC (rev 222318)
@@ -1,3 +1,20 @@
+2017-09-21 Jason Marcell <[email protected]>
+
+ Cherry-pick r222314. rdar://problem/34559968
+
+ 2017-09-20 Antti Koivisto <[email protected]>
+
+ inspector/dom/content-node-region-info.html and inspector/dom/content-flow tests crashing
+ https://bugs.webkit.org/show_bug.cgi?id=177249
+ <rdar://problem/34559968>
+
+ Unreviewed.
+
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::getNamedFlowCollection):
+
+ Fix crashing by adding a few lines of removed code back.
+
2017-09-20 Miguel Gomez <[email protected]>
[GTK] Completely garbled display in GMail
Modified: tags/Safari-605.1.7/Source/WebCore/inspector/InspectorCSSAgent.cpp (222317 => 222318)
--- tags/Safari-605.1.7/Source/WebCore/inspector/InspectorCSSAgent.cpp 2017-09-21 13:43:28 UTC (rev 222317)
+++ tags/Safari-605.1.7/Source/WebCore/inspector/InspectorCSSAgent.cpp 2017-09-21 14:32:10 UTC (rev 222318)
@@ -777,8 +777,15 @@
element->document().styleScope().didChangeStyleSheetEnvironment();
}
-void InspectorCSSAgent::getNamedFlowCollection(ErrorString&, int, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>&)
+void InspectorCSSAgent::getNamedFlowCollection(ErrorString& errorString, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result)
{
+ Document* document = m_domAgent->assertDocument(errorString, documentNodeId);
+ if (!document)
+ return;
+
+ auto namedFlows = Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>::create();
+
+ result = WTFMove(namedFlows);
}
InspectorStyleSheetForInlineStyle& InspectorCSSAgent::asInspectorStyleSheet(StyledElement& element)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
