Title: [195384] branches/safari-601-branch/Source/WebCore
- Revision
- 195384
- Author
- timo...@apple.com
- Date
- 2016-01-20 14:55:59 -0800 (Wed, 20 Jan 2016)
Log Message
<rdar://problem/24242600> CrashTracer: com.apple.WebKit.WebContent at …pector::CSSFrontendDispatcher::mediaQueryResultChanged + 316
Reviewed by Joseph Pecoraro.
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::willDestroyFrontendAndBackend): Call disable().
(WebCore::InspectorCSSAgent::mediaQueryResultChanged): Add null check.
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195383 => 195384)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-20 22:55:02 UTC (rev 195383)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-20 22:55:59 UTC (rev 195384)
@@ -1,3 +1,13 @@
+2016-01-20 Timothy Hatcher <timo...@apple.com>
+
+ <rdar://problem/24242600> CrashTracer: com.apple.WebKit.WebContent at …pector::CSSFrontendDispatcher::mediaQueryResultChanged + 316
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::willDestroyFrontendAndBackend): Call disable().
+ (WebCore::InspectorCSSAgent::mediaQueryResultChanged): Add null check.
+
2016-01-20 Matthew Hanson <matthew_han...@apple.com>
Merge r195066. rdar://problem/24154288
Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp (195383 => 195384)
--- branches/safari-601-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp 2016-01-20 22:55:02 UTC (rev 195383)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp 2016-01-20 22:55:59 UTC (rev 195384)
@@ -366,6 +366,9 @@
m_backendDispatcher = nullptr;
resetNonPersistentData();
+
+ String unused;
+ disable(unused);
}
void InspectorCSSAgent::discardAgent()
@@ -416,7 +419,8 @@
void InspectorCSSAgent::mediaQueryResultChanged()
{
- m_frontendDispatcher->mediaQueryResultChanged();
+ if (m_frontendDispatcher)
+ m_frontendDispatcher->mediaQueryResultChanged();
}
void InspectorCSSAgent::activeStyleSheetsUpdated(Document& document)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
