Title: [194782] branches/safari-601-branch/Source/WebCore
- Revision
- 194782
- Author
- timo...@apple.com
- Date
- 2016-01-08 13:23:38 -0800 (Fri, 08 Jan 2016)
Log Message
<rdar://problem/24094651> REGRESSION (193350): CrashTracer: [USER] com.apple.WebKit.WebContent at …: Inspector::CSSFrontendDispatcher::styleSheetRemoved + 768
Reviewed by Joseph Pecoraro.
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::setActiveStyleSheetsForDocument):
Add null check before using m_frontendDispatcher.
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194781 => 194782)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-08 21:12:08 UTC (rev 194781)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-08 21:23:38 UTC (rev 194782)
@@ -1,3 +1,13 @@
+2016-01-08 Timothy Hatcher <timo...@apple.com>
+
+ <rdar://problem/24094651> REGRESSION (193350): CrashTracer: [USER] com.apple.WebKit.WebContent at …: Inspector::CSSFrontendDispatcher::styleSheetRemoved + 768
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::setActiveStyleSheetsForDocument):
+ Add null check before using m_frontendDispatcher.
+
2016-01-07 Matthew Hanson <matthew_han...@apple.com>
Fix the Mavericks build after r194287. rdar://problem/23769758
Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp (194781 => 194782)
--- branches/safari-601-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp 2016-01-08 21:12:08 UTC (rev 194781)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp 2016-01-08 21:23:38 UTC (rev 194782)
@@ -442,18 +442,22 @@
for (auto* cssStyleSheet : removedStyleSheets) {
previouslyKnownActiveStyleSheets.remove(cssStyleSheet);
+
RefPtr<InspectorStyleSheet> inspectorStyleSheet = m_cssStyleSheetToInspectorStyleSheet.get(cssStyleSheet);
if (m_idToInspectorStyleSheet.contains(inspectorStyleSheet->id())) {
String id = unbindStyleSheet(inspectorStyleSheet.get());
- m_frontendDispatcher->styleSheetRemoved(id);
+ if (m_frontendDispatcher)
+ m_frontendDispatcher->styleSheetRemoved(id);
}
}
for (auto* cssStyleSheet : addedStyleSheets) {
previouslyKnownActiveStyleSheets.add(cssStyleSheet);
+
if (!m_cssStyleSheetToInspectorStyleSheet.contains(cssStyleSheet)) {
InspectorStyleSheet* inspectorStyleSheet = bindStyleSheet(cssStyleSheet);
- m_frontendDispatcher->styleSheetAdded(inspectorStyleSheet->buildObjectForStyleSheetInfo());
+ if (m_frontendDispatcher)
+ m_frontendDispatcher->styleSheetAdded(inspectorStyleSheet->buildObjectForStyleSheetInfo());
}
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
