Changeset 278416 in webkit

Timestamp:

Jun 3, 2021, 12:59:29 PM (5 years ago)

Author:

Fujii Hironori

Message:

[Win] Remove unused GraphicsContext::shouldIncludeChildWindows()
​https://bugs.webkit.org/show_bug.cgi?id=226567

Reviewed by Don Olmstead.

Source/WebCore:

It was added by r40366 (Bug 23623) for Plugins. However, the
plugin support was removed by r278265 (Bug 226410).

• platform/graphics/GraphicsContext.h:

(WebCore::GraphicsContext::shouldIncludeChildWindows const): Deleted.

• platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
• platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:

(WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):

• platform/graphics/win/GraphicsContextPlatformPrivateDirect2D.h:
• platform/graphics/win/GraphicsContextWin.cpp:

(WebCore::GraphicsContext::setShouldIncludeChildWindows): Deleted.
(WebCore::GraphicsContext::shouldIncludeChildWindows const): Deleted.

Source/WebKitLegacy/win:

• WebFrame.cpp:

(WebFrame::paintDocumentRectToContext):
(WebFrame::paintScrollViewRectToContextAtPoint):
(WebFrame::spoolPages):

• WebView.cpp:

(WebView::updateBackingStore):
(WebView::paint):
(WebView::paintIntoBackingStore):

• WebView.h: Removed WindowsToPaint.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext.h (modified) (2 diffs)
• WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h (modified) (1 diff)
• WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h (modified) (2 diffs)
• WebCore/platform/graphics/win/GraphicsContextPlatformPrivateDirect2D.h (modified) (1 diff)
• WebCore/platform/graphics/win/GraphicsContextWin.cpp (modified) (1 diff)
• WebKitLegacy/win/ChangeLog (modified) (1 diff)
• WebKitLegacy/win/WebFrame.cpp (modified) (3 diffs)
• WebKitLegacy/win/WebView.cpp (modified) (8 diffs)
• WebKitLegacy/win/WebView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-03  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] Remove unused GraphicsContext::shouldIncludeChildWindows()
+        https://bugs.webkit.org/show_bug.cgi?id=226567
+
+        Reviewed by Don Olmstead.
+
+        It was added by r40366 (Bug 23623) for Plugins. However, the
+        plugin support was removed by r278265 (Bug 226410).
+
+        * platform/graphics/GraphicsContext.h:
+        (WebCore::GraphicsContext::shouldIncludeChildWindows const): Deleted.
+        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+        * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
+        (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):
+        * platform/graphics/win/GraphicsContextPlatformPrivateDirect2D.h:
+        * platform/graphics/win/GraphicsContextWin.cpp:
+        (WebCore::GraphicsContext::setShouldIncludeChildWindows): Deleted.
+        (WebCore::GraphicsContext::shouldIncludeChildWindows const): Deleted.
+
 2021-06-03  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -538 +538 @@
     // put code shared between Windows CG and Windows Cairo backends.
     virtual GraphicsContextPlatformPrivate* deprecatedPrivateContext() const { return nullptr; }
-#if PLATFORM(WIN)
-    // When set to true, child windows should be rendered into this context
-    // rather than allowing them just to render to the screen. Defaults to
-    // false.
-    // FIXME: This is a layering violation. GraphicsContext shouldn't know
-    // what a "window" is. It would be much more appropriate for this flag
-    // to be passed as a parameter alongside the GraphicsContext, but doing
-    // that would require lots of changes in cross-platform code that we
-    // aren't sure we want to make.
-    void setShouldIncludeChildWindows(bool);
-    bool shouldIncludeChildWindows() const;
+#endif // OS(WINDOWS)
 
 #if USE(DIRECT2D)
@@ -569 +559 @@
     ID2D1SolidColorBrush* brushWithColor(const Color&);
 #endif
-#else // PLATFORM(WIN)
-    bool shouldIncludeChildWindows() const { return false; }
-#endif // PLATFORM(WIN)
-#endif // OS(WINDOWS)
 
 private:

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h

@@ -68 +68 @@
     // NOTE: These may note be needed: review and remove once Cairo implementation is complete
     HDC m_hdc { 0 };
-    bool m_shouldIncludeChildWindows { false };
 #endif
 };

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h

@@ -46 +46 @@
 #if PLATFORM(WIN)
         , m_hdc(0)
-        , m_shouldIncludeChildWindows(false)
 #endif
         , m_userToDeviceTransformKnownToBeIdentity(false)
@@ -81 +80 @@
 
     HDC m_hdc;
-    bool m_shouldIncludeChildWindows;
 #endif
 

trunk/Source/WebCore/platform/graphics/win/GraphicsContextPlatformPrivateDirect2D.h

@@ -80 +80 @@
 
     HDC m_hdc { nullptr };
-    bool m_shouldIncludeChildWindows { false };
 
     float currentGlobalAlpha() const;

trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp

@@ -53 +53 @@
     memset(bmpInfo.bmBits, 0, bufferSize);
 }
