Changeset 198947 in webkit


Ignore:
Timestamp:
Apr 1, 2016 9:45:58 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Compile DumpRenderTree with CMake on Mac
​https://bugs.webkit.org/show_bug.cgi?id=156088

Patch by Alex Christensen <​achristensen@webkit.org> on 2016-04-01
Reviewed by Brent Fulgham.

Source/WebCore:

  • PlatformMac.cmake:
  • platform/mock/mediasource/MockBox.cpp:

Source/WebKit:

  • PlatformMac.cmake:

Source/WebKit/mac:

  • Misc/WebKit.h:

Alphabetize headers.

Source/WebKit2:

  • CMakeLists.txt:
  • PlatformMac.cmake:
  • UIProcess/API/Cocoa/WebKitLegacy.h: Added.

Tools:

  • CMakeLists.txt:
  • DumpRenderTree/CMakeLists.txt:
  • DumpRenderTree/DefaultPolicyDelegate.m:

(-[DefaultPolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):

  • DumpRenderTree/DumpRenderTreeFileDraggingSource.m:
  • DumpRenderTree/PlatformMac.cmake: Added.
  • DumpRenderTree/PlatformWin.cmake:
  • DumpRenderTree/mac/AppleScriptController.m:

(convertAEDescToObject):

  • DumpRenderTree/mac/DumpRenderTreeMain.mm:
  • DumpRenderTree/mac/LayoutTestHelper.m:
Location:
trunk
Files:
1 added
19 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r198943 r198947  
     12016-04-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Compile DumpRenderTree with CMake on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=156088
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * PlatformMac.cmake:
     9        * platform/mock/mediasource/MockBox.cpp:
     10
    1112016-03-31  Antti Koivisto  <antti@apple.com>
    212

  • trunk/Source/WebCore/PlatformMac.cmake

    r198849 r198947  
    648648    platform/graphics/cg
    649649    platform/graphics/filters
     650    platform/graphics/opentype
    650651    platform/graphics/mac
    651652    platform/graphics/transforms
    … …  
    924925    ${SUPPLEMENTAL_DEPENDENCY_FILE}
    925926    ${ADDITIONAL_BINDINGS_DEPENDENCIES})
     927
     928set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
     929list(APPEND WebCoreTestSupport_LIBRARIES WebCore)
     930list(APPEND WebCoreTestSupport_SOURCES
     931    bindings/js/JSMockContentFilterSettingsCustom.cpp
     932
     933    testing/Internals.mm
     934    testing/MockContentFilter.cpp
     935    testing/MockContentFilterSettings.cpp
     936)

  • trunk/Source/WebCore/platform/mock/mediasource/MockBox.cpp

    r194819 r198947  
    2929#if ENABLE(MEDIA_SOURCE)
    3030
     31#include <JavaScriptCore/TypedArrayInlines.h>
    3132#include <runtime/ArrayBuffer.h>
    3233#include <runtime/DataView.h>

  • trunk/Source/WebKit/ChangeLog

    r198766 r198947  
     12016-04-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Compile DumpRenderTree with CMake on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=156088
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * PlatformMac.cmake:
     9
    1102016-03-28  Alex Christensen  <achristensen@webkit.org>
    211

  • trunk/Source/WebKit/PlatformMac.cmake

    r197166 r198947  
    235235    mac/WebInspector
    236236    mac/WebView
    237     ${WEBCORE_DIR}/bindings/objc
    238     ${WEBCORE_DIR}/plugins
    239237)
    240238
    … …  
    326324    mac/Plugins/Hosted/WebKitPluginHostTypes.h
    327325DESTINATION ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
     326
    328327add_custom_command(
    329328    OUTPUT
    … …  
    355354WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy)
    356355
     356# FIXME: Forwarding headers should be copies of actual headers.
     357file(GLOB ObjCHeaders ${WEBCORE_DIR}/bindings/objc/*.h)
     358foreach (_file ${ObjCHeaders})
     359    get_filename_component(_name ${_file} NAME)
     360    if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name})
     361        file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
     362    endif ()
     363endforeach ()
     364file(GLOB ObjCHeaders ${WEBCORE_DIR}/plugins/*.h)
     365foreach (_file ${ObjCHeaders})
     366    get_filename_component(_name ${_file} NAME)
     367    if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name})
     368        file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
     369    endif ()
     370endforeach ()
     371
    357372set(WebKit_OUTPUT_NAME WebKitLegacy)
    358373

  • trunk/Source/WebKit/mac/ChangeLog

    r198901 r198947  
     12016-04-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Compile DumpRenderTree with CMake on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=156088
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * Misc/WebKit.h:
     9        Alphabetize headers.
     10
    1112016-03-31  Jeremy Jones  <jeremyj@apple.com>
    212

  • trunk/Source/WebKit/mac/Misc/WebKit.h

    r168047 r198947  
    3030#import <WebKitLegacy/WebArchive.h>
    3131#import <WebKitLegacy/WebBackForwardList.h>
     32#import <WebKitLegacy/WebDOMOperations.h>
    3233#import <WebKitLegacy/WebDataSource.h>
    3334#import <WebKitLegacy/WebDocument.h>
    34 #import <WebKitLegacy/WebDOMOperations.h>
    3535#import <WebKitLegacy/WebDownload.h>
    3636#import <WebKitLegacy/WebEditingDelegate.h>

  • trunk/Source/WebKit2/CMakeLists.txt

    r198773 r198947  
    858858endif ()
    859859
    860 if (ENABLE_PLUGIN_PROCESS)
     860if (ENABLE_PLUGIN_PROCESS AND NOT APPLE)
    861861    add_definitions(-DENABLE_PLUGIN_PROCESS=1)
    862862    add_executable(PluginProcess ${PluginProcess_SOURCES})
    … …  
    871871endif ()
    872872
    873 if (ENABLE_DATABASE_PROCESS)
     873if (ENABLE_DATABASE_PROCESS AND NOT APPLE)
    874874    add_definitions(-DENABLE_DATABASE_PROCESS=1)
    875875    add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
    … …  
    884884endif ()
    885885
    886 POPULATE_LIBRARY_VERSION(WEBKIT2)
    887 set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
    888 
    889 if (NOT PORT STREQUAL "Mac")
     886if (APPLE)
     887    set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)
     888    make_directory(${_web_xpc_dir}/MacOS)
     889    make_directory(${_web_xpc_dir}/Resources)
     890    make_directory(${_web_xpc_dir}/_CodeSignature)
     891
     892    add_custom_target(WebContentProcessNib COMMAND
     893        ibtool --compile ${_web_xpc_dir}/Resources/WebContentProcess.nib ${WEBKIT2_DIR}/Resources/WebContentProcess.xib
     894        VERBATIM)
     895
     896    # FIXME: This shouldn't be two operations.
     897    file(COPY ${WEBKIT2_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist DESTINATION ${_web_xpc_dir})
     898    file(RENAME ${_web_xpc_dir}/Info-OSX.plist ${_web_xpc_dir}/Info.plist)
     899
     900    set_target_properties(WebProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_web_xpc_dir}/MacOS")
     901
     902
     903    set(_net_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.Networking.Development.xpc/Contents)
     904    make_directory(${_net_xpc_dir}/MacOS)
     905    make_directory(${_net_xpc_dir}/Resources)
     906    make_directory(${_net_xpc_dir}/_CodeSignature)
     907
     908    # FIXME: This shouldn't be two operations.
     909    file(COPY ${WEBKIT2_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist DESTINATION ${_net_xpc_dir})
     910    file(RENAME ${_net_xpc_dir}/Info-OSX.plist ${_net_xpc_dir}/Info.plist)
     911
     912    set_target_properties(NetworkProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_net_xpc_dir}/MacOS")
     913else ()
     914    POPULATE_LIBRARY_VERSION(WEBKIT2)
     915    set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
     916
    890917    install(TARGETS WebKit2 WebProcess NetworkProcess
    891918        LIBRARY DESTINATION "${LIB_INSTALL_DIR}"

  • trunk/Source/WebKit2/ChangeLog

    r198939 r198947  
     12016-04-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Compile DumpRenderTree with CMake on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=156088
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        * PlatformMac.cmake:
     10        * UIProcess/API/Cocoa/WebKitLegacy.h: Added.
     11
    1122016-03-31  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
    213

  • trunk/Source/WebKit2/PlatformMac.cmake

    r198887 r198947  
    11add_definitions("-ObjC++ -std=c++11")
    22link_directories(../../WebKitLibraries)
     3find_library(APPLICATION_SERVICES_LIBRARY ApplicationServices)
    34find_library(CARBON_LIBRARY Carbon)
    45find_library(QUARTZ_LIBRARY Quartz)
    … …  
    1112list(APPEND WebKit2_LIBRARIES
    1213    WebKit
     14    ${APPLICATION_SERVICES_LIBRARY}
    1315)
    1416
    … …  
    442444)
    443445
     446# FIXME: These should not have Development in production builds.
     447set(WebKit2_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development.xpc)
     448set(WebKit2_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development.xpc)
     449
    444450add_definitions("-include WebKit2Prefix.h")
    445451
    … …  
    471477    Shared
    472478
     479    NetworkProcess/Downloads
     480
     481    Platform/IPC
     482
    473483    Shared/API
    474484    Shared/Cocoa
    … …  
    491501    WebProcess/InjectedBundle/API/mac
    492502)
     503
     504WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
    493505
    494506# This is needed right now to import ObjC headers instead of including them.
    … …  
    502514endforeach ()
    503515
     516# FIXME: Forwarding headers should be complete copies of the header.
     517set(WebKitLegacyForwardingHeaders
     518    DOMElement.h
     519    DOMException.h
     520    DOMObject.h
     521    DOMPrivate.h
     522    WebApplicationCache.h
     523    WebCache.h
     524    WebCoreStatistics.h
     525    WebDOMOperationsPrivate.h
     526    WebDataSource.h
     527    WebDataSourcePrivate.h
     528    WebDefaultPolicyDelegate.h
     529    WebDeviceOrientation.h
     530    WebDeviceOrientationProviderMock.h
     531    WebDocument.h
     532    WebDocumentPrivate.h
     533    WebDynamicScrollBarsView.h
     534    WebFrame.h
     535    WebFramePrivate.h
     536    WebFrameViewPrivate.h
     537    WebGeolocationPosition.h
     538    WebHTMLRepresentation.h
     539    WebHTMLView.h
     540    WebHTMLViewPrivate.h
     541    WebHistory.h
     542    WebHistoryItem.h
     543    WebHistoryItemPrivate.h
     544    WebHistoryPrivate.h
     545    WebIconDatabasePrivate.h
     546    WebInspectorPrivate.h
     547    WebKitNSStringExtras.h
     548    WebNSURLExtras.h
     549    WebNavigationData.h
     550    WebNotification.h
     551    WebPluginDatabase.h
     552    WebPolicyDelegate.h
     553    WebPolicyDelegatePrivate.h
     554    WebPreferenceKeysPrivate.h
     555    WebPreferences.h
     556    WebPreferencesPrivate.h
     557    WebQuotaManager.h
     558    WebScriptWorld.h
     559    WebSecurityOriginPrivate.h
     560    WebTypesInternal.h
     561    WebUIDelegate.h
     562    WebUIDelegatePrivate.h
     563    WebView.h
     564    WebViewPrivate
     565    WebViewPrivate.h
     566)
     567foreach (_file ${WebKitLegacyForwardingHeaders})
     568    file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
     569endforeach ()
     570
     571set(WebCoreForwardingHeaders
     572    DOMAbstractView.h
     573    DOMAttr.h
     574    DOMBeforeLoadEvent.h
     575    DOMBlob.h
     576    DOMCDATASection.h
     577    DOMCSSCharsetRule.h
     578    DOMCSSFontFaceRule.h
     579    DOMCSSImportRule.h
     580    DOMCSSKeyframeRule.h
     581    DOMCSSKeyframesRule.h
     582    DOMCSSMediaRule.h
     583    DOMCSSPageRule.h
     584    DOMCSSPrimitiveValue.h
     585    DOMCSSRule.h
     586    DOMCSSRuleList.h
     587    DOMCSSStyleDeclaration.h
     588    DOMCSSStyleRule.h
     589    DOMCSSStyleSheet.h
     590    DOMCSSSupportsRule.h
     591    DOMCSSUnknownRule.h
     592    DOMCSSValue.h
     593    DOMCSSValueList.h
     594    DOMCharacterData.h
     595    DOMComment.h
     596    DOMCounter.h
     597    DOMDOMImplementation.h
     598    DOMDOMNamedFlowCollection.h
     599    DOMDOMTokenList.h
     600    DOMDocument.h
     601    DOMDocumentFragment.h
     602    DOMDocumentType.h
     603    DOMElement.h
     604    DOMEntity.h
     605    DOMEntityReference.h
     606    DOMEvent.h
     607    DOMEventException.h
     608    DOMEventListener.h
     609    DOMEventTarget.h
     610    DOMFile.h
     611    DOMFileList.h
     612    DOMHTMLAnchorElement.h
     613    DOMHTMLAppletElement.h
     614    DOMHTMLAreaElement.h
     615    DOMHTMLBRElement.h
     616    DOMHTMLBaseElement.h
     617    DOMHTMLBaseFontElement.h
     618    DOMHTMLBodyElement.h
     619    DOMHTMLButtonElement.h
     620    DOMHTMLCanvasElement.h
     621    DOMHTMLCollection.h
     622    DOMHTMLDListElement.h
     623    DOMHTMLDirectoryElement.h
     624    DOMHTMLDivElement.h
     625    DOMHTMLDocument.h
     626    DOMHTMLElement.h
     627    DOMHTMLEmbedElement.h
     628    DOMHTMLFieldSetElement.h
     629    DOMHTMLFontElement.h
     630    DOMHTMLFormElement.h
     631    DOMHTMLFrameElement.h
     632    DOMHTMLFrameSetElement.h
     633    DOMHTMLHRElement.h
     634    DOMHTMLHeadElement.h
     635    DOMHTMLHeadingElement.h
     636    DOMHTMLHtmlElement.h
     637    DOMHTMLIFrameElement.h
     638    DOMHTMLImageElement.h
     639    DOMHTMLInputElement.h
     640    DOMHTMLInputElementPrivate.h
     641    DOMHTMLLIElement.h
     642    DOMHTMLLabelElement.h
     643    DOMHTMLLegendElement.h
     644    DOMHTMLLinkElement.h
     645    DOMHTMLMapElement.h
     646    DOMHTMLMarqueeElement.h
     647    DOMHTMLMediaElement.h
     648    DOMHTMLMenuElement.h
     649    DOMHTMLMetaElement.h
     650    DOMHTMLModElement.h
     651    DOMHTMLOListElement.h
     652    DOMHTMLObjectElement.h
     653    DOMHTMLOptGroupElement.h
     654    DOMHTMLOptionElement.h
     655    DOMHTMLOptionsCollection.h
     656    DOMHTMLParagraphElement.h
     657    DOMHTMLParamElement.h
     658    DOMHTMLPreElement.h
     659    DOMHTMLQuoteElement.h
     660    DOMHTMLScriptElement.h
     661    DOMHTMLSelectElement.h
     662    DOMHTMLStyleElement.h
     663    DOMHTMLTableCaptionElement.h
     664    DOMHTMLTableCellElement.h
     665    DOMHTMLTableColElement.h
     666    DOMHTMLTableElement.h
     667    DOMHTMLTableRowElement.h
     668    DOMHTMLTableSectionElement.h
     669    DOMHTMLTextAreaElement.h
     670    DOMHTMLTitleElement.h
     671    DOMHTMLUListElement.h
     672    DOMHTMLVideoElement.h
     673    DOMKeyboardEvent.h
     674    DOMMediaError.h
     675    DOMMediaList.h
     676    DOMMessageEvent.h
     677    DOMMessagePort.h
     678    DOMMouseEvent.h
     679    DOMMutationEvent.h
     680    DOMNamedNodeMap.h
     681    DOMNode.h
     682    DOMNodeFilter.h
     683    DOMNodeIterator.h
     684    DOMNodeList.h
     685    DOMOverflowEvent.h
     686    DOMProcessingInstruction.h
     687    DOMProgressEvent.h
     688    DOMRGBColor.h
     689    DOMRange.h
     690    DOMRangeException.h
     691    DOMRect.h
     692    DOMStyleSheet.h
     693    DOMStyleSheetList.h
     694    DOMText.h
     695    DOMTextEvent.h
     696    DOMTimeRanges.h
     697    DOMTreeWalker.h
     698    DOMUIEvent.h
     699    DOMValidityState.h
     700    DOMWebKitCSSFilterValue.h
     701    DOMWebKitCSSRegionRule.h
     702    DOMWebKitCSSTransformValue.h
     703    DOMWebKitNamedFlow.h
     704    DOMWheelEvent.h
     705    DOMXPathException.h
     706    DOMXPathExpression.h
     707    DOMXPathNSResolver.h
     708    DOMXPathResult.h
     709)
     710foreach (_file ${WebCoreForwardingHeaders})
     711    file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebCore/${_file}>")
     712endforeach ()
     713
     714# FIXME: These should not be necessary.
     715file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
     716file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
     717
    504718set(WebKit2_OUTPUT_NAME WebKit)
    505719
    … …  
    513727    ${DERIVED_SOURCES_WEBKIT2_DIR}/MessageRecorderProbes.h
    514728)
    515 
    516 WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WebKitLegacy.h

    r198946 r198947  
    2727 */
    2828
    29 #import <WebKitLegacy/DOM.h>
    30 #import <WebKitLegacy/WebArchive.h>
    31 #import <WebKitLegacy/WebBackForwardList.h>
    32 #import <WebKitLegacy/WebDataSource.h>
    33 #import <WebKitLegacy/WebDocument.h>
    34 #import <WebKitLegacy/WebDOMOperations.h>
    35 #import <WebKitLegacy/WebDownload.h>
    36 #import <WebKitLegacy/WebEditingDelegate.h>
    37 #import <WebKitLegacy/WebFrame.h>
    38 #import <WebKitLegacy/WebFrameLoadDelegate.h>
    39 #import <WebKitLegacy/WebFrameView.h>
    40 #import <WebKitLegacy/WebHistory.h>
    41 #import <WebKitLegacy/WebHistoryItem.h>
    42 #import <WebKitLegacy/WebKitErrors.h>
    43 #import <WebKitLegacy/WebPlugin.h>
    44 #import <WebKitLegacy/WebPluginContainer.h>
    45 #import <WebKitLegacy/WebPluginViewFactory.h>
    46 #import <WebKitLegacy/WebPolicyDelegate.h>
    47 #import <WebKitLegacy/WebPreferences.h>
    48 #import <WebKitLegacy/WebResource.h>
    49 #import <WebKitLegacy/WebResourceLoadDelegate.h>
    50 #import <WebKitLegacy/WebScriptObject.h>
    51 #import <WebKitLegacy/WebUIDelegate.h>
    52 #import <WebKitLegacy/WebView.h>
     29#import <WebKit/DOM.h>
     30#import <WebKit/WebArchive.h>
     31#import <WebKit/WebBackForwardList.h>
     32#import <WebKit/WebDOMOperations.h>
     33#import <WebKit/WebDataSource.h>
     34#import <WebKit/WebDocument.h>
     35#import <WebKit/WebDownload.h>
     36#import <WebKit/WebEditingDelegate.h>
     37#import <WebKit/WebFrame.h>
     38#import <WebKit/WebFrameLoadDelegate.h>
     39#import <WebKit/WebFrameView.h>
     40#import <WebKit/WebHistory.h>
     41#import <WebKit/WebHistoryItem.h>
     42#import <WebKit/WebKitErrors.h>
     43#import <WebKit/WebPlugin.h>
     44#import <WebKit/WebPluginContainer.h>
     45#import <WebKit/WebPluginViewFactory.h>
     46#import <WebKit/WebPolicyDelegate.h>
     47#import <WebKit/WebPreferences.h>
     48#import <WebKit/WebResource.h>
     49#import <WebKit/WebResourceLoadDelegate.h>
     50#import <WebKit/WebScriptObject.h>
     51#import <WebKit/WebUIDelegate.h>
     52#import <WebKit/WebView.h>

  • trunk/Tools/CMakeLists.txt

    r188982 r198947  
    3434endif ()
    3535
     36if (APPLE)
     37    add_subdirectory(DumpRenderTree)
     38endif ()
     39
    3640if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
    3741    add_subdirectory(TestWebKitAPI)

  • trunk/Tools/ChangeLog

    r198938 r198947  
     12016-04-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Compile DumpRenderTree with CMake on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=156088
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        * DumpRenderTree/CMakeLists.txt:
     10        * DumpRenderTree/DefaultPolicyDelegate.m:
     11        (-[DefaultPolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
     12        * DumpRenderTree/DumpRenderTreeFileDraggingSource.m:
     13        * DumpRenderTree/PlatformMac.cmake: Added.
     14        * DumpRenderTree/PlatformWin.cmake:
     15        * DumpRenderTree/mac/AppleScriptController.m:
     16        (convertAEDescToObject):
     17        * DumpRenderTree/mac/DumpRenderTreeMain.mm:
     18        * DumpRenderTree/mac/LayoutTestHelper.m:
     19
    1202016-03-31  Bill Ming  <mbbill@gmail.com>
    221

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r189076 r198947  
    107107)
    108108
    109 list(APPEND TestNetscapePlugin_LIBRARIES
    110     WebKit
    111 )
    112 
    113109WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    114110

  • trunk/Tools/DumpRenderTree/DefaultPolicyDelegate.m

    r152498 r198947  
    2121    }
    2222
    23     WebNavigationType navType = [[actionInformation objectForKey:WebActionNavigationTypeKey] intValue];
     23    WebNavigationType navType = (WebNavigationType)[[actionInformation objectForKey:WebActionNavigationTypeKey] intValue];
    2424    if (navType == WebNavigationTypePlugInRequest) {
    2525        [listener use];

  • trunk/Tools/DumpRenderTree/DumpRenderTreeFileDraggingSource.m

    r43890 r198947  
    2727// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29#import "config.h"
    2930#import "DumpRenderTreeFileDraggingSource.h"
    3031

  • trunk/Tools/DumpRenderTree/PlatformWin.cmake

    r196589 r198947  
    2222    win/UIDelegate.cpp
    2323    win/WorkQueueItemWin.cpp
     24)
     25
     26list(APPEND TestNetscapePlugin_LIBRARIES
     27    WebKit
    2428)
    2529

  • trunk/Tools/DumpRenderTree/mac/AppleScriptController.m

    r165676 r198947  
    7676            }
    7777            break;
    78         case typeAEList:
     78        case typeAEList: {
    7979            value = [NSMutableString stringWithString:@"("];
    8080            int numItems = [aeDesc numberOfItems];
    … …  
    8787            [(NSMutableString*)value appendString:@")"];
    8888            break;
     89        }
    8990        case typeType: {
    9091            OSType type = [aeDesc typeCodeValue];

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm

    r194115 r198947  
    2424 */
    2525
     26#include "config.h"
     27
    2628#if PLATFORM(MAC)
    2729

  • trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m

    r196212 r198947  
    3030 */
    3131
     32#import "config.h"
     33
    3234#if !PLATFORM(IOS)
    3335
Note: See TracChangeset for help on using the changeset viewer.