<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[287913] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/287913">287913</a></dd>
<dt>Author</dt> <dd>Hironori.Fujii@sony.com</dd>
<dt>Date</dt> <dd>2022-01-11 23:55:30 -0800 (Tue, 11 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove Direct2D code (part 2)
https://bugs.webkit.org/show_bug.cgi?id=235097

Reviewed by Yusuke Suzuki.

.:

* Source/cmake/OptionsAppleWin.cmake:

Source/WebCore:

* platform/graphics/Color.h:
* platform/graphics/win/FontCacheWin.cpp:
(WebCore::createGDIFont):
(WebCore::FontCache::createFontPlatformData):
* platform/graphics/win/FontPlatformDataWin.cpp:
* platform/image-decoders/ScalableImageDecoder.cpp:
(WebCore::ScalableImageDecoder::setTargetContext): Deleted.
* platform/image-decoders/ScalableImageDecoder.h:

Source/WebCore/PAL:

* pal/PlatformAppleWin.cmake:

Source/WebKit:

* UIProcess/BackingStore.h:
(): Deleted.
* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp:
(WebKit::DrawingAreaProxyCoordinatedGraphics::sizeDidChange):
(WebKit::DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange):
* UIProcess/win/PageClientImpl.cpp:
* UIProcess/win/WebView.cpp:
(WebKit::WebView::paint):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalPlatformAppleWincmake">trunk/Source/WebCore/PAL/pal/PlatformAppleWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCacheWincpp">trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontPlatformDataWincpp">trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersScalableImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersScalableImageDecoderh">trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessBackingStoreh">trunk/Source/WebKit/UIProcess/BackingStore.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessCoordinatedGraphicsDrawingAreaProxyCoordinatedGraphicscpp">trunk/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcesswinPageClientImplcpp">trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcesswinWebViewcpp">trunk/Source/WebKit/UIProcess/win/WebView.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsAppleWincmake">trunk/Source/cmake/OptionsAppleWin.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog  2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/ChangeLog     2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2022-01-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Remove Direct2D code (part 2)
+        https://bugs.webkit.org/show_bug.cgi?id=235097
+
+        Reviewed by Yusuke Suzuki.
+
+        * Source/cmake/OptionsAppleWin.cmake:
+
</ins><span class="cx"> 2022-01-10  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Start using C++20
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebCore/ChangeLog      2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2022-01-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Remove Direct2D code (part 2)
+        https://bugs.webkit.org/show_bug.cgi?id=235097
+
+        Reviewed by Yusuke Suzuki.
+
+        * platform/graphics/Color.h:
+        * platform/graphics/win/FontCacheWin.cpp:
+        (WebCore::createGDIFont):
+        (WebCore::FontCache::createFontPlatformData):
+        * platform/graphics/win/FontPlatformDataWin.cpp:
+        * platform/image-decoders/ScalableImageDecoder.cpp:
+        (WebCore::ScalableImageDecoder::setTargetContext): Deleted.
+        * platform/image-decoders/ScalableImageDecoder.h:
+
</ins><span class="cx"> 2022-01-11  Said Abou-Hallawa  <said@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [GPU Process] Make SVG resources create remote ImageBuffers for their drawing
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebCore/PAL/ChangeLog  2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2022-01-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Remove Direct2D code (part 2)
+        https://bugs.webkit.org/show_bug.cgi?id=235097
+
+        Reviewed by Yusuke Suzuki.
+
+        * pal/PlatformAppleWin.cmake:
+
</ins><span class="cx"> 2022-01-10  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add support for a -shouldWrap property when injecting Live Text
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalPlatformAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/PlatformAppleWin.cmake (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/PlatformAppleWin.cmake      2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebCore/PAL/pal/PlatformAppleWin.cmake 2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -14,17 +14,14 @@
</span><span class="cx">     spi/win/CoreTextSPIWin.h
</span><span class="cx"> )
</span><span class="cx"> 
</span><del>-if (${USE_DIRECT2D})
-else ()
-    list(APPEND PAL_PUBLIC_HEADERS
-        spi/cg/CoreGraphicsSPI.h
-        spi/cg/ImageIOSPI.h
-    )
</del><ins>+list(APPEND PAL_PUBLIC_HEADERS
+    spi/cg/CoreGraphicsSPI.h
+    spi/cg/ImageIOSPI.h
+)
</ins><span class="cx"> 
</span><del>-    list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
-        "${PAL_DIR}/pal/spi/cg"
-    )
-endif ()
</del><ins>+list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
+    "${PAL_DIR}/pal/spi/cg"
+)
</ins><span class="cx"> 
</span><span class="cx"> list(APPEND PAL_SOURCES
</span><span class="cx">     avfoundation/MediaTimeAVFoundation.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h   2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebCore/platform/graphics/Color.h      2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -42,15 +42,6 @@
</span><span class="cx"> typedef struct CGColor* CGColorRef;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(WIN)
-struct _D3DCOLORVALUE;
-typedef _D3DCOLORVALUE D3DCOLORVALUE;
-typedef D3DCOLORVALUE D2D_COLOR_F;
-typedef D2D_COLOR_F D2D1_COLOR_F;
-struct D2D_VECTOR_4F;
-typedef D2D_VECTOR_4F D2D1_VECTOR_4F;
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> typedef struct _GdkRGBA GdkRGBA;
</span><span class="cx"> #endif
</span><span class="lines">@@ -148,12 +139,6 @@
</span><span class="cx">     WEBCORE_EXPORT static Color createAndPreserveColorSpace(CGColorRef, OptionSet<Flags> = { });
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(WIN)
-    WEBCORE_EXPORT Color(D2D1_COLOR_F);
-    WEBCORE_EXPORT operator D2D1_COLOR_F() const;
-    WEBCORE_EXPORT operator D2D1_VECTOR_4F() const;
-#endif
-
</del><span class="cx">     static constexpr auto transparentBlack = SRGBA<uint8_t> { };
</span><span class="cx">     static constexpr auto black = SRGBA<uint8_t> { 0, 0, 0 };
</span><span class="cx">     static constexpr auto white = SRGBA<uint8_t> { 255, 255, 255 };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCacheWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp      2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -46,10 +46,6 @@
</span><span class="cx"> #include <pal/spi/cg/CoreGraphicsSPI.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if USE(DIRECT2D)
-#include <dwrite_3.h>
-#endif
-
</del><span class="cx"> using std::min;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore
</span><span class="lines">@@ -539,7 +535,7 @@
</span><span class="cx">     matchData.m_chosen.lfUnderline = false;
</span><span class="cx">     matchData.m_chosen.lfStrikeOut = false;
</span><span class="cx">     matchData.m_chosen.lfCharSet = DEFAULT_CHARSET;
</span><del>-#if USE(CG) || USE(CAIRO) || USE(DIRECT2D)
</del><ins>+#if USE(CG) || USE(CAIRO)
</ins><span class="cx">     matchData.m_chosen.lfOutPrecision = OUT_TT_ONLY_PRECIS;
</span><span class="cx"> #else
</span><span class="cx">     matchData.m_chosen.lfOutPrecision = OUT_TT_PRECIS;
</span><span class="lines">@@ -679,8 +675,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(CG)
</span><span class="cx">     bool fontCreationFailed = !result->cgFont();
</span><del>-#elif USE(DIRECT2D)
-    bool fontCreationFailed = !result->dwFont();
</del><span class="cx"> #elif USE(CAIRO)
</span><span class="cx">     bool fontCreationFailed = !result->scaledFont();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontPlatformDataWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp       2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp  2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -33,10 +33,6 @@
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> 
</span><del>-#if USE(DIRECT2D)
-#include <dwrite_3.h>
-#endif
-
</del><span class="cx"> using std::min;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersScalableImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp    2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp       2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -251,11 +251,4 @@
</span><span class="cx">     return buffer->backingStore()->image();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if USE(DIRECT2D)
-void ScalableImageDecoder::setTargetContext(ID2D1RenderTarget*)
-{
-    notImplemented();
</del><span class="cx"> }
</span><del>-#endif
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersScalableImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.h (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.h      2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebCore/platform/image-decoders/ScalableImageDecoder.h 2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -204,10 +204,6 @@
</span><span class="cx"> private:
</span><span class="cx">     virtual void tryDecodeSize(bool) = 0;
</span><span class="cx"> 
</span><del>-#if USE(DIRECT2D)
-    void setTargetContext(ID2D1RenderTarget*) override;
-#endif
-
</del><span class="cx">     IntSize m_size;
</span><span class="cx">     EncodedDataStatus m_encodedDataStatus { EncodedDataStatus::TypeAvailable };
</span><span class="cx">     bool m_decodingSizeFromSetData { false };
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebKit/ChangeLog       2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2022-01-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Remove Direct2D code (part 2)
+        https://bugs.webkit.org/show_bug.cgi?id=235097
+
+        Reviewed by Yusuke Suzuki.
+
+        * UIProcess/BackingStore.h:
+        (): Deleted.
+        * UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp:
+        (WebKit::DrawingAreaProxyCoordinatedGraphics::sizeDidChange):
+        (WebKit::DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange):
+        * UIProcess/win/PageClientImpl.cpp:
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::paint):
+
</ins><span class="cx"> 2022-01-11  Said Abou-Hallawa  <said@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [GPU Process] Make SVG resources create remote ImageBuffers for their drawing
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/BackingStore.h (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/BackingStore.h     2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebKit/UIProcess/BackingStore.h        2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -30,17 +30,8 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> #include <WebCore/BackingStoreBackendCairo.h>
</span><del>-#elif USE(DIRECT2D)
-#include <WebCore/BackingStoreBackendDirect2D.h>
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if USE(DIRECT2D)
-interface ID2D1RenderTarget;
-interface ID3D11Device1;
-interface ID3D11DeviceContext1;
-interface ID3D11Texture2D;
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="cx"> class ShareableBitmap;
</span><span class="lines">@@ -60,12 +51,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx">     typedef cairo_t* PlatformGraphicsContext;
</span><del>-#elif USE(DIRECT2D)
-    struct DXConnections {
-        ID3D11DeviceContext1* immediateContext { nullptr };
-        ID3D11Texture2D* backBuffer { nullptr };
-    };
-    typedef DXConnections PlatformGraphicsContext;
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     void paint(PlatformGraphicsContext, const WebCore::IntRect&);
</span><span class="lines">@@ -77,8 +62,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx">     std::unique_ptr<WebCore::BackingStoreBackendCairo> createBackend();
</span><del>-#elif USE(DIRECT2D)
-    std::unique_ptr<WebCore::BackingStoreBackendDirect2D> createBackend();
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     WebCore::IntSize m_size;
</span><span class="lines">@@ -86,8 +69,6 @@
</span><span class="cx">     WebPageProxy& m_webPageProxy;
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx">     std::unique_ptr<WebCore::BackingStoreBackendCairo> m_backend;
</span><del>-#elif USE(DIRECT2D)
-    std::unique_ptr<WebCore::BackingStoreBackendDirect2D> m_backend;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCoordinatedGraphicsDrawingAreaProxyCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp        2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp   2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -46,11 +46,6 @@
</span><span class="cx"> #include <wtf/glib/RunLoopSourcePriority.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if USE(DIRECT2D)
-#include <d2d1.h>
-#include <d3d11_1.h>
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><span class="lines">@@ -119,17 +114,11 @@
</span><span class="cx"> 
</span><span class="cx"> void DrawingAreaProxyCoordinatedGraphics::sizeDidChange()
</span><span class="cx"> {
</span><del>-#if USE(DIRECT2D)
-    m_backingStore = nullptr;
-#endif
</del><span class="cx">     backingStoreStateDidChange(RespondImmediately);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange()
</span><span class="cx"> {
</span><del>-#if USE(DIRECT2D)
-    m_backingStore = nullptr;
-#endif
</del><span class="cx">     backingStoreStateDidChange(RespondImmediately);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcesswinPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp     2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp        2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "WebView.h"
</span><span class="cx"> #include <WebCore/DOMPasteAccess.h>
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><del>-#include <d3d11_1.h>
</del><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcesswinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/win/WebView.cpp (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/win/WebView.cpp    2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/WebKit/UIProcess/win/WebView.cpp       2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -491,15 +491,6 @@
</span><span class="cx">     
</span><span class="cx">             cairo_destroy(context);
</span><span class="cx">             cairo_surface_destroy(surface);
</span><del>-#else
-            COMPtr<ID3D11Texture2D> backBuffer; 
-            HRESULT hr = m_swapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), reinterpret_cast<void**>(&backBuffer)); 
-            if (SUCCEEDED(hr)) {
-                BackingStore::DXConnections context { m_immediateContext.get(), backBuffer.get() };
-                drawingArea->paint(context, dirtyRect, unpaintedRegion);
-            }
-    
-            m_swapChain->Present(0, 0); 
</del><span class="cx"> #endif
</span><span class="cx">     
</span><span class="cx">             auto unpaintedRects = unpaintedRegion.rects();
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsAppleWin.cmake (287912 => 287913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsAppleWin.cmake 2022-01-12 07:52:45 UTC (rev 287912)
+++ trunk/Source/cmake/OptionsAppleWin.cmake    2022-01-12 07:55:30 UTC (rev 287913)
</span><span class="lines">@@ -41,59 +41,52 @@
</span><span class="cx"> # Libraries where find_package does not work
</span><span class="cx"> set(COREFOUNDATION_LIBRARY CoreFoundation${DEBUG_SUFFIX})
</span><span class="cx"> 
</span><del>-# Uncomment the following line to try the Direct2D backend.
-# set(USE_DIRECT2D 1)
</del><ins>+SET_AND_EXPOSE_TO_BUILD(USE_CA ON)
+SET_AND_EXPOSE_TO_BUILD(USE_CG ON)
+SET_AND_EXPOSE_TO_BUILD(USE_CORE_TEXT ON)
</ins><span class="cx"> 
</span><del>-if (${USE_DIRECT2D})
-    SET_AND_EXPOSE_TO_BUILD(USE_DIRECT2D ON)
-else ()
-    SET_AND_EXPOSE_TO_BUILD(USE_CA ON)
-    SET_AND_EXPOSE_TO_BUILD(USE_CG ON)
-    SET_AND_EXPOSE_TO_BUILD(USE_CORE_TEXT ON)
</del><ins>+set(CMAKE_REQUIRED_INCLUDES ${WEBKIT_LIBRARIES_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES
+    "${WEBKIT_LIBRARIES_LINK_DIR}/CoreFoundation${DEBUG_SUFFIX}.lib"
+    "${WEBKIT_LIBRARIES_LINK_DIR}/AVFoundationCF${DEBUG_SUFFIX}.lib"
+    "${WEBKIT_LIBRARIES_LINK_DIR}/QuartzCore${DEBUG_SUFFIX}.lib"
+    "${WEBKIT_LIBRARIES_LINK_DIR}/libdispatch${DEBUG_SUFFIX}.lib"
+)
</ins><span class="cx"> 
</span><del>-    set(CMAKE_REQUIRED_INCLUDES ${WEBKIT_LIBRARIES_INCLUDE_DIR})
-    set(CMAKE_REQUIRED_LIBRARIES
-        "${WEBKIT_LIBRARIES_LINK_DIR}/CoreFoundation${DEBUG_SUFFIX}.lib"
-        "${WEBKIT_LIBRARIES_LINK_DIR}/AVFoundationCF${DEBUG_SUFFIX}.lib"
-        "${WEBKIT_LIBRARIES_LINK_DIR}/QuartzCore${DEBUG_SUFFIX}.lib"
-        "${WEBKIT_LIBRARIES_LINK_DIR}/libdispatch${DEBUG_SUFFIX}.lib"
-    )
</del><ins>+WEBKIT_CHECK_HAVE_INCLUDE(HAVE_AVCF AVFoundationCF/AVCFBase.h)
</ins><span class="cx"> 
</span><del>-    WEBKIT_CHECK_HAVE_INCLUDE(HAVE_AVCF AVFoundationCF/AVCFBase.h)
</del><ins>+if (HAVE_AVCF)
+     SET_AND_EXPOSE_TO_BUILD(USE_AVFOUNDATION ON)
+endif ()
</ins><span class="cx"> 
</span><del>-    if (HAVE_AVCF)
-         SET_AND_EXPOSE_TO_BUILD(USE_AVFOUNDATION ON)
-    endif ()
</del><ins>+WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCF_LEGIBLE_OUTPUT AVCFPlayerItemLegibleOutputSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h;AVFoundationCF/AVCFPlayerItemLegibleOutput.h")
+WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVFOUNDATION_LOADER_DELEGATE AVCFAssetResourceLoaderSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
+WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCFURL_PLAYABLE_MIMETYPE AVCFURLAssetIsPlayableExtendedMIMEType "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
</ins><span class="cx"> 
</span><del>-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCF_LEGIBLE_OUTPUT AVCFPlayerItemLegibleOutputSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h;AVFoundationCF/AVCFPlayerItemLegibleOutput.h")
-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVFOUNDATION_LOADER_DELEGATE AVCFAssetResourceLoaderSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCFURL_PLAYABLE_MIMETYPE AVCFURLAssetIsPlayableExtendedMIMEType "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
</del><ins>+# CMake cannot identify an enum through a symbol check so a source file is required
+WEBKIT_CHECK_SOURCE_COMPILES(HAVE_AVCFPLAYERITEM_CALLBACK_VERSION_2 "
+#include <AVFoundationCF/AVFoundationCF.h>
+#include <AVFoundationCF/AVCFPlayerItemLegibleOutput.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <dispatch/dispatch.h>
</ins><span class="cx"> 
</span><del>-    # CMake cannot identify an enum through a symbol check so a source file is required
-    WEBKIT_CHECK_SOURCE_COMPILES(HAVE_AVCFPLAYERITEM_CALLBACK_VERSION_2 "
-    #include <AVFoundationCF/AVFoundationCF.h>
-    #include <AVFoundationCF/AVCFPlayerItemLegibleOutput.h>
-    #include <CoreFoundation/CoreFoundation.h>
-    #include <dispatch/dispatch.h>
</del><ins>+int main() {
+    CFArrayRef types = CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr);
+    AVCFPlayerItemLegibleOutputRef legibleOutput = AVCFPlayerItemLegibleOutputCreateWithMediaSubtypesForNativeRepresentation(kCFAllocatorDefault, types);
+    AVCFPlayerItemLegibleOutputCallbacks callbackInfo;
+    callbackInfo.version = kAVCFPlayerItemLegibleOutput_CallbacksVersion_2;
+    dispatch_queue_t dispatchQueue = dispatch_queue_create(\"test\", DISPATCH_QUEUE_SERIAL);
+    AVCFPlayerItemLegibleOutputSetCallbacks(legibleOutput, &callbackInfo, dispatchQueue);
+}")
</ins><span class="cx"> 
</span><del>-    int main() {
-        CFArrayRef types = CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr);
-        AVCFPlayerItemLegibleOutputRef legibleOutput = AVCFPlayerItemLegibleOutputCreateWithMediaSubtypesForNativeRepresentation(kCFAllocatorDefault, types);
-        AVCFPlayerItemLegibleOutputCallbacks callbackInfo;
-        callbackInfo.version = kAVCFPlayerItemLegibleOutput_CallbacksVersion_2;
-        dispatch_queue_t dispatchQueue = dispatch_queue_create(\"test\", DISPATCH_QUEUE_SERIAL);
-        AVCFPlayerItemLegibleOutputSetCallbacks(legibleOutput, &callbackInfo, dispatchQueue);
-    }")
</del><ins>+if (HAVE_AVCF_LEGIBLE_OUTPUT)
+    SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP ON)
+    SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT ON)
+    SET_AND_EXPOSE_TO_BUILD(HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK ON)
+endif ()
</ins><span class="cx"> 
</span><del>-    if (HAVE_AVCF_LEGIBLE_OUTPUT)
-        SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP ON)
-        SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT ON)
-        SET_AND_EXPOSE_TO_BUILD(HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK ON)
-    endif ()
</del><ins>+WEBKIT_CHECK_HAVE_SYMBOL(HAVE_CACFLAYER_SETCONTENTSSCALE CACFLayerSetContentsScale QuartzCore/CoreAnimationCF.h)
</ins><span class="cx"> 
</span><del>-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_CACFLAYER_SETCONTENTSSCALE CACFLayerSetContentsScale QuartzCore/CoreAnimationCF.h)
-endif ()
-
</del><span class="cx"> # Warnings as errors (ignore narrowing conversions)
</span><span class="cx"> add_compile_options(/WX /Wv:18)
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>