Changeset 248436 in webkit

Timestamp:

Aug 8, 2019 12:04:36 PM (5 years ago)

Author:

timothy@apple.com

Message:

Set WKWebView opaque based on drawsBackground in PageConfiguration.
​https://bugs.webkit.org/show_bug.cgi?id=200528

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]): Set self.opaque = NO when !self.opaque

!pageConfiguration->drawsBackground().

It is almost impossible to have !self.opaque be NO at this point, since we are still inside initWithFrame:. A subclass could
override opaque and return NO, but checking pageConfiguration's drawsBackground is a good alternative.

• WebProcess/WebPage/WebPage.h: Remove unused m_drawsBackground member.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-08  Timothy Hatcher  <timothy@apple.com>
+
+        Set WKWebView opaque based on drawsBackground in PageConfiguration.
+        https://bugs.webkit.org/show_bug.cgi?id=200528
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]): Set self.opaque = NO when !self.opaque || !pageConfiguration->drawsBackground().
+        It is almost impossible to have !self.opaque be NO at this point, since we are still inside initWithFrame:. A subclass could
+        override opaque and return NO, but checking pageConfiguration's drawsBackground is a good alternative.
+        * WebProcess/WebPage/WebPage.h: Remove unused m_drawsBackground member.
+
 2019-08-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -711 +711 @@
     _page = [_contentView page];
     [self _dispatchSetDeviceOrientation:deviceOrientation()];
-    if (!self.opaque)
-        _page->setBackgroundColor(WebCore::Color(WebCore::Color::transparent));
+
+    if (!self.opaque || !pageConfiguration->drawsBackground())
+        self.opaque = NO;
 
     [_contentView layer].anchorPoint = CGPointZero;

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -1632 +1632 @@
 
     bool m_useFixedLayout { false };
-    bool m_drawsBackground { true };
 
     WebCore::Color m_underlayColor;