Diff
Modified: tags/Safari-607.1.14.2/Source/WebCore/ChangeLog (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebCore/ChangeLog 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebCore/ChangeLog 2018-11-26 21:59:16 UTC (rev 238521)
@@ -1,3 +1,68 @@
+2018-11-26 Kocsen Chung <[email protected]>
+
+ Cherry-pick r238501. rdar://problem/46140542
+
+ [Win] Reduce the use of WKSI library calls: CoreAnimation
+ https://bugs.webkit.org/show_bug.cgi?id=191777
+ <rdar://problem/46140542>
+
+ Reviewed by Zalan Bujtas.
+
+ Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
+ Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
+ directives for WebKitSystemInterface.lib.
+ Source/WebCore:
+
+ No new tests. No change in behavior.
+
+ * platform/graphics/BitmapImage.cpp:
+ * platform/graphics/ca/win/CACFLayerTreeHost.h:
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (layerTreeHostForLayer):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ * platform/graphics/cg/PathCG.cpp:
+ * platform/graphics/cg/PatternCG.cpp:
+ * platform/graphics/win/WKCAImageQueue.cpp:
+
+ Source/WebKitLegacy:
+
+ * PlatformWin.cmake:
+
+ Source/WebKitLegacy/win:
+
+ * FullscreenVideoController.cpp:
+ * WebKitGraphics.cpp:
+ * WebPreferences.cpp:
+
+ Tools:
+
+ * TestWebKitAPI/PlatformWin.cmake:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-26 Brent Fulgham <[email protected]>
+
+ [Win] Reduce the use of WKSI library calls: CoreAnimation
+ https://bugs.webkit.org/show_bug.cgi?id=191777
+ <rdar://problem/46140542>
+
+ Reviewed by Zalan Bujtas.
+
+ Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
+ Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
+ directives for WebKitSystemInterface.lib.
+
+ No new tests. No change in behavior.
+
+ * platform/graphics/BitmapImage.cpp:
+ * platform/graphics/ca/win/CACFLayerTreeHost.h:
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (layerTreeHostForLayer):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ * platform/graphics/cg/PathCG.cpp:
+ * platform/graphics/cg/PatternCG.cpp:
+ * platform/graphics/win/WKCAImageQueue.cpp:
+
2018-11-15 Alan Coon <[email protected]>
Revert r238090. rdar://problem/46111475
Modified: tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/BitmapImage.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/BitmapImage.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/BitmapImage.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -38,9 +38,6 @@
#include <wtf/Vector.h>
#include <wtf/text/TextStream.h>
#include <wtf/text/WTFString.h>
-#if USE(CG) && PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
namespace WebCore {
Modified: tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h 2018-11-26 21:59:16 UTC (rev 238521)
@@ -40,7 +40,6 @@
#include <CoreGraphics/CGGeometry.h>
interface IDirect3DDevice9;
-struct WKCACFContext;
typedef struct CGImage* CGImageRef;
Modified: tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -39,7 +39,6 @@
#include "TileController.h"
#include "WebTiledBackingLayerWin.h"
#include <QuartzCore/CoreAnimationCF.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
@@ -73,7 +72,10 @@
static AbstractCACFLayerTreeHost* layerTreeHostForLayer(const PlatformCALayer* layer)
{
// We need the AbstractCACFLayerTreeHost associated with this layer, which is stored in the UserData of the CACFContext
- void* userData = wkCACFLayerGetContextUserData(layer->platformLayer());
+ void* userData = nullptr;
+ if (CACFContextRef context = CACFLayerGetContext(layer->platformLayer()))
+ userData = CACFContextGetUserData(context);
+
if (!userData)
return nullptr;
Modified: tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -47,10 +47,6 @@
#include <wtf/RetainPtr.h>
#include <wtf/text/TextStream.h>
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
#define USE_DRAW_PATH_DIRECT (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400))
// FIXME: The following using declaration should be in <wtf/HashFunctions.h>.
Modified: tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/PathCG.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/PathCG.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/PathCG.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -39,10 +39,6 @@
#include <wtf/RetainPtr.h>
#include <wtf/text/WTFString.h>
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
namespace WebCore {
static size_t putBytesNowhere(void*, const void*, size_t count)
Modified: tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/PatternCG.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -35,10 +35,6 @@
#include <pal/spi/cg/CoreGraphicsSPI.h>
#include <wtf/MainThread.h>
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
namespace WebCore {
static void patternCallback(void* info, CGContextRef context)
Modified: tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -27,7 +27,6 @@
#include "WKCAImageQueue.h"
#include <CoreFoundation/CoreFoundation.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <wtf/RetainPtr.h>
namespace WebCore {
Modified: tags/Safari-607.1.14.2/Source/WebKitLegacy/ChangeLog (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebKitLegacy/ChangeLog 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebKitLegacy/ChangeLog 2018-11-26 21:59:16 UTC (rev 238521)
@@ -1,3 +1,59 @@
+2018-11-26 Kocsen Chung <[email protected]>
+
+ Cherry-pick r238501. rdar://problem/46140542
+
+ [Win] Reduce the use of WKSI library calls: CoreAnimation
+ https://bugs.webkit.org/show_bug.cgi?id=191777
+ <rdar://problem/46140542>
+
+ Reviewed by Zalan Bujtas.
+
+ Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
+ Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
+ directives for WebKitSystemInterface.lib.
+ Source/WebCore:
+
+ No new tests. No change in behavior.
+
+ * platform/graphics/BitmapImage.cpp:
+ * platform/graphics/ca/win/CACFLayerTreeHost.h:
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (layerTreeHostForLayer):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ * platform/graphics/cg/PathCG.cpp:
+ * platform/graphics/cg/PatternCG.cpp:
+ * platform/graphics/win/WKCAImageQueue.cpp:
+
+ Source/WebKitLegacy:
+
+ * PlatformWin.cmake:
+
+ Source/WebKitLegacy/win:
+
+ * FullscreenVideoController.cpp:
+ * WebKitGraphics.cpp:
+ * WebPreferences.cpp:
+
+ Tools:
+
+ * TestWebKitAPI/PlatformWin.cmake:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-26 Brent Fulgham <[email protected]>
+
+ [Win] Reduce the use of WKSI library calls: CoreAnimation
+ https://bugs.webkit.org/show_bug.cgi?id=191777
+ <rdar://problem/46140542>
+
+ Reviewed by Zalan Bujtas.
+
+ Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
+ Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
+ directives for WebKitSystemInterface.lib.
+
+ * PlatformWin.cmake:
+
2018-11-09 Sihui Liu <[email protected]>
Remove legacy storage tracker database file after r237330
Modified: tags/Safari-607.1.14.2/Source/WebKitLegacy/PlatformWin.cmake (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebKitLegacy/PlatformWin.cmake 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebKitLegacy/PlatformWin.cmake 2018-11-26 21:59:16 UTC (rev 238521)
@@ -24,7 +24,6 @@
PRIVATE CoreGraphics${DEBUG_SUFFIX}
PRIVATE CoreText${DEBUG_SUFFIX}
PRIVATE QuartzCore${DEBUG_SUFFIX}
- PRIVATE WebKitSystemInterface${DEBUG_SUFFIX}
PRIVATE libdispatch${DEBUG_SUFFIX}
PRIVATE libicuin${DEBUG_SUFFIX}
PRIVATE libicuuc${DEBUG_SUFFIX}
Modified: tags/Safari-607.1.14.2/Source/WebKitLegacy/win/ChangeLog (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebKitLegacy/win/ChangeLog 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebKitLegacy/win/ChangeLog 2018-11-26 21:59:16 UTC (rev 238521)
@@ -1,3 +1,61 @@
+2018-11-26 Kocsen Chung <[email protected]>
+
+ Cherry-pick r238501. rdar://problem/46140542
+
+ [Win] Reduce the use of WKSI library calls: CoreAnimation
+ https://bugs.webkit.org/show_bug.cgi?id=191777
+ <rdar://problem/46140542>
+
+ Reviewed by Zalan Bujtas.
+
+ Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
+ Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
+ directives for WebKitSystemInterface.lib.
+ Source/WebCore:
+
+ No new tests. No change in behavior.
+
+ * platform/graphics/BitmapImage.cpp:
+ * platform/graphics/ca/win/CACFLayerTreeHost.h:
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (layerTreeHostForLayer):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ * platform/graphics/cg/PathCG.cpp:
+ * platform/graphics/cg/PatternCG.cpp:
+ * platform/graphics/win/WKCAImageQueue.cpp:
+
+ Source/WebKitLegacy:
+
+ * PlatformWin.cmake:
+
+ Source/WebKitLegacy/win:
+
+ * FullscreenVideoController.cpp:
+ * WebKitGraphics.cpp:
+ * WebPreferences.cpp:
+
+ Tools:
+
+ * TestWebKitAPI/PlatformWin.cmake:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-26 Brent Fulgham <[email protected]>
+
+ [Win] Reduce the use of WKSI library calls: CoreAnimation
+ https://bugs.webkit.org/show_bug.cgi?id=191777
+ <rdar://problem/46140542>
+
+ Reviewed by Zalan Bujtas.
+
+ Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
+ Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
+ directives for WebKitSystemInterface.lib.
+
+ * FullscreenVideoController.cpp:
+ * WebKitGraphics.cpp:
+ * WebPreferences.cpp:
+
2018-11-12 Don Olmstead <[email protected]>
Shipped PNGs include bad profiles: iCCP: known incorrect sRGB profile
Modified: tags/Safari-607.1.14.2/Source/WebKitLegacy/win/FullscreenVideoController.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebKitLegacy/win/FullscreenVideoController.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebKitLegacy/win/FullscreenVideoController.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -39,7 +39,6 @@
#include <WebCore/HWndDC.h>
#include <WebCore/Page.h>
#include <WebCore/TextRun.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <windowsx.h>
#include <wtf/StdLibExtras.h>
Modified: tags/Safari-607.1.14.2/Source/WebKitLegacy/win/WebKitGraphics.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebKitLegacy/win/WebKitGraphics.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebKitLegacy/win/WebKitGraphics.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -42,8 +42,6 @@
#include <CoreGraphics/CoreGraphics.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-
using namespace WebCore;
static FontCascade makeFont(const WebFontDescription& description)
Modified: tags/Safari-607.1.14.2/Source/WebKitLegacy/win/WebPreferences.cpp (238520 => 238521)
--- tags/Safari-607.1.14.2/Source/WebKitLegacy/win/WebPreferences.cpp 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Source/WebKitLegacy/win/WebPreferences.cpp 2018-11-26 21:59:16 UTC (rev 238521)
@@ -33,7 +33,6 @@
#if USE(CG)
#include <CoreGraphics/CoreGraphics.h>
#include <WebCore/CACFLayerTreeHost.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
#include <CoreFoundation/CoreFoundation.h>
Modified: tags/Safari-607.1.14.2/Tools/ChangeLog (238520 => 238521)
--- tags/Safari-607.1.14.2/Tools/ChangeLog 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Tools/ChangeLog 2018-11-26 21:59:16 UTC (rev 238521)
@@ -1,3 +1,59 @@
+2018-11-26 Kocsen Chung <[email protected]>
+
+ Cherry-pick r238501. rdar://problem/46140542
+
+ [Win] Reduce the use of WKSI library calls: CoreAnimation
+ https://bugs.webkit.org/show_bug.cgi?id=191777
+ <rdar://problem/46140542>
+
+ Reviewed by Zalan Bujtas.
+
+ Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
+ Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
+ directives for WebKitSystemInterface.lib.
+ Source/WebCore:
+
+ No new tests. No change in behavior.
+
+ * platform/graphics/BitmapImage.cpp:
+ * platform/graphics/ca/win/CACFLayerTreeHost.h:
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (layerTreeHostForLayer):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ * platform/graphics/cg/PathCG.cpp:
+ * platform/graphics/cg/PatternCG.cpp:
+ * platform/graphics/win/WKCAImageQueue.cpp:
+
+ Source/WebKitLegacy:
+
+ * PlatformWin.cmake:
+
+ Source/WebKitLegacy/win:
+
+ * FullscreenVideoController.cpp:
+ * WebKitGraphics.cpp:
+ * WebPreferences.cpp:
+
+ Tools:
+
+ * TestWebKitAPI/PlatformWin.cmake:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-26 Brent Fulgham <[email protected]>
+
+ [Win] Reduce the use of WKSI library calls: CoreAnimation
+ https://bugs.webkit.org/show_bug.cgi?id=191777
+ <rdar://problem/46140542>
+
+ Reviewed by Zalan Bujtas.
+
+ Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
+ Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
+ directives for WebKitSystemInterface.lib.
+
+ * TestWebKitAPI/PlatformWin.cmake:
+
2018-11-13 Jiewen Tan <[email protected]>
[WebAuthN] Support CTAP HID authenticators on macOS
Modified: tags/Safari-607.1.14.2/Tools/TestWebKitAPI/PlatformWin.cmake (238520 => 238521)
--- tags/Safari-607.1.14.2/Tools/TestWebKitAPI/PlatformWin.cmake 2018-11-26 21:55:42 UTC (rev 238520)
+++ tags/Safari-607.1.14.2/Tools/TestWebKitAPI/PlatformWin.cmake 2018-11-26 21:59:16 UTC (rev 238521)
@@ -86,7 +86,6 @@
CoreGraphics${DEBUG_SUFFIX}
CoreText${DEBUG_SUFFIX}
QuartzCore${DEBUG_SUFFIX}
- WebKitSystemInterface${DEBUG_SUFFIX}
WebKitQuartzCoreAdditions${DEBUG_SUFFIX}
libdispatch${DEBUG_SUFFIX}
libexslt${DEBUG_SUFFIX}
