Title: [228054] branches/safari-605-branch/Source/WebKit
- Revision
- 228054
- Author
- jmarc...@apple.com
- Date
- 2018-02-04 18:18:38 -0800 (Sun, 04 Feb 2018)
Log Message
Cherry-pick r227927. rdar://problem/37145549
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (228053 => 228054)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-02-05 02:18:37 UTC (rev 228053)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-02-05 02:18:38 UTC (rev 228054)
@@ -1,3 +1,22 @@
+2018-02-04 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r227927. rdar://problem/37145549
+
+ 2018-01-31 Tim Horton <timothy_hor...@apple.com>
+
+ Occasional null deref under WebPageProxy::updateBackingStoreDiscardableState()
+ https://bugs.webkit.org/show_bug.cgi?id=182349
+ <rdar://problem/27822258>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::updateBackingStoreDiscardableState):
+ m_drawingArea can be null during process launch and relaunch.
+
+ Cocoa ports don't use the result of setBackingStoreIsDiscardable(),
+ but they do run this code to keep it up to date.
+
2018-01-31 Jason Marcell <jmarc...@apple.com>
Cherry-pick r227941. rdar://problem/37092137
Modified: branches/safari-605-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (228053 => 228054)
--- branches/safari-605-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-02-05 02:18:37 UTC (rev 228053)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-02-05 02:18:38 UTC (rev 228054)
@@ -6284,6 +6284,9 @@
{
ASSERT(isValid());
+ if (!m_drawingArea)
+ return;
+
bool isDiscardable;
if (!m_process->isResponsive())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
