Changeset 248755 in webkit


Ignore:
Timestamp:
Aug 15, 2019 6:50:05 PM (5 years ago)
Author:
Brent Fulgham
Message:

[FTW] Enable CoreFoundation use if building for Apple target
​https://bugs.webkit.org/show_bug.cgi?id=200799

Reviewed by Alex Christensen.

Source/JavaScriptCore:

  • PlatformFTW.cmake: Add missing files.

Source/WebKit:

Fix the build and remove an unused method.

  • PlatformFTW.cmake:
  • Shared/ShareableBitmap.h:
  • Shared/win/ShareableBitmapDirect2D.cpp:

(WebKit::ShareableBitmap::createDirect2DSurface):
(WebKit::ShareableBitmap::releaseSurfaceData): Deleted.

Source/WebKitLegacy:

  • PlatformFTW.cmake:

Source/WebKitLegacy/win:

  • FullscreenVideoController.cpp:

(FullscreenVideoController::FullscreenVideoController):
(FullscreenVideoController::enterFullscreen):
(FullscreenVideoController::exitFullscreen):
(FullscreenVideoController::createHUDWindow):

  • FullscreenVideoController.h:
  • WebView.cpp:

(WebView::exitFullscreenIfNeeded):

Source/WTF:

  • wtf/PlatformFTW.cmake: Add missing files.
