Attachment 359211 Details for Bug 193468 – Patch

[patch] Patch

bug-193468-20190115151518.patch (text/plain), 1.75 KB, created by Tim Horton on 2019-01-15 15:15:18 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2019-01-15 15:15:18 PST

Size: 1.75 KB

patch

obsolete

>Subversion Revision: 240006
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ed468613875f97d331c40759e67475f9c801cc3d..00b5dd798c7ca503976560545fb880ba950f7c1c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+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 NOBODY (OOPS!).
>+
>+        * 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-15  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix iOS build after r239993
>diff --git a/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm b/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
>index 83b6599270b51c7bb18efe737a592e02571a2806..083e96cc890bff02703ef5108f9f0b8726bc95df 100644
>--- a/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
>+++ b/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
>@@ -312,6 +312,9 @@ void TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded()
>     if (!m_shouldScaleViewToFitDocument)
>         return;
> 
>+    if (!m_webPage.mainFrameView()->renderView())
>+        return;
>+
>     LOG(Resize, "TiledCoreAnimationDrawingArea %p scaleViewToFitDocumentIfNeeded", this);
>     m_webPage.layoutIfNeeded();
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193468: 359211 | 359284 | 359286