Changeset 85794 in webkit

Timestamp:

May 4, 2011 3:20:45 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-04 Anders Carlsson <​andersca@apple.com>

Reviewed by Adam Roben.

WKView on Windows has no equivalent of Mac's -[WKView setDraws[Transparent]Background:]
​https://bugs.webkit.org/show_bug.cgi?id=52009
<rdar://problem/8829746>

Add and implement WKViewSetDrawsTransparentBackground on windows.

• UIProcess/API/C/win/WKView.cpp: (WKViewSetDrawsTransparentBackground): (WKViewDrawsTransparentBackground): Call through to the WebPageProxy object.

• UIProcess/API/C/win/WKView.h:
• UIProcess/win/WebView.cpp: (WebKit::drawPageBackground): Don't fill the rect with white if WebPageProxy::drawsBackground() or WebPageProxy::drawsTransparentBackground() returns false. Because of limitations in Win32, both drawsBackground and drawsTransparentBackground are pretty much equivalent.

(WebKit::WebView::paint):
Pass the WebPageProxy object to drawPageBackground.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/win/WKView.cpp (modified) (1 diff)
• UIProcess/API/C/win/WKView.h (modified) (1 diff)
• UIProcess/win/WebView.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-04  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        WKView on Windows has no equivalent of Mac's -[WKView setDraws[Transparent]Background:]
+        https://bugs.webkit.org/show_bug.cgi?id=52009
+        <rdar://problem/8829746>
+
+        Add and implement WKViewSetDrawsTransparentBackground on windows.
+
+        * UIProcess/API/C/win/WKView.cpp:
+        (WKViewSetDrawsTransparentBackground):
+        (WKViewDrawsTransparentBackground):
+        Call through to the WebPageProxy object.
+
+        * UIProcess/API/C/win/WKView.h:
+        * UIProcess/win/WebView.cpp:
+        (WebKit::drawPageBackground):
+        Don't fill the rect with white if WebPageProxy::drawsBackground() or 
+        WebPageProxy::drawsTransparentBackground() returns false. Because of limitations in Win32,
+        both drawsBackground and drawsTransparentBackground are pretty much equivalent.
+
+        (WebKit::WebView::paint):
+        Pass the WebPageProxy object to drawPageBackground.
+
 2011-05-04  Tao Bai  <michaelbai@chromium.org>
 

trunk/Source/WebKit2/UIProcess/API/C/win/WKView.cpp

@@ -104 +104 @@
     toImpl(viewRef)->unapplyEditCommand(toImpl(command));
 }
+
+void WKViewSetDrawsTransparentBackground(WKViewRef viewRef, bool drawsTransparentBackground)
+{
+    toImpl(viewRef)->page()->setDrawsTransparentBackground(drawsTransparentBackground);
+}
+
+bool WKViewDrawsTransparentBackground(WKViewRef viewRef)
+{
+    return toImpl(viewRef)->page()->drawsTransparentBackground();
+}
+

trunk/Source/WebKit2/UIProcess/API/C/win/WKView.h

@@ -79 +79 @@
 WK_EXPORT WKViewFindIndicatorCallback WKViewGetFindIndicatorCallback(WKViewRef view, void** context);
 
+WK_EXPORT void WKViewSetDrawsTransparentBackground(WKViewRef view, bool drawsTransparentBackground);
+WK_EXPORT bool WKViewDrawsTransparentBackground(WKViewRef view);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/UIProcess/win/WebView.cpp

@@ -634 +634 @@
 }
 
-static void drawPageBackground(HDC dc, const RECT& rect)
-{
-    // Mac checks WebPageProxy::drawsBackground and
-    // WebPageProxy::drawsTransparentBackground here, but those are always false on
-    // Windows currently (see <http://webkit.org/b/52009>).
+static void drawPageBackground(HDC dc, const WebPageProxy* page, const RECT& rect)
+{
+    if (!page->drawsBackground() || page->drawsTransparentBackground())
+        return;
+
     ::FillRect(dc, &rect, reinterpret_cast<HBRUSH>(COLOR_WINDOW + 1));
 }
@@ -654 +654 @@
             for (size_t i = 0; i < unpaintedRects.size(); ++i) {
                 RECT winRect = unpaintedRects[i];
-                drawPageBackground(hdc, unpaintedRects[i]);
+                drawPageBackground(hdc, m_page.get(), unpaintedRects[i]);
             }
         } else
-            drawPageBackground(hdc, dirtyRect);
+            drawPageBackground(hdc, m_page.get(), dirtyRect);
 
         m_page->didDraw();
@@ -664 +664 @@
             m_page->didDraw();
         else
-            drawPageBackground(hdc, dirtyRect);
+            drawPageBackground(hdc, m_page.get(), dirtyRect);
     }
 }