Changeset 240374 in webkit

Timestamp:

Jan 23, 2019, 5:21:01 PM (8 years ago)

Author:

Alan Coon

Message:

Cherry-pick r240016. rdar://problem/47458249

Frequent null-deref under TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded()
​https://bugs.webkit.org/show_bug.cgi?id=193468
<rdar://problem/38645869>

Reviewed by Beth Dakin.

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm: (WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded): I'm not sure why this got *worse*, but we should null-check RenderView. It's OK to bail from scaleViewToFitDocumentIfNeeded, we'll re-do it the next time we paint (which will surely happen if we gain a RenderView).

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@240016 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (1 diff)

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

@@ +1 @@
+2019-01-23  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r240016. rdar://problem/47458249
+
+    Frequent null-deref under TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded()
+    https://bugs.webkit.org/show_bug.cgi?id=193468
+    <rdar://problem/38645869>
+    
+    Reviewed by Beth Dakin.
+    
+    * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+    (WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded):
+    I'm not sure why this got *worse*, but we should null-check RenderView.
+    It's OK to bail from scaleViewToFitDocumentIfNeeded, we'll re-do it
+    the next time we paint (which will surely happen if we gain a RenderView).
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240016 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-15  Tim Horton  <timothy_horton@apple.com>
+
+            Frequent null-deref under TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded()
+            https://bugs.webkit.org/show_bug.cgi?id=193468
+            <rdar://problem/38645869>
+
+            Reviewed by Beth Dakin.
+
+            * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+            (WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded):
+            I'm not sure why this got *worse*, but we should null-check RenderView.
+            It's OK to bail from scaleViewToFitDocumentIfNeeded, we'll re-do it
+            the next time we paint (which will surely happen if we gain a RenderView).
+
 2019-01-22  Alan Coon  <alancoon@apple.com>
 

branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -313 +313 @@
         return;
 
+    if (!m_webPage.mainFrameView()->renderView())
+        return;
+
     LOG(Resize, "TiledCoreAnimationDrawingArea %p scaleViewToFitDocumentIfNeeded", this);
     m_webPage.layoutIfNeeded();