Changeset 224189 in webkit


Ignore:
Timestamp:
Oct 30, 2017 11:12:04 AM (6 years ago)
Author:
Michael Catanzaro
Message:

[WPE] Build more files under WebCore as unified sources and get rid of WebCorePlatformWPE build target
​https://bugs.webkit.org/show_bug.cgi?id=178964

Reviewed by Carlos Alberto Lopez Perez.

Source/WebCore:

This also gets rid of the WebCorePlatformWPE build target to simplify the build. It links to
all the same libraries as the WebCore target, so it doesn't seem to have any purpose. Bye.

Some CMake files under platform are not unified, either because there is not much to gain
(e.g. ImageDecoders, where everything is in a separate directory), or because it is complex
(e.g. GStreamer, where GObject implementations would be tricky to build unified), and
because we're limited to using only features declared in WebKitFeatures.cmake inside the
unified sources lists, which makes some of the platform files a bit tricky (notably,
anything that needs to go into WebCorePlatformGTK for the GTK port). So it's not perfect.

  • PlatformWPE.cmake:
  • SourcesWPE.txt: Added.
  • crypto/gcrypt/GCryptUtilities.h:
  • platform/Cairo.cmake:
  • platform/GCrypt.cmake:
  • platform/SourcesCairo.txt: Added.
  • platform/SourcesGCrypt.txt: Added.
  • platform/SourcesGLib.txt: Added.
  • platform/SourcesSoup.txt: Added.

Source/WebKit:

  • PlatformWPE.cmake:

Tools:

  • TestWebKitAPI/PlatformWPE.cmake:
