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

Changeset 238521 in webkit


Ignore:
Timestamp:
Nov 26, 2018, 1:59:16 PM (8 years ago)
Author:
Kocsen Chung
Message:

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

Location:
tags/Safari-607.1.14.2
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • tags/Safari-607.1.14.2/Source/WebCore/ChangeLog

    r238260 r238521  
     12018-11-26  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r238501. rdar://problem/46140542
     4
     5    [Win] Reduce the use of WKSI library calls: CoreAnimation
     6    https://bugs.webkit.org/show_bug.cgi?id=191777
     7    <rdar://problem/46140542>
     8   
     9    Reviewed by Zalan Bujtas.
     10   
     11    Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     12    Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     13    directives for WebKitSystemInterface.lib.
     14    Source/WebCore:
     15   
     16    No new tests. No change in behavior.
     17   
     18    * platform/graphics/BitmapImage.cpp:
     19    * platform/graphics/ca/win/CACFLayerTreeHost.h:
     20    * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     21    (layerTreeHostForLayer):
     22    * platform/graphics/cg/GraphicsContextCG.cpp:
     23    * platform/graphics/cg/PathCG.cpp:
     24    * platform/graphics/cg/PatternCG.cpp:
     25    * platform/graphics/win/WKCAImageQueue.cpp:
     26   
     27    Source/WebKitLegacy:
     28   
     29    * PlatformWin.cmake:
     30   
     31    Source/WebKitLegacy/win:
     32   
     33    * FullscreenVideoController.cpp:
     34    * WebKitGraphics.cpp:
     35    * WebPreferences.cpp:
     36   
     37    Tools:
     38   
     39    * TestWebKitAPI/PlatformWin.cmake:
     40   
     41    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     42
     43    2018-11-26  Brent Fulgham  <bfulgham@apple.com>
     44
     45            [Win] Reduce the use of WKSI library calls: CoreAnimation
     46            https://bugs.webkit.org/show_bug.cgi?id=191777
     47            <rdar://problem/46140542>
     48
     49            Reviewed by Zalan Bujtas.
     50
     51            Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     52            Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     53            directives for WebKitSystemInterface.lib.
     54
     55            No new tests. No change in behavior.
     56
     57            * platform/graphics/BitmapImage.cpp:
     58            * platform/graphics/ca/win/CACFLayerTreeHost.h:
     59            * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     60            (layerTreeHostForLayer):
     61            * platform/graphics/cg/GraphicsContextCG.cpp:
     62            * platform/graphics/cg/PathCG.cpp:
     63            * platform/graphics/cg/PatternCG.cpp:
     64            * platform/graphics/win/WKCAImageQueue.cpp:
     65
    1662018-11-15  Alan Coon  <alancoon@apple.com>
    267

  • tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/BitmapImage.cpp

    r237230 r238521  
    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 {

  • tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h

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

  • tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

    r238152 r238521  
    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;

  • tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

    r237948 r238521  
    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))

  • tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/PathCG.cpp

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

  • tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/cg/PatternCG.cpp

    r222898 r238521  
    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 {

  • tags/Safari-607.1.14.2/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp

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

  • tags/Safari-607.1.14.2/Source/WebKitLegacy/ChangeLog

    r238036 r238521  
     12018-11-26  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r238501. rdar://problem/46140542
     4
     5    [Win] Reduce the use of WKSI library calls: CoreAnimation
     6    https://bugs.webkit.org/show_bug.cgi?id=191777
     7    <rdar://problem/46140542>
     8   
     9    Reviewed by Zalan Bujtas.
     10   
     11    Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     12    Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     13    directives for WebKitSystemInterface.lib.
     14    Source/WebCore:
     15   
     16    No new tests. No change in behavior.
     17   
     18    * platform/graphics/BitmapImage.cpp:
     19    * platform/graphics/ca/win/CACFLayerTreeHost.h:
     20    * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     21    (layerTreeHostForLayer):
     22    * platform/graphics/cg/GraphicsContextCG.cpp:
     23    * platform/graphics/cg/PathCG.cpp:
     24    * platform/graphics/cg/PatternCG.cpp:
     25    * platform/graphics/win/WKCAImageQueue.cpp:
     26   
     27    Source/WebKitLegacy:
     28   
     29    * PlatformWin.cmake:
     30   
     31    Source/WebKitLegacy/win:
     32   
     33    * FullscreenVideoController.cpp:
     34    * WebKitGraphics.cpp:
     35    * WebPreferences.cpp:
     36   
     37    Tools:
     38   
     39    * TestWebKitAPI/PlatformWin.cmake:
     40   
     41    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     42
     43    2018-11-26  Brent Fulgham  <bfulgham@apple.com>
     44
     45            [Win] Reduce the use of WKSI library calls: CoreAnimation
     46            https://bugs.webkit.org/show_bug.cgi?id=191777
     47            <rdar://problem/46140542>
     48
     49            Reviewed by Zalan Bujtas.
     50
     51            Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     52            Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     53            directives for WebKitSystemInterface.lib.
     54
     55            * PlatformWin.cmake:
     56
    1572018-11-09  Sihui Liu  <sihui_liu@apple.com>
    258

  • tags/Safari-607.1.14.2/Source/WebKitLegacy/PlatformWin.cmake

    r237416 r238521  
    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}

  • tags/Safari-607.1.14.2/Source/WebKitLegacy/win/ChangeLog

    r238106 r238521  
     12018-11-26  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r238501. rdar://problem/46140542
     4
     5    [Win] Reduce the use of WKSI library calls: CoreAnimation
     6    https://bugs.webkit.org/show_bug.cgi?id=191777
     7    <rdar://problem/46140542>
     8   
     9    Reviewed by Zalan Bujtas.
     10   
     11    Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     12    Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     13    directives for WebKitSystemInterface.lib.
     14    Source/WebCore:
     15   
     16    No new tests. No change in behavior.
     17   
     18    * platform/graphics/BitmapImage.cpp:
     19    * platform/graphics/ca/win/CACFLayerTreeHost.h:
     20    * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     21    (layerTreeHostForLayer):
     22    * platform/graphics/cg/GraphicsContextCG.cpp:
     23    * platform/graphics/cg/PathCG.cpp:
     24    * platform/graphics/cg/PatternCG.cpp:
     25    * platform/graphics/win/WKCAImageQueue.cpp:
     26   
     27    Source/WebKitLegacy:
     28   
     29    * PlatformWin.cmake:
     30   
     31    Source/WebKitLegacy/win:
     32   
     33    * FullscreenVideoController.cpp:
     34    * WebKitGraphics.cpp:
     35    * WebPreferences.cpp:
     36   
     37    Tools:
     38   
     39    * TestWebKitAPI/PlatformWin.cmake:
     40   
     41    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     42
     43    2018-11-26  Brent Fulgham  <bfulgham@apple.com>
     44
     45            [Win] Reduce the use of WKSI library calls: CoreAnimation
     46            https://bugs.webkit.org/show_bug.cgi?id=191777
     47            <rdar://problem/46140542>
     48
     49            Reviewed by Zalan Bujtas.
     50
     51            Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     52            Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     53            directives for WebKitSystemInterface.lib.
     54
     55            * FullscreenVideoController.cpp:
     56            * WebKitGraphics.cpp:
     57            * WebPreferences.cpp:
     58
    1592018-11-12  Don Olmstead  <don.olmstead@sony.com>
    260

  • tags/Safari-607.1.14.2/Source/WebKitLegacy/win/FullscreenVideoController.cpp

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

  • tags/Safari-607.1.14.2/Source/WebKitLegacy/win/WebKitGraphics.cpp

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

  • tags/Safari-607.1.14.2/Source/WebKitLegacy/win/WebPreferences.cpp

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

  • tags/Safari-607.1.14.2/Tools/ChangeLog

    r238166 r238521  
     12018-11-26  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r238501. rdar://problem/46140542
     4
     5    [Win] Reduce the use of WKSI library calls: CoreAnimation
     6    https://bugs.webkit.org/show_bug.cgi?id=191777
     7    <rdar://problem/46140542>
     8   
     9    Reviewed by Zalan Bujtas.
     10   
     11    Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     12    Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     13    directives for WebKitSystemInterface.lib.
     14    Source/WebCore:
     15   
     16    No new tests. No change in behavior.
     17   
     18    * platform/graphics/BitmapImage.cpp:
     19    * platform/graphics/ca/win/CACFLayerTreeHost.h:
     20    * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     21    (layerTreeHostForLayer):
     22    * platform/graphics/cg/GraphicsContextCG.cpp:
     23    * platform/graphics/cg/PathCG.cpp:
     24    * platform/graphics/cg/PatternCG.cpp:
     25    * platform/graphics/win/WKCAImageQueue.cpp:
     26   
     27    Source/WebKitLegacy:
     28   
     29    * PlatformWin.cmake:
     30   
     31    Source/WebKitLegacy/win:
     32   
     33    * FullscreenVideoController.cpp:
     34    * WebKitGraphics.cpp:
     35    * WebPreferences.cpp:
     36   
     37    Tools:
     38   
     39    * TestWebKitAPI/PlatformWin.cmake:
     40   
     41    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     42
     43    2018-11-26  Brent Fulgham  <bfulgham@apple.com>
     44
     45            [Win] Reduce the use of WKSI library calls: CoreAnimation
     46            https://bugs.webkit.org/show_bug.cgi?id=191777
     47            <rdar://problem/46140542>
     48
     49            Reviewed by Zalan Bujtas.
     50
     51            Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
     52            Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
     53            directives for WebKitSystemInterface.lib.
     54
     55            * TestWebKitAPI/PlatformWin.cmake:
     56
    1572018-11-13  Jiewen Tan  <jiewen_tan@apple.com>
    258

  • tags/Safari-607.1.14.2/Tools/TestWebKitAPI/PlatformWin.cmake

    r238111 r238521  
    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.