Changeset 248457 in webkit

Timestamp:

Aug 8, 2019, 10:01:15 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r248436. rdar://problem/54093232

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.

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

Location:

branches/safari-608.1-branch/Source/WebKit

Files:

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

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

@@ +1 @@
+2019-08-08  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r248436. rdar://problem/54093232
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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  Alan Coon  <alancoon@apple.com>
 

branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -706 +706 @@
     _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;

branches/safari-608.1-branch/Source/WebKit/WebProcess/WebPage/WebPage.h

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