-
-#if PLATFORM(WIN)
-void GraphicsContext::setShouldIncludeChildWindows(bool include)
-{
-    deprecatedPrivateContext()->m_shouldIncludeChildWindows = include;
-}
-
-bool GraphicsContext::shouldIncludeChildWindows() const
-{
-    return deprecatedPrivateContext()->m_shouldIncludeChildWindows;
-}
-#endif
 
 HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlphaBlend)

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2021-06-03  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] Remove unused GraphicsContext::shouldIncludeChildWindows()
+        https://bugs.webkit.org/show_bug.cgi?id=226567
+
+        Reviewed by Don Olmstead.
+
+        * WebFrame.cpp:
+        (WebFrame::paintDocumentRectToContext):
+        (WebFrame::paintScrollViewRectToContextAtPoint):
+        (WebFrame::spoolPages):
+        * WebView.cpp:
+        (WebView::updateBackingStore):
+        (WebView::paint):
+        (WebView::paintIntoBackingStore):
+        * WebView.h: Removed WindowsToPaint.
+
 2021-05-30  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKitLegacy/win/WebFrame.cpp

@@ -322 +322 @@
 
     GraphicsContextWin gc(deviceContext);
-    gc.setShouldIncludeChildWindows(true);
     gc.save();
     LONG width = rect.right - rect.left;
@@ -353 +352 @@
 
     GraphicsContextWin gc(deviceContext);
-    gc.setShouldIncludeChildWindows(true);
     gc.save();
     IntRect dirtyRect(rect);
@@ -1809 +1807 @@
 #if USE(CG) || USE(CAIRO)
     GraphicsContextWin spoolCtx(pctx);
-    spoolCtx.setShouldIncludeChildWindows(true);
 
     for (UINT ii = startPage; ii < endPage; ii++)

trunk/Source/WebKitLegacy/win/WebView.cpp

@@ -1131 +1131 @@
 }
 
-void WebView::updateBackingStore(FrameView* frameView, HDC dc, bool backingStoreCompletelyDirty, WindowsToPaint windowsToPaint)
+void WebView::updateBackingStore(FrameView* frameView, HDC dc, bool backingStoreCompletelyDirty)
 {
     ASSERT(!isAcceleratedCompositing());
@@ -1173 +1173 @@
 
         for (unsigned i = 0; i < paintRects.size(); ++i)
-            paintIntoBackingStore(frameView, bitmapDC, paintRects[i], windowsToPaint);
+            paintIntoBackingStore(frameView, bitmapDC, paintRects[i]);
 
         if (m_uiDelegatePrivate)
@@ -1305 +1305 @@
     int regionType = NULLREGION;
     PAINTSTRUCT ps;
-    WindowsToPaint windowsToPaint;
     if (!dc) {
         region = adoptGDIObject(::CreateRectRgn(0, 0, 0, 0));
@@ -1311 +1310 @@
         hdc = BeginPaint(m_viewWindow, &ps);
         rcPaint = ps.rcPaint;
-        // We're painting to the screen, and our child windows can handle
-        // painting themselves to the screen.
-        windowsToPaint = PaintWebViewOnly;
     } else {
         hdc = dc;
@@ -1319 +1315 @@
         if (options & PRF_ERASEBKGND)
             ::FillRect(hdc, &rcPaint, (HBRUSH)GetStockObject(WHITE_BRUSH));
-        // Since we aren't painting to the screen, we want to paint all our
-        // children into the HDC.
-        windowsToPaint = PaintWebViewAndChildren;
     }
 
@@ -1335 +1328 @@
 
     // Update our backing store if needed.
-    updateBackingStore(frameView, bitmapDC.get(), backingStoreCompletelyDirty, windowsToPaint);
+    updateBackingStore(frameView, bitmapDC.get(), backingStoreCompletelyDirty);
 
     // Now we blit the updated backing store
@@ -1371 +1364 @@
 }
 
-void WebView::paintIntoBackingStore(FrameView* frameView, HDC bitmapDC, const IntRect& dirtyRectPixels, WindowsToPaint windowsToPaint)
+void WebView::paintIntoBackingStore(FrameView* frameView, HDC bitmapDC, const IntRect& dirtyRectPixels)
 {
     // FIXME: This function should never be called in accelerated compositing mode, and we should
@@ -1408 +1401 @@
 
     GraphicsContextWin gc(bitmapDC, m_transparent);
-    gc.setShouldIncludeChildWindows(windowsToPaint == PaintWebViewAndChildren);
     gc.save();
     if (m_transparent)

trunk/Source/WebKitLegacy/win/WebView.h

@@ -551 +551 @@
     bool dpiChanged(float, const WebCore::IntSize&);
 
-    enum WindowsToPaint { PaintWebViewOnly, PaintWebViewAndChildren };
-    void paintIntoBackingStore(WebCore::FrameView*, HDC bitmapDC, const WebCore::IntRect& dirtyRect, WindowsToPaint);
-    void updateBackingStore(WebCore::FrameView*, HDC = 0, bool backingStoreCompletelyDirty = false, WindowsToPaint = PaintWebViewOnly);
+    void paintIntoBackingStore(WebCore::FrameView*, HDC bitmapDC, const WebCore::IntRect& dirtyRect);
+    void updateBackingStore(WebCore::FrameView*, HDC = 0, bool backingStoreCompletelyDirty = false);
 
     void performLayeredWindowUpdate();