Location:
trunk/Source
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r248738 r248755  
     12019-08-15  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [FTW] Enable CoreFoundation use if building for Apple target
     4        https://bugs.webkit.org/show_bug.cgi?id=200799
     5
     6        Reviewed by Alex Christensen.
     7
     8        * PlatformFTW.cmake: Add missing files.
     9
    1102019-08-15  Alexey Shvayka  <shvaikalesh@gmail.com>
    211

  • trunk/Source/JavaScriptCore/PlatformFTW.cmake

    r246884 r248755  
    77    API/JavaScriptCore.h
    88)
     9
     10if (USE_CF)
     11    list(APPEND JavaScriptCore_SOURCES
     12        API/JSStringRefCF.cpp
     13    )
     14
     15    list(APPEND JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS
     16        API/JSStringRefCF.h
     17    )
     18
     19    list(APPEND JavaScriptCore_LIBRARIES
     20        ${COREFOUNDATION_LIBRARY}
     21    )
     22endif ()
     23
     24if (NOT WTF_PLATFORM_WIN_CAIRO)
     25    list(APPEND JavaScriptCore_LIBRARIES
     26        winmm
     27    )
     28endif ()
    929
    1030if (ENABLE_REMOTE_INSPECTOR)

  • trunk/Source/WTF/ChangeLog

    r248731 r248755  
     12019-08-15  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [FTW] Enable CoreFoundation use if building for Apple target
     4        https://bugs.webkit.org/show_bug.cgi?id=200799
     5
     6        Reviewed by Alex Christensen.
     7
     8        * wtf/PlatformFTW.cmake: Add missing files.
     9
    1102019-08-15  Commit Queue  <commit-queue@webkit.org>
    211

  • trunk/Source/WTF/wtf/PlatformFTW.cmake

    r246884 r248755  
    3434)
    3535
     36if (USE_CF)
     37    list(APPEND WTF_PUBLIC_HEADERS
     38        cf/CFURLExtras.h
     39        cf/TypeCastsCF.h
     40
     41        text/cf/TextBreakIteratorCF.h
     42    )
     43    list(APPEND WTF_SOURCES
     44        cf/CFURLExtras.cpp
     45        cf/FileSystemCF.cpp
     46        cf/URLCF.cpp
     47
     48        text/cf/AtomStringImplCF.cpp
     49        text/cf/StringCF.cpp
     50        text/cf/StringImplCF.cpp
     51        text/cf/StringViewCF.cpp
     52    )
     53
     54    list(APPEND WTF_LIBRARIES ${COREFOUNDATION_LIBRARY})
     55endif ()
     56
    3657set(WTF_OUTPUT_NAME WTF${DEBUG_SUFFIX})

  • trunk/Source/WebKit/ChangeLog

    r248734 r248755  
     12019-08-15  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [FTW] Enable CoreFoundation use if building for Apple target
     4        https://bugs.webkit.org/show_bug.cgi?id=200799
     5
     6        Reviewed by Alex Christensen.
     7
     8        Fix the build and remove an unused method.
     9
     10        * PlatformFTW.cmake:
     11        * Shared/ShareableBitmap.h:
     12        * Shared/win/ShareableBitmapDirect2D.cpp:
     13        (WebKit::ShareableBitmap::createDirect2DSurface):
     14        (WebKit::ShareableBitmap::releaseSurfaceData): Deleted.
     15
    1162019-08-15  Sihui Liu  <sihui_liu@apple.com>
    217

  • trunk/Source/WebKit/PlatformFTW.cmake

    r248444 r248755  
    292292    UIProcess/API/C/WKPagePolicyClient.h
    293293    UIProcess/API/C/WKPagePrivate.h
     294    UIProcess/API/C/WKPageStateClient.h
    294295    UIProcess/API/C/WKPageRenderingProgressEvents.h
    295296    UIProcess/API/C/WKPageUIClient.h

  • trunk/Source/WebKit/Shared/ShareableBitmap.h

    r248444 r248755  
    150150#endif
    151151
    152 #if USE(CAIRO) || USE(DIRECT2D)
     152#if USE(CAIRO)
    153153    static void releaseSurfaceData(void* typelessBitmap);
    154154#endif

  • trunk/Source/WebKit/Shared/win/ShareableBitmapDirect2D.cpp

    r248444 r248755  
    9797{
    9898    m_bitmap = createSurfaceFromData(data(), m_size);
    99     ref(); // Balanced by deref in releaseSurfaceData.
    10099    return m_bitmap;
    101 }
    102 
    103 void ShareableBitmap::releaseSurfaceData(void* typelessBitmap)
    104 {
    105     static_cast<ShareableBitmap*>(typelessBitmap)->deref(); // Balanced by ref in createDirect2DSurface.
    106100}
    107101

  • trunk/Source/WebKitLegacy/ChangeLog

    r248734 r248755  
     12019-08-15  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [FTW] Enable CoreFoundation use if building for Apple target
     4        https://bugs.webkit.org/show_bug.cgi?id=200799
     5
     6        Reviewed by Alex Christensen.
     7
     8        * PlatformFTW.cmake:
     9
    1102019-08-15  Sihui Liu  <sihui_liu@apple.com>
    211

  • trunk/Source/WebKitLegacy/PlatformFTW.cmake

    r248444 r248755  
    220220    win/WebCoreSupport/WebVisitedLinkStore.h
    221221)
     222
     223if (USE_CF)
     224    list(APPEND WebKitLegacy_SOURCES_Classes
     225        cf/WebCoreSupport/WebInspectorClientCF.cpp
     226    )
     227
     228    list(APPEND WebKitLegacy_LIBRARIES
     229        ${COREFOUNDATION_LIBRARY}
     230    )
     231endif ()
    222232
    223233if (CMAKE_SIZEOF_VOID_P EQUAL 8)

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r248728 r248755  
     12019-08-15  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [FTW] Enable CoreFoundation use if building for Apple target
     4        https://bugs.webkit.org/show_bug.cgi?id=200799
     5
     6        Reviewed by Alex Christensen.
     7
     8        * FullscreenVideoController.cpp:
     9        (FullscreenVideoController::FullscreenVideoController):
     10        (FullscreenVideoController::enterFullscreen):
     11        (FullscreenVideoController::exitFullscreen):
     12        (FullscreenVideoController::createHUDWindow):
     13        * FullscreenVideoController.h:
     14        * WebView.cpp:
     15        (WebView::exitFullscreenIfNeeded):
     16
    1172019-08-15  Youenn Fablet  <youenn@apple.com>
    218

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

    r242308 r248755  
    250250    , m_rootChild(PlatformCALayerWin::create(PlatformCALayer::LayerTypeLayer, m_layerClient.get()))
    251251#endif
     252#if ENABLE(FULLSCREEN_API)
    252253    , m_fullscreenWindow(std::make_unique<MediaPlayerPrivateFullscreenWindow>(static_cast<MediaPlayerPrivateFullscreenClient*>(this)))
     254#endif
    253255{
    254256}
    … …  
    275277void FullscreenVideoController::enterFullscreen()
    276278{
     279#if ENABLE(FULLSCREEN_API)
    277280    if (!m_videoElement)
    278281        return;
    … …  
    300303
    301304    createHUDWindow();
     305#endif
    302306}
    303307
    … …  
    306310    SetWindowLongPtr(m_hudWindow, 0, 0);
    307311
     312#if ENABLE(FULLSCREEN_API)
    308313    m_fullscreenWindow = nullptr;
     314#endif
    309315
    310316    ASSERT(!IsWindow(m_hudWindow));
    … …  
    433439void FullscreenVideoController::createHUDWindow()
    434440{
     441#if ENABLE(FULLSCREEN_API)
    435442    m_hudPosition.setX((m_fullscreenSize.width() - windowWidth) / 2);
    436443    m_hudPosition.setY(m_fullscreenSize.height() * initialHUDPositionY - windowHeight / 2);
    … …  
    462469
    463470    draw();
     471#endif
    464472}
    465473

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

    r228521 r248755  
    155155    WebCore::IntSize m_fullscreenSize;
    156156    WebCore::IntPoint m_hudPosition;
     157#if ENABLE(FULLSCREEN_API)
    157158    std::unique_ptr<WebCore::MediaPlayerPrivateFullscreenWindow> m_fullscreenWindow;
     159#endif
    158160
    159161#if USE(CA)

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

    r248444 r248755  
    78817881HRESULT WebView::exitFullscreenIfNeeded()
    78827882{
     7883#if ENABLE(FULLSCREEN_API)
    78837884    if (fullScreenController() && fullScreenController()->isFullScreen())
    78847885        fullScreenController()->close();
    7885     return S_OK;
    7886 }
     7886#endif
     7887    return S_OK;
     7888}

  • trunk/Source/cmake/OptionsFTW.cmake

    r248444 r248755  
    2626
    2727# Setup library paths
     28if (DEFINED ENV{AppleApplicationSupportSDK})
     29    file(TO_CMAKE_PATH "$ENV{AppleApplicationSupportSDK}/AppleInternal" WEBKIT_LIBRARIES_DIR)
     30    set(WEBKIT_LIBRARIES_INCLUDE_DIR "${WEBKIT_LIBRARIES_DIR}/include")
     31    include_directories(${WEBKIT_LIBRARIES_INCLUDE_DIR})
     32    set(APPLE_BUILD 1)
     33endif ()
     34
    2835if (NOT WEBKIT_LIBRARIES_DIR)
    2936    if (DEFINED ENV{WEBKIT_LIBRARIES})
    … …  
    205212WEBKIT_OPTION_END()
    206213
     214if (APPLE_BUILD)
     215    include(target/icu)
     216    set(COREFOUNDATION_LIBRARY CoreFoundation${DEBUG_SUFFIX})
     217    SET_AND_EXPOSE_TO_BUILD(USE_CF ON)
     218    find_package(LibXml2 2.9.1 REQUIRED)
     219    if (ENABLE_XSLT)
     220        find_package(LibXslt 1.1.28 REQUIRED)
     221    endif ()
     222else ()
     223    find_package(ICU REQUIRED COMPONENTS data i18n uc)
     224    find_package(LibXml2 2.9.7 REQUIRED)
     225    if (ENABLE_XSLT)
     226        find_package(LibXslt 1.1.32 REQUIRED)
     227    endif ()
     228endif ()
     229
    207230find_package(CURL 7.60.0 REQUIRED)
    208 find_package(ICU REQUIRED COMPONENTS data i18n uc)
    209231find_package(JPEG 1.5.2 REQUIRED)
    210 find_package(LibXml2 2.9.7 REQUIRED)
    211232find_package(OpenSSL 2.0.0 REQUIRED)
    212233find_package(PNG 1.6.34 REQUIRED)
    … …  
    220241#     SET_AND_EXPOSE_TO_BUILD(USE_WEBP ON)
    221242# endif ()
    222 
    223 if (ENABLE_XSLT)
    224     find_package(LibXslt 1.1.32 REQUIRED)
    225 endif ()
    226243
    227244SET_AND_EXPOSE_TO_BUILD(USE_CURL ON)
Note: See TracChangeset for help on using the changeset viewer.