⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 238501 in webkit


Ignore:
Timestamp:
Nov 26, 2018, 10:26:48 AM (8 years ago)
Author:
Brent Fulgham
Message:

[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:
Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r238493 r238501  
     12018-11-26  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Reduce the use of WKSI library calls: CoreAnimation
     4        https://bugs.webkit.org/show_bug.cgi?id=191777
     5        <rdar://problem/46140542>
     6
     7        Reviewed by Zalan Bujtas.
     8
     9        Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     10        Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     11        directives for WebKitSystemInterface.lib.
     12       
     13        No new tests. No change in behavior.
     14
     15        * platform/graphics/BitmapImage.cpp:
     16        * platform/graphics/ca/win/CACFLayerTreeHost.h:
     17        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     18        (layerTreeHostForLayer):
     19        * platform/graphics/cg/GraphicsContextCG.cpp:
     20        * platform/graphics/cg/PathCG.cpp:
     21        * platform/graphics/cg/PatternCG.cpp:
     22        * platform/graphics/win/WKCAImageQueue.cpp:
     23
    1242018-11-25  Zalan Bujtas  <zalan@apple.com>
    225

  • trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

    r237230 r238501  
    3939#include <wtf/text/TextStream.h>
    4040#include <wtf/text/WTFString.h>
    41 #if USE(CG) && PLATFORM(WIN)
    42 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    43 #endif
    4441
    4542namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h

    r216702 r238501  
    4141
    4242interface IDirect3DDevice9;
    43 struct WKCACFContext;
    4443
    4544typedef struct CGImage* CGImageRef;

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

    r238152 r238501  
    4040#include "WebTiledBackingLayerWin.h"
    4141#include <QuartzCore/CoreAnimationCF.h>
    42 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    4342#include <wtf/text/CString.h>
    4443#include <wtf/text/StringBuilder.h>
    … …  
    7473{
    7574    // We need the AbstractCACFLayerTreeHost associated with this layer, which is stored in the UserData of the CACFContext
    76     void* userData = wkCACFLayerGetContextUserData(layer->platformLayer());
     75    void* userData = nullptr;
     76    if (CACFContextRef context = CACFLayerGetContext(layer->platformLayer()))
     77        userData = CACFContextGetUserData(context);
     78
    7779    if (!userData)
    7880        return nullptr;

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

    r237948 r238501  
    4747#include <wtf/RetainPtr.h>
    4848#include <wtf/text/TextStream.h>
    49 
    50 #if PLATFORM(WIN)
    51 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    52 #endif
    5349
    5450#define USE_DRAW_PATH_DIRECT (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400))

  • trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp

    r237691 r238501  
    4040#include <wtf/text/WTFString.h>
    4141
    42 #if PLATFORM(WIN)
    43 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    44 #endif
    45 
    4642namespace WebCore {
    4743

  • trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp

    r222898 r238501  
    3535#include <pal/spi/cg/CoreGraphicsSPI.h>
    3636#include <wtf/MainThread.h>
    37 
    38 #if PLATFORM(WIN)
    39 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    40 #endif
    4137
    4238namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp

    r183265 r238501  
    2828
    2929#include <CoreFoundation/CoreFoundation.h>
    30 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    3130#include <wtf/RetainPtr.h>
    3231

  • trunk/Source/WebKitLegacy/ChangeLog

    r238350 r238501  
     12018-11-26  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Reduce the use of WKSI library calls: CoreAnimation
     4        https://bugs.webkit.org/show_bug.cgi?id=191777
     5        <rdar://problem/46140542>
     6
     7        Reviewed by Zalan Bujtas.
     8
     9        Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     10        Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     11        directives for WebKitSystemInterface.lib.
     12
     13        * PlatformWin.cmake:
     14
    1152018-11-17  Devin Rousso  <drousso@apple.com>
    216

  • trunk/Source/WebKitLegacy/PlatformWin.cmake

    r237416 r238501  
    2525        PRIVATE CoreText${DEBUG_SUFFIX}
    2626        PRIVATE QuartzCore${DEBUG_SUFFIX}
    27         PRIVATE WebKitSystemInterface${DEBUG_SUFFIX}
    2827        PRIVATE libdispatch${DEBUG_SUFFIX}
    2928        PRIVATE libicuin${DEBUG_SUFFIX}

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r238454 r238501  
     12018-11-26  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Reduce the use of WKSI library calls: CoreAnimation
     4        https://bugs.webkit.org/show_bug.cgi?id=191777
     5        <rdar://problem/46140542>
     6
     7        Reviewed by Zalan Bujtas.
     8
     9        Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     10        Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     11        directives for WebKitSystemInterface.lib.
     12
     13        * FullscreenVideoController.cpp:
     14        * WebKitGraphics.cpp:
     15        * WebPreferences.cpp:
     16
    1172018-11-22  Wenson Hsieh  <wenson_hsieh@apple.com>
    218

  • trunk/Source/WebKitLegacy/win/FullscreenVideoController.cpp

    r234501 r238501  
    4040#include <WebCore/Page.h>
    4141#include <WebCore/TextRun.h>
    42 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    4342#include <windowsx.h>
    4443#include <wtf/StdLibExtras.h>

  • trunk/Source/WebKitLegacy/win/WebKitGraphics.cpp

    r213464 r238501  
    4242
    4343#include <CoreGraphics/CoreGraphics.h>
    44 
    45 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    4644
    4745using namespace WebCore;

  • trunk/Source/WebKitLegacy/win/WebPreferences.cpp

    r238253 r238501  
    3434#include <CoreGraphics/CoreGraphics.h>
    3535#include <WebCore/CACFLayerTreeHost.h>
    36 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    3736#endif
    3837

  • trunk/Tools/ChangeLog

    r238493 r238501  
     12018-11-26  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Reduce the use of WKSI library calls: CoreAnimation
     4        https://bugs.webkit.org/show_bug.cgi?id=191777
     5        <rdar://problem/46140542>
     6
     7        Reviewed by Zalan Bujtas.
     8
     9        Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     10        Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     11        directives for WebKitSystemInterface.lib.
     12
     13        * TestWebKitAPI/PlatformWin.cmake:
     14
    1152018-11-25  Zalan Bujtas  <zalan@apple.com>
    216

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r238387 r238501  
    8787        CoreText${DEBUG_SUFFIX}
    8888        QuartzCore${DEBUG_SUFFIX}
    89         WebKitSystemInterface${DEBUG_SUFFIX}
    9089        WebKitQuartzCoreAdditions${DEBUG_SUFFIX}
    9190        libdispatch${DEBUG_SUFFIX}
Note: See TracChangeset for help on using the changeset viewer.