Location:
trunk
Files:
5 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r224187 r224189  
     12017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Build more files under WebCore as unified sources and get rid of WebCorePlatformWPE build target
     4        https://bugs.webkit.org/show_bug.cgi?id=178964
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        This also gets rid of the WebCorePlatformWPE build target to simplify the build. It links to
     9        all the same libraries as the WebCore target, so it doesn't seem to have any purpose. Bye.
     10
     11        Some CMake files under platform are not unified, either because there is not much to gain
     12        (e.g. ImageDecoders, where everything is in a separate directory), or because it is complex
     13        (e.g. GStreamer, where GObject implementations would be tricky to build unified), and
     14        because we're limited to using only features declared in WebKitFeatures.cmake inside the
     15        unified sources lists, which makes some of the platform files a bit tricky (notably,
     16        anything that needs to go into WebCorePlatformGTK for the GTK port). So it's not perfect.
     17
     18        * PlatformWPE.cmake:
     19        * SourcesWPE.txt: Added.
     20        * crypto/gcrypt/GCryptUtilities.h:
     21        * platform/Cairo.cmake:
     22        * platform/GCrypt.cmake:
     23        * platform/SourcesCairo.txt: Added.
     24        * platform/SourcesGCrypt.txt: Added.
     25        * platform/SourcesGLib.txt: Added.
     26        * platform/SourcesSoup.txt: Added.
     27
    1282017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
    229

  • trunk/Source/WebCore/PlatformWPE.cmake

    r222962 r224189  
    55include(platform/ImageDecoders.cmake)
    66include(platform/TextureMapper.cmake)
     7
     8list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
     9    "SourcesWPE.txt"
     10
     11    "platform/SourcesGLib.txt"
     12    "platform/SourcesSoup.txt"
     13)
     14
     15# FIXME: This can't go into SourcesGLib.txt because it has to go into WebCorePlatformGTK.
     16list(APPEND WebCore_SOURCES
     17    platform/glib/EventHandlerGLib.cpp
     18)
    719
    820# Allow building ANGLE on platforms that don't provide X11 headers.
    … …  
    4658)
    4759
    48 list(APPEND WebCore_SOURCES
    49     accessibility/wpe/AXObjectCacheWPE.cpp
    50     accessibility/wpe/AccessibilityObjectWPE.cpp
    51 
    52     loader/soup/CachedRawResourceSoup.cpp
    53     loader/soup/SubresourceLoaderSoup.cpp
    54 
    55     page/linux/ResourceUsageOverlayLinux.cpp
    56     page/linux/ResourceUsageThreadLinux.cpp
    57 
    58     page/scrolling/ScrollingStateStickyNode.cpp
    59     page/scrolling/ScrollingThread.cpp
    60     page/scrolling/ScrollingTreeNode.cpp
    61     page/scrolling/ScrollingTreeScrollingNode.cpp
    62 
    63     page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
    64     page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
    65 
    66     platform/Cursor.cpp
    67     platform/PlatformStrategies.cpp
    68     platform/Theme.cpp
    69     platform/UserAgentQuirks.cpp
    70 
    71     platform/audio/glib/AudioBusGLib.cpp
    72 
    73     platform/glib/EventLoopGlib.cpp
    74     platform/glib/FileMonitorGLib.cpp
    75     platform/glib/FileSystemGlib.cpp
    76     platform/glib/KeyedDecoderGlib.cpp
    77     platform/glib/KeyedEncoderGlib.cpp
    78     platform/glib/LowPowerModeNotifierGLib.cpp
    79     platform/glib/MainThreadSharedTimerGLib.cpp
    80     platform/glib/SSLKeyGeneratorGLib.cpp
    81     platform/glib/SharedBufferGlib.cpp
    82     platform/glib/UserAgentGLib.cpp
    83 
    84     platform/graphics/GLContext.cpp
    85     platform/graphics/GraphicsContext3DPrivate.cpp
    86     platform/graphics/ImageSource.cpp
    87     platform/graphics/PlatformDisplay.cpp
    88     platform/graphics/WOFFFileFormat.cpp
    89 
    90     platform/graphics/egl/GLContextEGL.cpp
    91 
    92     platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
    93     platform/graphics/opengl/Extensions3DOpenGLES.cpp
    94     platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
    95     platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
    96     platform/graphics/opengl/TemporaryOpenGLSetting.cpp
    97 
    98     platform/graphics/opentype/OpenTypeVerticalData.cpp
    99 
    100     platform/graphics/wpe/PlatformDisplayWPE.cpp
    101 
    102     platform/network/glib/NetworkStateNotifierGLib.cpp
    103 
    104     platform/network/soup/AuthenticationChallengeSoup.cpp
    105     platform/network/soup/CertificateInfo.cpp
    106     platform/network/soup/CookieJarSoup.cpp
    107     platform/network/soup/CookieStorageSoup.cpp
    108     platform/network/soup/CredentialStorageSoup.cpp
    109     platform/network/soup/DNSSoup.cpp
    110     platform/network/soup/GRefPtrSoup.cpp
    111     platform/network/soup/NetworkStorageSessionSoup.cpp
    112     platform/network/soup/ProxyServerSoup.cpp
    113     platform/network/soup/ResourceErrorSoup.cpp
    114     platform/network/soup/ResourceHandleSoup.cpp
    115     platform/network/soup/ResourceRequestSoup.cpp
    116     platform/network/soup/ResourceResponseSoup.cpp
    117     platform/network/soup/SocketStreamHandleImplSoup.cpp
    118     platform/network/soup/SoupNetworkSession.cpp
    119     platform/network/soup/SynchronousLoaderClientSoup.cpp
    120     platform/network/soup/WebKitSoupRequestGeneric.cpp
    121 
    122     platform/soup/PublicSuffixSoup.cpp
    123     platform/soup/SharedBufferSoup.cpp
    124     platform/soup/URLSoup.cpp
    125 
    126     platform/text/Hyphenation.cpp
    127     platform/text/LocaleICU.cpp
    128     platform/text/TextCodecICU.cpp
    129     platform/text/TextEncodingDetectorICU.cpp
    130 
    131     platform/unix/LoggingUnix.cpp
    132 
    133     platform/xdg/MIMETypeRegistryXdg.cpp
    134 )
    135 
    136 list(APPEND WebCorePlatformWPE_SOURCES
    137     editing/wpe/EditorWPE.cpp
    138 
    139     platform/glib/EventHandlerGLib.cpp
    140 
    141     platform/graphics/egl/GLContextEGLWPE.cpp
    142 
    143     platform/graphics/wpe/IconWPE.cpp
    144     platform/graphics/wpe/ImageWPE.cpp
    145 
    146     platform/wpe/CursorWPE.cpp
    147     platform/wpe/LocalizedStringsWPE.cpp
    148     platform/wpe/PasteboardWPE.cpp
    149     platform/wpe/PlatformKeyboardEventWPE.cpp
    150     platform/wpe/PlatformPasteboardWPE.cpp
    151     platform/wpe/PlatformScreenWPE.cpp
    152     platform/wpe/RenderThemeWPE.cpp
    153     platform/wpe/ScrollbarThemeWPE.cpp
    154     platform/wpe/ThemeWPE.cpp
    155     platform/wpe/WidgetWPE.cpp
    156 )
    157 
    15860list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
    15961    ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.css
    … …  
    19092    ${WPE_INCLUDE_DIRS}
    19193)
    192 
    193 add_library(WebCorePlatformWPE ${WebCore_LIBRARY_TYPE} ${WebCorePlatformWPE_SOURCES})
    194 add_dependencies(WebCorePlatformWPE WebCore)
    195 target_include_directories(WebCorePlatformWPE PRIVATE
    196     ${WebCore_INCLUDE_DIRECTORIES}
    197 )
    198 target_include_directories(WebCorePlatformWPE SYSTEM PRIVATE
    199     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
    200 )
    201 target_link_libraries(WebCorePlatformWPE
    202     ${WebCore_LIBRARIES}
    203 )

  • trunk/Source/WebCore/crypto/gcrypt/GCryptUtilities.h

    r220253 r224189  
    2626 */
    2727
     28#pragma once
     29
    2830#include "CryptoAlgorithmIdentifier.h"
    2931#include <array>

  • trunk/Source/WebCore/platform/Cairo.cmake

    r222603 r224189  
    44)
    55
    6 list(APPEND WebCore_SOURCES
    7     platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
    8     platform/graphics/cairo/CairoUtilities.cpp
    9     platform/graphics/cairo/FloatRectCairo.cpp
    10     platform/graphics/cairo/FontCairo.cpp
    11     platform/graphics/cairo/GradientCairo.cpp
    12     platform/graphics/cairo/GraphicsContext3DCairo.cpp
    13     platform/graphics/cairo/GraphicsContextCairo.cpp
    14     platform/graphics/cairo/ImageBufferCairo.cpp
    15     platform/graphics/cairo/ImageCairo.cpp
    16     platform/graphics/cairo/IntRectCairo.cpp
    17     platform/graphics/cairo/NativeImageCairo.cpp
    18     platform/graphics/cairo/PathCairo.cpp
    19     platform/graphics/cairo/PatternCairo.cpp
    20     platform/graphics/cairo/PlatformContextCairo.cpp
    21     platform/graphics/cairo/PlatformPathCairo.cpp
    22     platform/graphics/cairo/RefPtrCairo.cpp
     6list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
     7    "platform/SourcesCairo.txt"
    238)
    249

  • trunk/Source/WebCore/platform/GCrypt.cmake

    r219676 r224189  
    11if (ENABLE_SUBTLE_CRYPTO)
    2     list(APPEND WebCore_SOURCES
    3         crypto/gcrypt/CryptoAlgorithmAES_CBCGCrypt.cpp
    4         crypto/gcrypt/CryptoAlgorithmAES_CFBGCrypt.cpp
    5         crypto/gcrypt/CryptoAlgorithmAES_CTRGCrypt.cpp
    6         crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp
    7         crypto/gcrypt/CryptoAlgorithmAES_KWGCrypt.cpp
    8         crypto/gcrypt/CryptoAlgorithmECDHGCrypt.cpp
    9         crypto/gcrypt/CryptoAlgorithmECDSAGCrypt.cpp
    10         crypto/gcrypt/CryptoAlgorithmHKDFGCrypt.cpp
    11         crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp
    12         crypto/gcrypt/CryptoAlgorithmPBKDF2GCrypt.cpp
    13         crypto/gcrypt/CryptoAlgorithmRSAES_PKCS1_v1_5GCrypt.cpp
    14         crypto/gcrypt/CryptoAlgorithmRSASSA_PKCS1_v1_5GCrypt.cpp
    15         crypto/gcrypt/CryptoAlgorithmRSA_OAEPGCrypt.cpp
    16         crypto/gcrypt/CryptoAlgorithmRSA_PSSGCrypt.cpp
    17         crypto/gcrypt/CryptoAlgorithmRegistryGCrypt.cpp
    18         crypto/gcrypt/CryptoKeyECGCrypt.cpp
    19         crypto/gcrypt/CryptoKeyRSAGCrypt.cpp
    20         crypto/gcrypt/SerializedCryptoKeyWrapGCrypt.cpp
     2    list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
     3        "platform/SourcesGCrypt.txt"
    214    )
    225endif ()

  • trunk/Source/WebKit/ChangeLog

    r224179 r224189  
     12017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Build more files under WebCore as unified sources and get rid of WebCorePlatformWPE build target
     4        https://bugs.webkit.org/show_bug.cgi?id=178964
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        * PlatformWPE.cmake:
     9
    1102017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
    211

  • trunk/Source/WebKit/PlatformWPE.cmake

    r223953 r224189  
    435435
    436436list(APPEND WebKit_LIBRARIES
    437     WebCorePlatformWPE
     437    WebCore
    438438    ${CAIRO_LIBRARIES}
    439439    ${FREETYPE2_LIBRARIES}

  • trunk/Tools/ChangeLog

    r224180 r224189  
     12017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Build more files under WebCore as unified sources and get rid of WebCorePlatformWPE build target
     4        https://bugs.webkit.org/show_bug.cgi?id=178964
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        * TestWebKitAPI/PlatformWPE.cmake:
     9
    1102017-10-12  Frederic Wang  <fwang@igalia.com>
    211

  • trunk/Tools/TestWebKitAPI/PlatformWPE.cmake

    r222962 r224189  
    5757)
    5858
    59 target_link_libraries(TestWebCore ${test_webcore_LIBRARIES} -Wl,--start-group WebCore WebCoreDerivedSources WebCorePlatformWPE -Wl,--end-group)
     59target_link_libraries(TestWebCore ${test_webcore_LIBRARIES} -Wl,--start-group WebCore WebCoreDerivedSources -Wl,--end-group)
    6060add_dependencies(TestWebCore ${ForwardingHeadersForTestWebKitAPI_NAME})
    6161
Note: See TracChangeset for help on using the changeset viewer.