Changeset 189749 in webkit


Ignore:
Timestamp:
Sep 14, 2015 2:22:46 PM (9 years ago)
Author:
achristensen@apple.com
Message:

Progress towards CMake on Mac.
​https://bugs.webkit.org/show_bug.cgi?id=149123

Reviewed by Chris Dumez.

.:

  • Source/cmake/OptionsMac.cmake:
  • Source/cmake/WebKitFeatures.cmake:

Defined and enabled some more features needed on Mac.

  • Source/cmake/WebKitMacros.cmake:

Objective C bindings need special changes when generating:
Some of the bindings do not generate a .mm file but the header is needed.
Some of the bindings do generate a .mm file that doesn't compile but the header is needed.
In order to handle these cases, it is necessary to change the GENERATE_BINDINGS macro just for ObjC.

Source/JavaScriptCore:

  • CMakeLists.txt:

Make forwarding headers for the replay subdirectory.

  • PlatformMac.cmake:

Make forwarding headers for the generated inspector headers.
They should eventually either be packaged correctly with JavaScriptCore headers and included correctly.

Source/WebCore:

  • CMakeLists.txt:

Added some more files.

  • PlatformMac.cmake:

Added more files and listed the strange ObjC bindings.

  • contentextensions/DFACombiner.cpp:
  • contentextensions/DFACombiner.h:

Added preprocessor protection.

  • platform/FileSystem.h:

Include utility. It's needed to compile the different configurations.

  • platform/ScrollAnimator.cpp:

ScrollAnimator is an abstract class on Mac. Don't compile it.

  • platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:

FontAntialiasingStateSaver.h is only used on iOS.

  • rendering/RenderThemeMac.mm:

config.h needs to be outside the #if !PLATFORM(IOS) to compile correctly without precompiled headers.

Source/WebKit:

  • CMakeLists.txt:
  • PlatformMac.cmake:

Added more sources, make non-c99 sources compile as objc++

  • PlatformWin.cmake:

Moved WebCoreTestSupport sources and includes to CMakeLists.txt to share.

Source/WebKit/mac:

  • WebView/WebPDFDocumentExtras.mm:

(appendValuesInPDFNameSubtreeToVector):

  • WebView/WebPDFView.mm:

Removed cmake include quirks that are not needed when we include things correctly from Quartz.framework/Frameworks.

Source/WebKit2:

  • PlatformMac.cmake:

Added some more sources.

