Changeset 225859 in webkit

Timestamp:

Dec 13, 2017 11:26:08 AM (6 years ago)

Author:

Simon Fraser

Message:

Fix crash under Document::visualUpdatesSuppressionTimerFired()
​https://bugs.webkit.org/show_bug.cgi?id=180758
Document::visualUpdatesSuppressionTimerFired

Reviewed by Zalan Bujtas.

Speculative fix for crash under visualUpdatesSuppressionTimerFired() where view()
can be null. Add null checks for the view() in all code called from this function.

• dom/Document.cpp:

(WebCore::Document::setVisualUpdatesAllowed):
(WebCore::Document::visualUpdatesSuppressionTimerFired):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-13  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix crash under Document::visualUpdatesSuppressionTimerFired()
+        https://bugs.webkit.org/show_bug.cgi?id=180758
+        Document::visualUpdatesSuppressionTimerFired
+
+        Reviewed by Zalan Bujtas.
+
+        Speculative fix for crash under visualUpdatesSuppressionTimerFired() where view()
+        can be null. Add null checks for the view() in all code called from this function.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setVisualUpdatesAllowed):
+        (WebCore::Document::visualUpdatesSuppressionTimerFired):
+
 2017-12-13  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1235 +1235 @@
             ASSERT(!m_visualUpdatesAllowed);
 
-            if (!view()->visualUpdatesAllowedByClient())
+            if (view() && !view()->visualUpdatesAllowedByClient())
                 return;
 
@@ -1273 +1273 @@
     }
 
-    if (view())
-        view()->updateCompositingLayersAfterLayout();
+    if (frameView)
+        frameView->updateCompositingLayersAfterLayout();
 
     if (RenderView* renderView = this->renderView())
@@ -1289 +1289 @@
     // If the client is extending the visual update suppression period explicitly, the
     // watchdog should not re-enable visual updates itself, but should wait for the client.
-    if (!view()->visualUpdatesAllowedByClient())
+    if (view() && !view()->visualUpdatesAllowedByClient())
         return;