Attachment 368479 Details for Bug 197380 – Patch

[patch] Patch

bug-197380-20190429130804.patch (text/plain), 2.15 KB, created by Tim Horton on 2019-04-29 13:08:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2019-04-29 13:08:05 PDT

Size: 2.15 KB

patch

obsolete

>Subversion Revision: 244745
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 174107f700a4ff3a76d96807b6fc4123181159fc..061899c63c5f43153e0293cddda1fa0e917c0e76 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-04-29  Tim Horton  <timothy_horton@apple.com>
>+
>+        REGRESSION (r244142): Fandango accounts tab crashes under Color()
>+        https://bugs.webkit.org/show_bug.cgi?id=197380
>+        <rdar://problem/50186175>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (baseScrollViewBackgroundColor):
>+        We now call -_updateScrollViewBackground from -setBackgroundColor:.
>+        -setBackgroundColor: can be called from -[UIView initWithCoder:]; if it
>+        is, WKWebView's _page is not yet initialized, so we crash. Return an invalid color.
>+        Then, the caller falls back to WKContentView's backgroundColor. But WKContentView
>+        isn't initialized yet either. So add a further fallback.
>+
> 2019-04-29  Alexander Mikhaylenko  <exalm7659@gmail.com>
> 
>         [GTK] Back/forward gesture snapshot always times out
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 3442dc3b924b168bde2113d78f0c68f7410bce3e..fff5557385b93bd59a2ba4cd84506b159df695c1 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -1679,6 +1679,9 @@ static WebCore::Color baseScrollViewBackgroundColor(WKWebView *webView)
>             return color;
>     }
> 
>+    if (!webView->_page)
>+        return { };
>+
>     return webView->_page->pageExtendedBackgroundColor();
> }
> 
>@@ -1690,7 +1693,7 @@ static WebCore::Color scrollViewBackgroundColor(WKWebView *webView)
>     WebCore::Color color = baseScrollViewBackgroundColor(webView);
> 
>     if (!color.isValid())
>-        color = [webView->_contentView backgroundColor].CGColor;
>+        color = webView->_contentView ? [webView->_contentView backgroundColor].CGColor : UIColor.whiteColor.CGColor;
> 
>     CGFloat zoomScale = contentZoomScale(webView);
>     CGFloat minimumZoomScale = [webView->_scrollView minimumZoomScale];

Actions: View | Formatted Diff | Diff

Attachments on bug 197380: 368479