Title: [240374] branches/safari-607-branch/Source/WebKit
- Revision
- 240374
- Author
- [email protected]
- Date
- 2019-01-23 17:21:01 -0800 (Wed, 23 Jan 2019)
Log 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
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (240373 => 240374)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-24 01:20:59 UTC (rev 240373)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-24 01:21:01 UTC (rev 240374)
@@ -1,3 +1,36 @@
+2019-01-23 Alan Coon <[email protected]>
+
+ 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 <[email protected]>
+
+ 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 <[email protected]>
Cherry-pick r240055. rdar://problem/47099573
Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (240373 => 240374)
--- branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2019-01-24 01:20:59 UTC (rev 240373)
+++ branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2019-01-24 01:21:01 UTC (rev 240374)
@@ -312,6 +312,9 @@
if (!m_shouldScaleViewToFitDocument)
return;
+ if (!m_webPage.mainFrameView()->renderView())
+ return;
+
LOG(Resize, "TiledCoreAnimationDrawingArea %p scaleViewToFitDocumentIfNeeded", this);
m_webPage.layoutIfNeeded();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
