Changeset 228054 in webkit

Timestamp:

Feb 4, 2018 6:18:38 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r227927. rdar://problem/37145549

Location:

branches/safari-605-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

branches/safari-605-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2018-02-04  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r227927. rdar://problem/37145549
+
+    2018-01-31  Tim Horton  <timothy_horton@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  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -6285 +6285 @@
     ASSERT(isValid());
 
+    if (!m_drawingArea)
+        return;
+
     bool isDiscardable;