Location:
trunk
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r189490 r189749  
     12015-09-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=149123
     5
     6        Reviewed by Chris Dumez.
     7
     8        * Source/cmake/OptionsMac.cmake:
     9        * Source/cmake/WebKitFeatures.cmake:
     10        Defined and enabled some more features needed on Mac.
     11        * Source/cmake/WebKitMacros.cmake:
     12        Objective C bindings need special changes when generating:
     13        Some of the bindings do not generate a .mm file but the header is needed.
     14        Some of the bindings do generate a .mm file that doesn't compile but the header is needed.
     15        In order to handle these cases, it is necessary to change the GENERATE_BINDINGS macro just for ObjC.
     16
    1172015-09-08  Daniel Bates  <dabates@apple.com>
    218

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r189586 r189749  
    951951    parser
    952952    profiler
     953    replay
    953954    runtime
    954955    yarr

  • trunk/Source/JavaScriptCore/ChangeLog

    r189747 r189749  
     12015-09-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=149123
     5
     6        Reviewed by Chris Dumez.
     7
     8        * CMakeLists.txt:
     9        Make forwarding headers for the replay subdirectory.
     10        * PlatformMac.cmake:
     11        Make forwarding headers for the generated inspector headers.
     12        They should eventually either be packaged correctly with JavaScriptCore headers and included correctly.
     13
    1142015-09-14  Yusuke Suzuki  <utatane.tea@gmail.com>
    215

  • trunk/Source/JavaScriptCore/PlatformMac.cmake

    r188673 r189749  
    4242    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
    4343)
     44
     45# FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
     46if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h)
     47    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")
     48endif ()
     49if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h)
     50    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h "#include \"inspector/InspectorFrontendDispatchers.h\"")
     51endif ()
     52if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h)
     53    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h "#include \"inspector/InspectorProtocolObjects.h\"")
     54endif ()

  • trunk/Source/WebCore/CMakeLists.txt

    r189746 r189749  
    12461246    bridge/jsc/BridgeJSC.cpp
    12471247
     1248    contentextensions/CombinedFiltersAlphabet.cpp
    12481249    contentextensions/CombinedURLFilters.cpp
    12491250    contentextensions/CompiledContentExtension.cpp
    … …  
    12531254    contentextensions/ContentExtensionParser.cpp
    12541255    contentextensions/ContentExtensionRule.cpp
     1256    contentextensions/ContentExtensionStyleSheet.cpp
    12551257    contentextensions/ContentExtensionsBackend.cpp
    12561258    contentextensions/DFA.cpp
    12571259    contentextensions/DFABytecodeCompiler.cpp
    12581260    contentextensions/DFABytecodeInterpreter.cpp
     1261    contentextensions/DFACombiner.cpp
     1262    contentextensions/DFAMinimizer.cpp
     1263    contentextensions/DFANode.cpp
    12591264    contentextensions/NFA.cpp
    12601265    contentextensions/NFAToDFA.cpp
    … …  
    20342039    page/animation/KeyframeAnimation.cpp
    20352040
     2041    page/scrolling/AxisScrollSnapOffsets.cpp
    20362042    page/scrolling/ScrollLatchingState.cpp
    20372043    page/scrolling/ScrollingConstraints.cpp
    … …  
    20442050    page/scrolling/ScrollingStateStickyNode.cpp
    20452051    page/scrolling/ScrollingStateTree.cpp
     2052    page/scrolling/ScrollingThread.cpp
     2053    page/scrolling/ScrollingTree.cpp
     2054    page/scrolling/ScrollingTreeFrameScrollingNode.cpp
     2055    page/scrolling/ScrollingTreeNode.cpp
     2056    page/scrolling/ScrollingTreeOverflowScrollingNode.cpp
     2057    page/scrolling/ScrollingTreeScrollingNode.cpp
     2058    page/scrolling/ThreadedScrollingTree.cpp
    20462059
    20472060    platform/CalculationValue.cpp

  • trunk/Source/WebCore/ChangeLog

    r189746 r189749  
     12015-09-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=149123
     5
     6        Reviewed by Chris Dumez.
     7
     8        * CMakeLists.txt:
     9        Added some more files.
     10        * PlatformMac.cmake:
     11        Added more files and listed the strange ObjC bindings.
     12        * contentextensions/DFACombiner.cpp:
     13        * contentextensions/DFACombiner.h:
     14        Added preprocessor protection.
     15        * platform/FileSystem.h:
     16        Include utility.  It's needed to compile the different configurations.
     17        * platform/ScrollAnimator.cpp:
     18        ScrollAnimator is an abstract class on Mac.  Don't compile it.
     19        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
     20        FontAntialiasingStateSaver.h is only used on iOS.
     21        * rendering/RenderThemeMac.mm:
     22        config.h needs to be outside the #if !PLATFORM(IOS) to compile correctly without precompiled headers.
     23
    1242015-09-14  Brady Eidson  <beidson@apple.com>
    225

  • trunk/Source/WebCore/PlatformMac.cmake

    r188127 r189749  
     1find_library(QUARTZ_FRAMEWORK Quartz)
     2add_definitions(-iframework ${QUARTZ_FRAMEWORK}/Frameworks)
     3
    14list(APPEND WebCore_INCLUDE_DIRECTORIES
     5    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
     6    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
     7    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
     8    "${JAVASCRIPTCORE_DIR}/replay"
     9    "${THIRDPARTY_DIR}/ANGLE"
     10    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    211    "${WEBCORE_DIR}/accessibility/mac"
    312    "${WEBCORE_DIR}/bindings/objc"
    … …  
    514    "${WEBCORE_DIR}/editing/cocoa"
    615    "${WEBCORE_DIR}/editing/mac"
     16    "${WEBCORE_DIR}/ForwardingHeaders"
     17    "${WEBCORE_DIR}/ForwardingHeaders/bindings"
     18    "${WEBCORE_DIR}/ForwardingHeaders/bytecode"
     19    "${WEBCORE_DIR}/ForwardingHeaders/debugger"
     20    "${WEBCORE_DIR}/ForwardingHeaders/heap"
     21    "${WEBCORE_DIR}/ForwardingHeaders/inspector"
     22    "${WEBCORE_DIR}/ForwardingHeaders/interpreter"
     23    "${WEBCORE_DIR}/ForwardingHeaders/jit"
     24    "${WEBCORE_DIR}/ForwardingHeaders/masm"
     25    "${WEBCORE_DIR}/ForwardingHeaders/parser"
     26    "${WEBCORE_DIR}/ForwardingHeaders/profiler"
     27    "${WEBCORE_DIR}/ForwardingHeaders/replay"
     28    "${WEBCORE_DIR}/ForwardingHeaders/runtime"
     29    "${WEBCORE_DIR}/ForwardingHeaders/yarr"
    730    "${WEBCORE_DIR}/icu"
    831    "${WEBCORE_DIR}/loader/archive/cf"
    … …  
    1134    "${WEBCORE_DIR}/page/cocoa"
    1235    "${WEBCORE_DIR}/page/mac"
     36    "${WEBCORE_DIR}/page/scrolling/mac"
    1337    "${WEBCORE_DIR}/platform/audio/mac"
    1438    "${WEBCORE_DIR}/platform/cf"
    … …  
    1842    "${WEBCORE_DIR}/platform/graphics/avfoundation/objc"
    1943    "${WEBCORE_DIR}/platform/graphics/ca"
    20     "${WEBCORE_DIR}/platform/graphics/ca/mac"
     44    "${WEBCORE_DIR}/platform/graphics/ca/cocoa"
    2145    "${WEBCORE_DIR}/platform/graphics/cocoa"
    2246    "${WEBCORE_DIR}/platform/graphics/cg"
    … …  
    3357    "${WEBCORE_DIR}/platform/spi/cg"
    3458    "${WEBCORE_DIR}/platform/spi/cocoa"
     59    "${WEBCORE_DIR}/platform/spi/ios"
    3560    "${WEBCORE_DIR}/platform/spi/mac"
    3661    "${WEBCORE_DIR}/plugins/mac"
     62    "${WTF_DIR}"
     63)
     64
     65list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
     66    ${WEBCORE_DIR}/html/shadow/mac/imageControlsMac.css
     67    ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.css
     68)
     69
     70add_custom_command(
     71    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp
     72    MAIN_DEPENDENCY ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.js
     73    DEPENDS Scripts/make-js-file-arrays.py
     74    COMMAND PYTHONPATH=${WebCore_INSPECTOR_SCRIPTS_DIR} ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Scripts/make-js-file-arrays.py ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.js
     75    VERBATIM)
     76
     77#FIXME: Use ios-encodings.txt once we get CMake working for iOS.
     78add_custom_command(
     79    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
     80    MAIN_DEPENDENCY ${WEBCORE_DIR}/platform/text/mac/make-charset-table.pl
     81    DEPENDS platform/text/mac/character-sets.txt
     82    DEPENDS platform/text/mac/mac-encodings.txt
     83    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/platform/text/mac/make-charset-table.pl ${WEBCORE_DIR}/platform/text/mac/character-sets.txt ${WEBCORE_DIR}/platform/text/mac/mac-encodings.txt kTextEncoding > ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
     84    VERBATIM)
     85
     86list(APPEND WebCore_SOURCES
     87    ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
     88    ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp
    3789)
    3890
    … …  
    4395
    4496list(APPEND WebCore_SOURCES
     97    Modules/indieui/UIRequestEvent.cpp
     98
     99    Modules/plugins/QuickTimePluginReplacement.mm
     100    Modules/plugins/YouTubePluginReplacement.cpp
     101
    45102    accessibility/mac/AXObjectCacheMac.mm
    46103    accessibility/mac/AccessibilityObjectMac.mm
    47104    accessibility/mac/WebAccessibilityObjectWrapperBase.mm
    48105    accessibility/mac/WebAccessibilityObjectWrapperMac.mm
     106
     107    bindings/js/ScriptControllerMac.mm
    49108
    50109    bindings/objc/DOM.mm
    … …  
    64123    bindings/objc/WebScriptObject.mm
    65124
     125    bridge/objc/ObjCRuntimeObject.mm
     126    bridge/objc/objc_class.mm
     127    bridge/objc/objc_instance.mm
     128    bridge/objc/objc_runtime.mm
     129    bridge/objc/objc_utility.mm
     130
    66131    crypto/CommonCryptoUtilities.cpp
    67132    crypto/CryptoAlgorithm.cpp
    … …  
    102167    crypto/mac/SerializedCryptoKeyWrapMac.mm
    103168
     169    dom/DataTransferMac.mm
     170
     171    editing/SelectionRectGatherer.cpp
     172    editing/SmartReplaceCF.cpp
     173
     174    editing/cocoa/EditorCocoa.mm
    104175    editing/cocoa/HTMLConverter.mm
    105176
    … …  
    112183    editing/mac/TextUndoInsertionMarkupMac.mm
    113184
     185    fileapi/FileMac.mm
     186
     187    html/shadow/ImageControlsRootElement.cpp
     188    html/shadow/YouTubeEmbedShadowElement.cpp
     189
     190    html/shadow/mac/ImageControlsButtonElementMac.cpp
     191    html/shadow/mac/ImageControlsRootElementMac.cpp
     192
    114193    history/mac/HistoryItemMac.mm
     194
     195    loader/ResourceLoadInfo.cpp
    115196
    116197    loader/archive/cf/LegacyWebArchive.cpp
    117198    loader/archive/cf/LegacyWebArchiveMac.mm
    118199
     200    loader/cocoa/DiskCacheMonitorCocoa.mm
     201    loader/cocoa/SubresourceLoaderCocoa.mm
     202
    119203    loader/cf/ResourceLoaderCFNet.cpp
    120204    loader/cf/SubresourceLoaderCF.cpp
     205
     206    loader/mac/DocumentLoaderMac.cpp
     207    loader/mac/LoaderNSURLExtras.mm
     208    loader/mac/ResourceLoaderMac.mm
     209
     210    page/CaptionUserPreferencesMediaAF.cpp
     211    page/PageDebuggable.cpp
    121212
    122213    page/cocoa/UserAgent.mm
    … …  
    126217    page/mac/EventHandlerMac.mm
    127218    page/mac/PageMac.cpp
     219    page/mac/ServicesOverlayController.mm
    128220    page/mac/SettingsMac.mm
     221    page/mac/TextIndicatorWindow.mm
    129222    page/mac/UserAgentMac.mm
    130223
     224    page/scrolling/AsyncScrollingCoordinator.cpp
     225
     226    page/scrolling/cocoa/ScrollingStateNode.mm
     227
     228    page/scrolling/mac/ScrollingCoordinatorMac.mm
     229    page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm
     230    page/scrolling/mac/ScrollingThreadMac.mm
     231    page/scrolling/mac/ScrollingTreeFixedNode.mm
     232    page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
     233    page/scrolling/mac/ScrollingTreeMac.cpp
     234    page/scrolling/mac/ScrollingTreeStickyNode.mm
     235
    131236    platform/LocalizedStrings.cpp
     237    platform/ScrollableArea.cpp
     238    platform/VNodeTracker.cpp
     239
     240    platform/audio/AudioSession.cpp
    132241
    133242    platform/audio/mac/AudioBusMac.mm
    … …  
    152261    platform/cocoa/DisplaySleepDisablerCocoa.cpp
    153262    platform/cocoa/KeyEventCocoa.mm
     263    platform/cocoa/LocalizedStringsCocoa.mm
     264    platform/cocoa/MachSendRight.cpp
    154265    platform/cocoa/MemoryPressureHandlerCocoa.mm
     266    platform/cocoa/NetworkExtensionContentFilter.mm
     267    platform/cocoa/ParentalControlsContentFilter.mm
     268    platform/cocoa/ScrollController.mm
    155269    platform/cocoa/SystemVersion.mm
    156270    platform/cocoa/TelephoneNumberDetectorCocoa.cpp
     271    platform/cocoa/ThemeCocoa.cpp
     272    platform/cocoa/VNodeTrackerCocoa.cpp
     273
     274    platform/graphics/DisplayRefreshMonitor.cpp
     275    platform/graphics/DisplayRefreshMonitorManager.cpp
     276    platform/graphics/FontPlatformData.cpp
    157277
    158278    platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
    … …  
    188308    platform/graphics/ca/TileGrid.cpp
    189309    platform/graphics/ca/TransformationMatrixCA.cpp
     310
     311    platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp
     312    platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm
     313    platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm
     314    platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
     315    platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm
     316    platform/graphics/ca/cocoa/WebTiledBackingLayer.mm
    190317
    191318    platform/graphics/cg/BitmapImageCG.cpp
    … …  
    213340    platform/graphics/cg/TransformationMatrixCG.cpp
    214341
     342    platform/graphics/cocoa/FontCacheCoreText.cpp
    215343    platform/graphics/cocoa/FontCascadeCocoa.mm
    216344    platform/graphics/cocoa/FontCocoa.mm
    … …  
    238366    platform/graphics/mac/IntRectMac.mm
    239367    platform/graphics/mac/IntSizeMac.mm
     368    platform/graphics/mac/MediaPlayerPrivateQTKit.mm
    240369    platform/graphics/mac/MediaTimeQTKit.mm
    241370    platform/graphics/mac/PDFDocumentImageMac.mm
    … …  
    276405    platform/mac/PlatformScreenMac.mm
    277406    platform/mac/PlatformSpeechSynthesizerMac.mm
     407    platform/mac/PowerObserverMac.cpp
    278408    platform/mac/PublicSuffixMac.mm
    279409    platform/mac/SSLKeyGeneratorMac.cpp
    … …  
    353483    platform/text/mac/TextBreakIteratorInternalICUMac.mm
    354484    platform/text/mac/TextCodecMac.cpp
     485
     486    rendering/RenderThemeMac.mm
     487    rendering/TextAutoSizing.cpp
    355488)
    356489
    … …  
    400533    loader/archive
    401534    loader/cache
     535    loader/cocoa
    402536
    403537    loader/archive/cf
    … …  
    412546    platform/graphics
    413547    platform/mac
     548    platform/mediastream
    414549    platform/mock
    415550    platform/network
    … …  
    510645    ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
    511646)
     647
     648set(ObjC_BINDINGS_NO_MM
     649    AbstractView
     650    AbstractWorker
     651    ChildNode
     652    DOMURLMediaSource
     653    DOMURLMediaStream
     654    DOMWindowIndexedDatabase
     655    DOMWindowNotifications
     656    DOMWindowSpeechSynthesis
     657    DOMWindowWebDatabase
     658    EventListener
     659    EventTarget
     660    GlobalEventHandlers
     661    HTMLMediaElementMediaSession
     662    HTMLMediaElementMediaStream
     663    NavigatorBattery
     664    NavigatorContentUtils
     665    NavigatorGamepad
     666    NavigatorGeolocation
     667    NavigatorMediaDevices
     668    NavigatorUserMedia
     669    NavigatorVibration
     670    NodeFilter
     671    NonDocumentTypeChildNode
     672    NonElementParentNode
     673    ParentNode
     674    URLUtils
     675    WindowBase64
     676    WindowEventHandlers
     677    WindowTimers
     678    WorkerGlobalScopeIndexedDatabase
     679    WorkerGlobalScopeNotifications
     680    XPathNSResolver
     681)
     682
    512683GENERATE_BINDINGS(WebCore_SOURCES
    513684    "${OBJC_BINDINGS_IDL_FILES}"
    … …  
    520691    ${ADDITIONAL_BINDINGS_DEPENDENCIES})
    521692
    522 list(REMOVE_ITEM WebCore_SOURCES
    523     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAbstractView.mm
    524     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAbstractWorker.mm
    525     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAnalyserNode.mm
    526     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioBuffer.mm
    527     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioBufferSourceNode.mm
    528     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioContext.mm
    529     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioDestinationNode.mm
    530     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioNode.mm
    531     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioParam.mm
    532     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBiquadFilterNode.mm
    533     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCanvasRenderingContext2D.mm
    534     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChannelMergerNode.mm
    535     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChannelSplitterNode.mm
    536     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChildNode.mm
    537     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCommandLineAPIHost.mm
    538     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMConvolverNode.mm
    539     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCoordinates.mm
    540     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCountQueuingStrategy.mm
    541     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCrypto.mm
    542     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCryptoKey.mm
    543     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCustomEvent.mm
    544     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDataCue.mm
    545     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDataTransfer.mm
    546     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDedicatedWorkerGlobalScope.mm
    547     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDelayNode.mm
    548     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMCoreException.mm
    549     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMFormData.mm
    550     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMPath.mm
    551     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMSettableTokenList.mm
    552     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMStringMap.mm
    553     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURL.mm
    554     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURLMediaSource.mm
    555     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURLMediaStream.mm
    556     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindow.mm
    557     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowIndexedDatabase.mm
    558     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowNotifications.mm
    559     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowSpeechSynthesis.mm
    560     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowWebDatabase.mm
    561     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDynamicsCompressorNode.mm
    562     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEventListener.mm
    563     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEventTarget.mm
    564     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileException.mm
    565     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileReader.mm
    566     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileReaderSync.mm
    567     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMGainNode.mm
    568     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMGeolocation.mm
    569     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHistory.mm
    570     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFormControlsCollection.mm
    571     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMediaElement.mm
    572     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMediaElementMediaSession.mm
    573     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMediaElementMediaStream.mm
    574     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTrackElement.mm
    575     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLVideoElement.mm
    576     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBAny.mm
    577     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursor.mm
    578     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursor.mm
    579     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursorWithValue.mm
    580     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursorWithValue.mm
    581     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBDatabase.mm
    582     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBDatabase.mm
    583     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBFactory.mm
    584     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBFactory.mm
    585     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBIndex.mm
    586     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBIndex.mm
    587     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBKeyRange.mm
    588     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBKeyRange.mm
    589     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBObjectStore.mm
    590     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBObjectStore.mm
    591     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBOpenDBRequest.mm
    592     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBOpenDBRequest.mm
    593     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBRequest.mm
    594     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBRequest.mm
    595     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBTransaction.mm
    596     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBTransaction.mm
    597     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBVersionChangeEvent.mm
    598     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBVersionChangeEvent.mm
    599     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMInspectorFrontendHost.mm
    600     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMLocation.mm
    601     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaControlsHost.mm
    602     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaElementAudioSourceNode.mm
    603     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaSource.mm
    604     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMutationObserver.mm
    605     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigator.mm
    606     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorBattery.mm
    607     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorContentUtils.mm
    608     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorGamepad.mm
    609     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorGeolocation.mm
    610     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorMediaDevices.mm
    611     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorUserMedia.mm
    612     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorVibration.mm
    613     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNodeFilter.mm
    614     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNotification.mm
    615     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMOfflineAudioContext.mm
    616     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMOscillatorNode.mm
    617     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMPannerNode.mm
    618     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMPopStateEvent.mm
    619     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRadioNodeList.mm
    620     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMReadableStream.mm
    621     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMReadableStreamReader.mm
    622     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProcessorNode.mm
    623     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProfile.mm
    624     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProfileNode.mm
    625     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSourceBuffer.mm
    626     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSourceBufferList.mm
    627     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLError.mm
    628     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLException.mm
    629     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLResultSetRowList.mm
    630     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLStatementErrorCallback.mm
    631     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLTransaction.mm
    632     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLTransactionErrorCallback.mm
    633     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSubtleCrypto.mm
    634     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMTrackEvent.mm
    635     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMUIRequestEvent.mm
    636     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMURLUtils.mm
    637     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMVTTCue.mm
    638     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWaveShaperNode.mm
    639     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGL2RenderingContext.mm
    640     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGLRenderingContext.mm
    641     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGLRenderingContextBase.mm
    642     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebSocket.mm
    643     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowBase64.mm
    644     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowIndexedDatabase.mm
    645     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowTimers.mm
    646     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorker.mm
    647     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScope.mm
    648     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeIndexedDatabase.mm
    649     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeIndexedDatabase.mm
    650     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeNotifications.mm
    651     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXMLHttpRequest.mm
    652     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXMLHttpRequestProgressEvent.mm
    653     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXPathNSResolver.mm
    654 )
     693list(APPEND WebCore_SOURCES
     694    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAttr.mm
     695    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBeforeLoadEvent.mm
     696    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCDATASection.mm
     697    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCharacterData.mm
     698    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMComment.mm
     699    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCounter.mm
     700    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSCharsetRule.mm
     701    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSFontFaceRule.mm
     702    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSImportRule.mm
     703    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSKeyframeRule.mm
     704    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSKeyframesRule.mm
     705    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSMediaRule.mm
     706    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSPageRule.mm
     707    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSPrimitiveValue.mm
     708    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSRule.mm
     709    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSRuleList.mm
     710    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSStyleDeclaration.mm
     711    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSStyleRule.mm
     712    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSStyleSheet.mm
     713    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSSupportsRule.mm
     714    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSUnknownRule.mm
     715    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSValue.mm
     716    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSValueList.mm
     717    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDocument.mm
     718    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDocumentFragment.mm
     719    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDocumentType.mm
     720    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMImplementation.mm
     721    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMNamedFlowCollection.mm
     722    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMTokenList.mm
     723    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMElement.mm
     724    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEntity.mm
     725    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEntityReference.mm
     726    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEvent.mm
     727    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFile.mm
     728    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileList.mm
     729    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLAnchorElement.mm
     730    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLAppletElement.mm
     731    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLAreaElement.mm
     732    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLBaseElement.mm
     733    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLBaseFontElement.mm
     734    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLBodyElement.mm
     735    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLBRElement.mm
     736    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLButtonElement.mm
     737    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLCanvasElement.mm
     738    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLCollection.mm
     739    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLDirectoryElement.mm
     740    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLDivElement.mm
     741    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLDListElement.mm
     742    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLDocument.mm
     743    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLElement.mm
     744    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLEmbedElement.mm
     745    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFieldSetElement.mm
     746    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFontElement.mm
     747    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFormElement.mm
     748    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFrameElement.mm
     749    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFrameSetElement.mm
     750    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLHeadElement.mm
     751    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLHeadingElement.mm
     752    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLHRElement.mm
     753    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLHtmlElement.mm
     754    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLIFrameElement.mm
     755    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLImageElement.mm
     756    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLInputElement.mm
     757    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLLabelElement.mm
     758    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLLegendElement.mm
     759    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLLIElement.mm
     760    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLLinkElement.mm
     761    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMapElement.mm
     762    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMarqueeElement.mm
     763    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMenuElement.mm
     764    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMetaElement.mm
     765    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLModElement.mm
     766    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLObjectElement.mm
     767    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLOListElement.mm
     768    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLOptGroupElement.mm
     769    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLOptionElement.mm
     770    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLOptionsCollection.mm
     771    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLParagraphElement.mm
     772    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLParamElement.mm
     773    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLPreElement.mm
     774    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLQuoteElement.mm
     775    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLScriptElement.mm
     776    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLSelectElement.mm
     777    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLStyleElement.mm
     778    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableCaptionElement.mm
     779    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableCellElement.mm
     780    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableColElement.mm
     781    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableElement.mm
     782    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableRowElement.mm
     783    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableSectionElement.mm
     784    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTextAreaElement.mm
     785    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTitleElement.mm
     786    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLUListElement.mm
     787    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMKeyboardEvent.mm
     788    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaList.mm
     789    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMessageEvent.mm
     790    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMessagePort.mm
     791    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMouseEvent.mm
     792    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMutationEvent.mm
     793    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNamedNodeMap.mm
     794    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNode.mm
     795    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNodeIterator.mm
     796    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNodeList.mm
     797    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMOverflowEvent.mm
     798    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMProcessingInstruction.mm
     799    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMProgressEvent.mm
     800    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRange.mm
     801    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRect.mm
     802    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRGBColor.mm
     803    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMStyleSheet.mm
     804    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMStyleSheetList.mm
     805    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMText.mm
     806    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMTextEvent.mm
     807    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMTreeWalker.mm
     808    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMUIEvent.mm
     809    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMValidityState.mm
     810    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebKitCSSFilterValue.mm
     811    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebKitCSSRegionRule.mm
     812    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebKitCSSTransformValue.mm
     813    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebKitNamedFlow.mm
     814    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWheelEvent.mm
     815    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXPathExpression.mm
     816    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXPathResult.mm
     817)

  • trunk/Source/WebCore/contentextensions/DFACombiner.cpp

    r186491 r189749  
    2727#include "DFACombiner.h"
    2828
     29#if ENABLE(CONTENT_EXTENSIONS)
     30
    2931#include "MutableRangeList.h"
    3032#include <wtf/HashMap.h>
    … …  
    222224
    223225} // namespace WebCore
     226
     227#endif

  • trunk/Source/WebCore/contentextensions/DFACombiner.h

    r185230 r189749  
    2727#define DFACombiner_h
    2828
     29#if ENABLE(CONTENT_EXTENSIONS)
     30
    2931#include "DFA.h"
    3032#include <wtf/Vector.h>
    … …  
    5456
    5557#endif
     58
     59#endif

  • trunk/Source/WebCore/platform/FileSystem.h

    r184331 r189749  
    3333
    3434#include <time.h>
     35#include <utility>
    3536#include <wtf/Forward.h>
    3637#include <wtf/Vector.h>

  • trunk/Source/WebCore/platform/ScrollAnimator.cpp

    r185762 r189749  
    4141namespace WebCore {
    4242
    43 #if !ENABLE(SMOOTH_SCROLLING) && !PLATFORM(IOS)
     43#if !ENABLE(SMOOTH_SCROLLING) && !PLATFORM(IOS) && !PLATFORM(MAC)
    4444std::unique_ptr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
    4545{

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

    r187494 r189749  
    2929#import "AnimationUtilities.h"
    3030#import "BlockExceptions.h"
    31 #import "FontAntialiasingStateSaver.h"
    3231#import "GraphicsContext.h"
    3332#import "GraphicsLayerCA.h"
    … …  
    5453
    5554#if PLATFORM(IOS)
     55#import "FontAntialiasingStateSaver.h"
    5656#import "WAKWindow.h"
    5757#import "WKGraphics.h"

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r189144 r189749  
    1717 * Boston, MA 02110-1301, USA.
    1818 */
     19#import "config.h"
     20
    1921#if !PLATFORM(IOS)
    2022
    21 #import "config.h"
    2223#import "RenderThemeMac.h"
    2324

  • trunk/Source/WebKit/CMakeLists.txt

    r188673 r189749  
    33
    44set(WebKit_SOURCES
     5    WebCoreSupport/WebViewGroup.cpp
    56)
    67
    78set(WebKit_INCLUDE_DIRECTORIES
     9    WebCoreSupport
    810    "${CMAKE_BINARY_DIR}"
    911    "${CMAKE_SOURCE_DIR}/Source"

  • trunk/Source/WebKit/ChangeLog

    r189675 r189749  
     12015-09-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=149123
     5
     6        Reviewed by Chris Dumez.
     7
     8        * CMakeLists.txt:
     9        * PlatformMac.cmake:
     10        Added more sources, make non-c99 sources compile as objc++
     11        * PlatformWin.cmake:
     12        Moved WebCoreTestSupport sources and includes to CMakeLists.txt to share.
     13
    1142015-09-13  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
    215

  • trunk/Source/WebKit/PlatformMac.cmake

    r187997 r189749  
    1313find_library(SECURITY_LIBRARY Security)
    1414find_library(SQLITE3_LIBRARY sqlite3)
     15find_library(SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
    1516find_library(XML2_LIBRARY XML2)
    1617find_package(ZLIB REQUIRED)
    1718
    18 find_library(PDFKIT_FRAMEWORK PDFKit HINTS ${QUARTZ_LIBRARY}/Versions/*/Frameworks)
    19 find_path(PDFKIT_INCLUDE_DIRECTORY PDFKit.h HINTS ${PDFKIT_FRAMEWORK}/Versions/*/Headers)
     19add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
     20find_library(PDFKIT_LIBRARY PDFKit HINTS ${QUARTZ_LIBRARY}/Frameworks)
     21find_library(QUICKLOOKUI_LIBRARY QuickLookUI HINTS ${QUARTZ_LIBRARY}/Frameworks)
    2022
    2123if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
    … …  
    3941    PRIVATE ${IOSURFACE_LIBRARY}
    4042    PRIVATE ${OPENGL_LIBRARY}
    41     PRIVATE ${PDFKIT_FRAMEWORK}/PDFKit
     43    PRIVATE ${PDFKIT_LIBRARY}
    4244    PRIVATE ${QUARTZ_LIBRARY}
    4345    PRIVATE ${QUARTZCORE_LIBRARY}
    4446    PRIVATE ${SECURITY_LIBRARY}
    4547    PRIVATE ${SQLITE3_LIBRARY}
     48    PRIVATE ${SYSTEM_CONFIGURATION_LIBRARY}
    4649    PRIVATE ${WEBKITSYSTEMINTERFACE_LIBRARY}
    4750    PRIVATE ${XML2_LIBRARY}
    … …  
    5154list(APPEND WebKit_INCLUDE_DIRECTORIES
    5255    "${DERIVED_SOURCES_DIR}"
     56    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    5357    "${DERIVED_SOURCES_WEBCORE_DIR}"
    5458    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
     59    "${JAVASCRIPTCORE_DIR}"
    5560    "${JAVASCRIPTCORE_DIR}/dfg"
    5661    "${WEBCORE_DIR}/accessibility/mac"
    … …  
    8388    "${WEBCORE_DIR}/platform/text/mac"
    8489    "${WEBCORE_DIR}/plugins/mac"
     90    "${WTF_DIR}"
    8591    ../../WebKitLibraries
    8692)
    8793
    8894list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
    89     "${PDFKIT_INCLUDE_DIRECTORY}"
    9095    mac
    9196    mac/Carbon
    … …  
    106111
    107112list(APPEND WebKit_SOURCES
     113    cf/WebCoreSupport/WebInspectorClientCF.cpp
     114
    108115    Storage/StorageAreaImpl.cpp
    109116    Storage/StorageAreaSync.cpp
    … …  
    121128    mac/Carbon/HIViewAdapter.m
    122129    mac/Carbon/HIWebView.mm
     130
     131    mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
     132    mac/DefaultDelegates/WebDefaultEditingDelegate.m
     133    mac/DefaultDelegates/WebDefaultPolicyDelegate.m
     134    mac/DefaultDelegates/WebDefaultUIDelegate.m
    123135
    124136    mac/History/BinaryPropertyList.cpp
    … …  
    226238    mac/WebCoreSupport/WebSystemInterface.mm
    227239    mac/WebCoreSupport/WebUserMediaClient.mm
     240    mac/WebCoreSupport/WebVisitedLinkStore.mm
    228241
    229242    mac/WebInspector/WebInspector.mm
    … …  
    249262    mac/WebView/WebHTMLRepresentation.mm
    250263    mac/WebView/WebHTMLView.mm
     264    mac/WebView/WebImmediateActionController.mm
    251265    mac/WebView/WebIndicateLayer.mm
    252266    mac/WebView/WebJSPDFDoc.mm
    … …  
    272286set(WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES
    273287    mac/DOM
     288    mac/DefaultDelegates
    274289    mac/History
    275290    mac/Misc
    … …  
    313328add_definitions("-include WebKitPrefix.h")
    314329
    315 set_source_files_properties(
     330set(C99_FILES
    316331    ${WEBKIT_DIR}/mac/Carbon/CarbonUtils.m
    317332    ${WEBKIT_DIR}/mac/Carbon/CarbonWindowContentView.m
    318333    ${WEBKIT_DIR}/mac/Carbon/CarbonWindowFrame.m
    319334    ${WEBKIT_DIR}/mac/Carbon/HIViewAdapter.m
     335
     336    mac/DefaultDelegates/WebDefaultEditingDelegate.m
     337    mac/DefaultDelegates/WebDefaultPolicyDelegate.m
     338    mac/DefaultDelegates/WebDefaultUIDelegate.m
     339
    320340    mac/History/WebURLsWithTitles.m
    321341
    … …  
    349369
    350370    mac/WebView/WebFormDelegate.m
    351 PROPERTIES COMPILE_FLAGS -std=c99)
     371)
     372
     373foreach (_file ${WebKit_SOURCES})
     374    list(FIND C99_FILES ${_file} _c99_index)
     375    if (${_c99_index} EQUAL -1)
     376        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -ObjC++)
     377    else ()
     378        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c99)
     379    endif ()
     380endforeach ()
    352381
    353382file(COPY

  • trunk/Source/WebKit/PlatformWin.cmake

    r189056 r189749  
    6363    win/plugins
    6464    win/WebCoreSupport
    65     WebCoreSupport
    6665    WebKit.vcxproj/WebKit
    6766    "${WEBKIT_DIR}/.."
    … …  
    238237
    239238list(APPEND WebKit_SOURCES_WebCoreSupport
    240     WebCoreSupport/WebViewGroup.cpp
    241     WebCoreSupport/WebViewGroup.h
    242 
    243239    win/WebCoreSupport/AcceleratedCompositingContext.cpp
    244240    win/WebCoreSupport/EmbeddedWidget.cpp

  • trunk/Source/WebKit/mac/ChangeLog

    r189654 r189749  
     12015-09-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=149123
     5
     6        Reviewed by Chris Dumez.
     7
     8        * WebView/WebPDFDocumentExtras.mm:
     9        (appendValuesInPDFNameSubtreeToVector):
     10        * WebView/WebPDFView.mm:
     11        Removed cmake include quirks that are not needed when we include things correctly from Quartz.framework/Frameworks.
     12
    1132015-09-12  Brian Burg  <bburg@apple.com>
    214

  • trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm

    r182865 r189749  
    3131
    3232#if !PLATFORM(IOS)
    33 #ifdef BUILDING_WITH_CMAKE
    34 #import <PDFDocument.h>
    35 #else
    3633#import <PDFKit/PDFDocument.h>
    37 #endif
    3834#endif
    3935

  • trunk/Source/WebKit/mac/WebView/WebPDFView.mm

    r187609 r189749  
    6666#import <wtf/CurrentTime.h>
    6767
    68 #ifdef BUILDING_WITH_CMAKE
    69 #import <PDFKit.h>
    70 #else
    7168#import <PDFKit/PDFKit.h>
    72 #endif
    7369
    7470#ifdef __has_include

  • trunk/Source/WebKit2/ChangeLog

    r189748 r189749  
     12015-09-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards CMake on Mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=149123
     5
     6        Reviewed by Chris Dumez.
     7
     8        * PlatformMac.cmake:
     9        Added some more sources.
     10
    1112015-09-14  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Source/WebKit2/PlatformMac.cmake

    r188643 r189749  
    1 #FIXME: Add Mac-specific sources here.
     1add_definitions(-ObjC++)
     2
     3find_library(PDFKIT_FRAMEWORK PDFKit HINTS ${QUARTZ_LIBRARY}/Versions/*/Frameworks)
     4
     5find_library(ACCELERATE_LIBRARY accelerate)
     6find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
     7find_library(AUDIOUNIT_LIBRARY AudioUnit)
     8find_library(CARBON_LIBRARY Carbon)
     9find_library(COCOA_LIBRARY Cocoa)
     10find_library(COREAUDIO_LIBRARY CoreAudio)
     11find_library(DISKARBITRATION_LIBRARY DiskArbitration)
     12find_library(IOKIT_LIBRARY IOKit)
     13find_library(IOSURFACE_LIBRARY IOSurface)
     14find_library(OPENGL_LIBRARY OpenGL)
     15find_library(QUARTZ_LIBRARY Quartz)
     16find_library(QUARTZCORE_LIBRARY QuartzCore)
     17find_library(SECURITY_LIBRARY Security)
     18find_library(SQLITE3_LIBRARY sqlite3)
     19find_library(XML2_LIBRARY XML2)
     20find_package(ZLIB REQUIRED)
     21
     22list(APPEND WebKit2_LIBRARIES
     23    ${ACCELERATE_LIBRARY}
     24    ${AUDIOTOOLBOX_LIBRARY}
     25    ${AUDIOUNIT_LIBRARY}
     26    ${CARBON_LIBRARY}
     27    ${COCOA_LIBRARY}
     28    ${COREAUDIO_LIBRARY}
     29    ${DISKARBITRATION_LIBRARY}
     30    ${IOKIT_LIBRARY}
     31    ${IOSURFACE_LIBRARY}
     32    ${OPENGL_LIBRARY}
     33    ${PDFKIT_FRAMEWORK}/PDFKit
     34    ${QUARTZ_LIBRARY}
     35    ${QUARTZCORE_LIBRARY}
     36    ${SECURITY_LIBRARY}
     37    ${SQLITE3_LIBRARY}
     38    ${WEBKITSYSTEMINTERFACE_LIBRARY}
     39    ${XML2_LIBRARY}
     40    ${ZLIB_LIBRARIES}
     41)
     42
     43list(APPEND WebKit2_SOURCES
     44    NetworkProcess/cocoa/NetworkProcessCocoa.mm
     45
     46    NetworkProcess/mac/NetworkDiskCacheMonitor.mm
     47    NetworkProcess/mac/NetworkProcessMac.mm
     48    NetworkProcess/mac/NetworkResourceLoaderMac.mm
     49    NetworkProcess/mac/RemoteNetworkingContext.mm
     50
     51    UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
     52    UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
     53    UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
     54    UIProcess/API/Cocoa/LegacyBundleForClass.mm
     55    UIProcess/API/Cocoa/WKBackForwardList.mm
     56    UIProcess/API/Cocoa/WKBackForwardListItem.mm
     57    UIProcess/API/Cocoa/WKError.mm
     58    UIProcess/API/Cocoa/WKFrameInfo.mm
     59    UIProcess/API/Cocoa/WKNavigation.mm
     60    UIProcess/API/Cocoa/WKNavigationAction.mm
     61    UIProcess/API/Cocoa/WKNavigationResponse.mm
     62    UIProcess/API/Cocoa/WKPreferences.mm
     63    UIProcess/API/Cocoa/WKProcessPool.mm
     64    UIProcess/API/Cocoa/WKScriptMessage.mm
     65    UIProcess/API/Cocoa/WKSecurityOrigin.mm
     66    UIProcess/API/Cocoa/WKUserContentController.mm
     67    UIProcess/API/Cocoa/WKUserScript.mm
     68    UIProcess/API/Cocoa/WKWebView.mm
     69    UIProcess/API/Cocoa/WKWebViewConfiguration.mm
     70    UIProcess/API/Cocoa/WKWebsiteDataRecord.mm
     71    UIProcess/API/Cocoa/WKWebsiteDataStore.mm
     72    UIProcess/API/Cocoa/WKWindowFeatures.mm
     73    UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
     74    UIProcess/API/Cocoa/_WKDownload.mm
     75    UIProcess/API/Cocoa/_WKElementAction.mm
     76    UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm
     77    UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
     78    UIProcess/API/Cocoa/_WKSessionState.mm
     79    UIProcess/API/Cocoa/_WKThumbnailView.mm
     80    UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
     81    UIProcess/API/Cocoa/_WKUserContentFilter.mm
     82    UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
     83
     84    UIProcess/API/mac/WKView.mm
     85
     86    UIProcess/Cocoa/DiagnosticLoggingClient.mm
     87    UIProcess/Cocoa/DownloadClient.mm
     88    UIProcess/Cocoa/FindClient.mm
     89    UIProcess/Cocoa/NavigationState.mm
     90    UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm
     91    UIProcess/Cocoa/SessionStateCoding.mm
     92    UIProcess/Cocoa/UIDelegate.mm
     93    UIProcess/Cocoa/VersionChecks.mm
     94    UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
     95    UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
     96    UIProcess/Cocoa/WebPageProxyCocoa.mm
     97    UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
     98    UIProcess/Cocoa/WebProcessPoolCocoa.mm
     99    UIProcess/Cocoa/WebProcessProxyCocoa.mm
     100
     101    UIProcess/mac/CorrectionPanel.mm
     102    UIProcess/mac/LegacySessionStateCoding.cpp
     103    UIProcess/mac/PageClientImpl.mm
     104    UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm
     105    UIProcess/mac/RemoteLayerTreeHost.mm
     106    UIProcess/mac/SecItemShimProxy.cpp
     107    UIProcess/mac/ServicesController.mm
     108    UIProcess/mac/TextCheckerMac.mm
     109    UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
     110    UIProcess/mac/ViewGestureControllerMac.mm
     111    UIProcess/mac/ViewSnapshotStore.mm
     112    UIProcess/mac/WKFullKeyboardAccessWatcher.mm
     113    UIProcess/mac/WKFullScreenWindowController.mm
     114    UIProcess/mac/WKImmediateActionController.mm
     115    UIProcess/mac/WKPrintingView.mm
     116    UIProcess/mac/WKSharingServicePickerDelegate.mm
     117    UIProcess/mac/WKTextInputWindowController.mm
     118    UIProcess/mac/WKViewLayoutStrategy.mm
     119    UIProcess/mac/WebColorPickerMac.mm
     120    UIProcess/mac/WebContextMenuProxyMac.mm
     121    UIProcess/mac/WebCookieManagerProxyMac.mm
     122    UIProcess/mac/WebInspectorProxyMac.mm
     123    UIProcess/mac/WebPageProxyMac.mm
     124    UIProcess/mac/WebPopupMenuProxyMac.mm
     125    UIProcess/mac/WebPreferencesMac.mm
     126    UIProcess/mac/WebProcessProxyMac.mm
     127    UIProcess/mac/WindowServerConnection.mm
     128)
    2129
    3130file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
    … …  
    7134    "${WEBCORE_DIR}/platform/network/cf"
    8135    "${WEBCORE_DIR}/platform/graphics/opentype"
     136    "${WEBKIT2_DIR}/NetworkProcess/cocoa"
     137    "${WEBKIT2_DIR}/NetworkProcess/mac"
    9138    "${WEBKIT2_DIR}/UIProcess/mac"
    10139    "${WEBKIT2_DIR}/UIProcess/API/C/mac"
    … …  
    16145    "${WEBKIT2_DIR}/Shared/API/c/cf"
    17146    "${WEBKIT2_DIR}/Shared/cf"
     147    "${WEBKIT2_DIR}/Shared/Cocoa"
    18148    "${WEBKIT2_DIR}/Shared/mac"
    19149    "${WEBKIT2_DIR}/Shared/Plugins/mac"

  • trunk/Source/cmake/OptionsMac.cmake

    r188643 r189749  
    66WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphonesimulator PRIVATE ON)
    77WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
     8WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
    89WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
    910WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx PRIVATE ON)
    … …  
    2728WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
    2829WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
     30WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)
    2931WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PRIVATE ON)
    3032WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
    … …  
    3436WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DASHBOARD_SUPPORT PRIVATE ON)
    3537WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DASHBOARD_SUPPORT_macosx PRIVATE ON)
     38WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
    3639WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE OFF)
    3740WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_TRANSFER_ITEMS PRIVATE OFF)
    … …  
    6164WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PRIVATE OFF)
    6265WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE ON)
     66WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GRAPHICS_CONTEXT_3D PRIVATE ON)
    6367WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING PRIVATE ON)
    6468WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_macosx PRIVATE ON)
    … …  
    146150WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR_macosx_101000 PRIVATE ON)
    147151WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY PRIVATE OFF)
     152WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE ON)
    148153WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SATURATED_LAYOUT_ARITHMETIC PRIVATE ON)
    149154WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
    150155WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
     156WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT PRIVATE ON)
    151157WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO PRIVATE ON)
    152158WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx PRIVATE ON)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r187818 r189749  
    3434    WEBKIT_OPTION_DEFINE(ENABLE_ALLINONE_BUILD "Toggle all-in-one build" PRIVATE OFF)
    3535    WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" PRIVATE OFF)
     36    WEBKIT_OPTION_DEFINE(ENABLE_ASYNC_SCROLLING "Enable asynchronouse scrolling" PRIVATE OFF)
    3637    WEBKIT_OPTION_DEFINE(ENABLE_ATTACHMENT_ELEMENT "Toggle attachment element support" PRIVATE OFF)
    3738    WEBKIT_OPTION_DEFINE(ENABLE_AVF_CAPTIONS "Toggle AVFoundation caption support" PRIVATE OFF)
    … …  
    140141    WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" PRIVATE OFF)
    141142    WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_TIMING "Toggle Resource Timing support" PRIVATE OFF)
     143    WEBKIT_OPTION_DEFINE(ENABLE_RUBBER_BANDING "Toggle rubber banding support" PRIVATE OFF)
    142144    WEBKIT_OPTION_DEFINE(ENABLE_SATURATED_LAYOUT_ARITHMETIC "Toggle saturated layout arithmetic support" PRIVATE ON)
    143145    WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" PRIVATE OFF)
    … …  
    147149    WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" PRIVATE OFF)
    148150    WEBKIT_OPTION_DEFINE(ENABLE_STREAMS_API "Toggle Streams API support" PRIVATE ON)
     151    WEBKIT_OPTION_DEFINE(ENABLE_SUBPIXEL_LAYOUT "Toggle subpixel layout support" PRIVATE OFF)
    149152    WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" PRIVATE OFF)
    150153    WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" PRIVATE ON)

  • trunk/Source/cmake/WebKitMacros.cmake

    r188673 r189749  
    7979        get_filename_component(_name ${_file} NAME_WE)
    8080
    81         add_custom_command(
    82             OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
    83             MAIN_DEPENDENCY ${_file}
    84             DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
    85             COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
    86             WORKING_DIRECTORY ${_base_dir}
    87             VERBATIM)
    88 
    89         list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.${_extension})
    90     endforeach ()
    91 endmacro()
    92 
     81        # Not all ObjC bindings generate a .mm file, and not all .mm files generated should be compiled.
     82        if (${_generator} STREQUAL "ObjC")
     83            list(FIND ObjC_BINDINGS_NO_MM ${_name} _no_mm_index)
     84            if (${_no_mm_index} EQUAL -1)
     85                set(_no_mm 0)
     86            else ()
     87                set(_no_mm 1)
     88            endif ()
     89        else ()
     90            set(_no_mm 0)
     91        endif ()
     92
     93        if (${_no_mm})
     94            add_custom_command(
     95                OUTPUT ${_destination}/${_prefix}${_name}.h
     96                MAIN_DEPENDENCY ${_file}
     97                DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
     98                COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
     99                WORKING_DIRECTORY ${_base_dir}
     100                VERBATIM)
     101
     102            list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.h)
     103        else ()
     104            add_custom_command(
     105                OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
     106                MAIN_DEPENDENCY ${_file}
     107                DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
     108                COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
     109                WORKING_DIRECTORY ${_base_dir}
     110                VERBATIM)
     111            if (${_generator} STREQUAL "ObjC")
     112                list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.h)
     113            else ()
     114                list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.${_extension})
     115            endif ()
     116        endif ()
     117    endforeach ()
     118endmacro()
    93119
    94120macro(GENERATE_FONT_NAMES _infile)
Note: See TracChangeset for help on using the changeset viewer.