Diff
Modified: trunk/Source/WebCore/ChangeLog (198946 => 198947)
--- trunk/Source/WebCore/ChangeLog 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebCore/ChangeLog 2016-04-01 16:45:58 UTC (rev 198947)
@@ -1,3 +1,13 @@
+2016-04-01 Alex Christensen <achristen...@webkit.org>
+
+ Compile DumpRenderTree with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156088
+
+ Reviewed by Brent Fulgham.
+
+ * PlatformMac.cmake:
+ * platform/mock/mediasource/MockBox.cpp:
+
2016-03-31 Antti Koivisto <an...@apple.com>
Separate render tree updating from style resolve
Modified: trunk/Source/WebCore/PlatformMac.cmake (198946 => 198947)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-04-01 16:45:58 UTC (rev 198947)
@@ -647,6 +647,7 @@
platform/graphics/cocoa
platform/graphics/cg
platform/graphics/filters
+ platform/graphics/opentype
platform/graphics/mac
platform/graphics/transforms
@@ -923,3 +924,13 @@
${IDL_ATTRIBUTES_FILE}
${SUPPLEMENTAL_DEPENDENCY_FILE}
${ADDITIONAL_BINDINGS_DEPENDENCIES})
+
+set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
+list(APPEND WebCoreTestSupport_LIBRARIES WebCore)
+list(APPEND WebCoreTestSupport_SOURCES
+ bindings/js/JSMockContentFilterSettingsCustom.cpp
+
+ testing/Internals.mm
+ testing/MockContentFilter.cpp
+ testing/MockContentFilterSettings.cpp
+)
\ No newline at end of file
Modified: trunk/Source/WebCore/platform/mock/mediasource/MockBox.cpp (198946 => 198947)
--- trunk/Source/WebCore/platform/mock/mediasource/MockBox.cpp 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockBox.cpp 2016-04-01 16:45:58 UTC (rev 198947)
@@ -28,6 +28,7 @@
#if ENABLE(MEDIA_SOURCE)
+#include <_javascript_Core/TypedArrayInlines.h>
#include <runtime/ArrayBuffer.h>
#include <runtime/DataView.h>
#include <runtime/Int8Array.h>
Modified: trunk/Source/WebKit/ChangeLog (198946 => 198947)
--- trunk/Source/WebKit/ChangeLog 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebKit/ChangeLog 2016-04-01 16:45:58 UTC (rev 198947)
@@ -1,3 +1,12 @@
+2016-04-01 Alex Christensen <achristen...@webkit.org>
+
+ Compile DumpRenderTree with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156088
+
+ Reviewed by Brent Fulgham.
+
+ * PlatformMac.cmake:
+
2016-03-28 Alex Christensen <achristen...@webkit.org>
Fix Ninja build on Mac
Modified: trunk/Source/WebKit/PlatformMac.cmake (198946 => 198947)
--- trunk/Source/WebKit/PlatformMac.cmake 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-04-01 16:45:58 UTC (rev 198947)
@@ -234,8 +234,6 @@
mac/WebCoreSupport
mac/WebInspector
mac/WebView
- ${WEBCORE_DIR}/bindings/objc
- ${WEBCORE_DIR}/plugins
)
set(WebKitLegacy_FORWARDING_HEADERS_FILES
@@ -325,6 +323,7 @@
mac/Plugins/Hosted/WebKitPluginHostTypes.defs
mac/Plugins/Hosted/WebKitPluginHostTypes.h
DESTINATION ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+
add_custom_command(
OUTPUT
${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
@@ -354,6 +353,22 @@
WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy)
+# FIXME: Forwarding headers should be copies of actual headers.
+file(GLOB ObjCHeaders ${WEBCORE_DIR}/bindings/objc/*.h)
+foreach (_file ${ObjCHeaders})
+ get_filename_component(_name ${_file} NAME)
+ if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name})
+ file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
+ endif ()
+endforeach ()
+file(GLOB ObjCHeaders ${WEBCORE_DIR}/plugins/*.h)
+foreach (_file ${ObjCHeaders})
+ get_filename_component(_name ${_file} NAME)
+ if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name})
+ file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
+ endif ()
+endforeach ()
+
set(WebKit_OUTPUT_NAME WebKitLegacy)
set(WebKitLegacy_WebCore_FORWARDING_HEADERS
Modified: trunk/Source/WebKit/mac/ChangeLog (198946 => 198947)
--- trunk/Source/WebKit/mac/ChangeLog 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-01 16:45:58 UTC (rev 198947)
@@ -1,3 +1,13 @@
+2016-04-01 Alex Christensen <achristen...@webkit.org>
+
+ Compile DumpRenderTree with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156088
+
+ Reviewed by Brent Fulgham.
+
+ * Misc/WebKit.h:
+ Alphabetize headers.
+
2016-03-31 Jeremy Jones <jere...@apple.com>
mediaShouldUsePersistentCache() is redundant. Use Page::usesEphemeralSession() instead.
Modified: trunk/Source/WebKit/mac/Misc/WebKit.h (198946 => 198947)
--- trunk/Source/WebKit/mac/Misc/WebKit.h 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebKit/mac/Misc/WebKit.h 2016-04-01 16:45:58 UTC (rev 198947)
@@ -29,9 +29,9 @@
#import <WebKitLegacy/DOM.h>
#import <WebKitLegacy/WebArchive.h>
#import <WebKitLegacy/WebBackForwardList.h>
+#import <WebKitLegacy/WebDOMOperations.h>
#import <WebKitLegacy/WebDataSource.h>
#import <WebKitLegacy/WebDocument.h>
-#import <WebKitLegacy/WebDOMOperations.h>
#import <WebKitLegacy/WebDownload.h>
#import <WebKitLegacy/WebEditingDelegate.h>
#import <WebKitLegacy/WebFrame.h>
Modified: trunk/Source/WebKit2/CMakeLists.txt (198946 => 198947)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-04-01 16:45:58 UTC (rev 198947)
@@ -857,7 +857,7 @@
set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
endif ()
-if (ENABLE_PLUGIN_PROCESS)
+if (ENABLE_PLUGIN_PROCESS AND NOT APPLE)
add_definitions(-DENABLE_PLUGIN_PROCESS=1)
add_executable(PluginProcess ${PluginProcess_SOURCES})
add_webkit2_prefix_header(PluginProcess)
@@ -870,7 +870,7 @@
endif ()
endif ()
-if (ENABLE_DATABASE_PROCESS)
+if (ENABLE_DATABASE_PROCESS AND NOT APPLE)
add_definitions(-DENABLE_DATABASE_PROCESS=1)
add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
add_webkit2_prefix_header(DatabaseProcess)
@@ -883,10 +883,37 @@
endif ()
endif ()
-POPULATE_LIBRARY_VERSION(WEBKIT2)
-set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
+if (APPLE)
+ set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)
+ make_directory(${_web_xpc_dir}/MacOS)
+ make_directory(${_web_xpc_dir}/Resources)
+ make_directory(${_web_xpc_dir}/_CodeSignature)
-if (NOT PORT STREQUAL "Mac")
+ add_custom_target(WebContentProcessNib COMMAND
+ ibtool --compile ${_web_xpc_dir}/Resources/WebContentProcess.nib ${WEBKIT2_DIR}/Resources/WebContentProcess.xib
+ VERBATIM)
+
+ # FIXME: This shouldn't be two operations.
+ file(COPY ${WEBKIT2_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist DESTINATION ${_web_xpc_dir})
+ file(RENAME ${_web_xpc_dir}/Info-OSX.plist ${_web_xpc_dir}/Info.plist)
+
+ set_target_properties(WebProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_web_xpc_dir}/MacOS")
+
+
+ set(_net_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.Networking.Development.xpc/Contents)
+ make_directory(${_net_xpc_dir}/MacOS)
+ make_directory(${_net_xpc_dir}/Resources)
+ make_directory(${_net_xpc_dir}/_CodeSignature)
+
+ # FIXME: This shouldn't be two operations.
+ file(COPY ${WEBKIT2_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist DESTINATION ${_net_xpc_dir})
+ file(RENAME ${_net_xpc_dir}/Info-OSX.plist ${_net_xpc_dir}/Info.plist)
+
+ set_target_properties(NetworkProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_net_xpc_dir}/MacOS")
+else ()
+ POPULATE_LIBRARY_VERSION(WEBKIT2)
+ set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
+
install(TARGETS WebKit2 WebProcess NetworkProcess
LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
Modified: trunk/Source/WebKit2/ChangeLog (198946 => 198947)
--- trunk/Source/WebKit2/ChangeLog 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-01 16:45:58 UTC (rev 198947)
@@ -1,3 +1,14 @@
+2016-04-01 Alex Christensen <achristen...@webkit.org>
+
+ Compile DumpRenderTree with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156088
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * UIProcess/API/Cocoa/WebKitLegacy.h: Added.
+
2016-03-31 Gyuyoung Kim <gyuyoung....@webkit.org>
Unreviewed EFL build fix caused by r198929.
Modified: trunk/Source/WebKit2/PlatformMac.cmake (198946 => 198947)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-04-01 16:45:58 UTC (rev 198947)
@@ -1,5 +1,6 @@
add_definitions("-ObjC++ -std=c++11")
link_directories(../../WebKitLibraries)
+find_library(APPLICATION_SERVICES_LIBRARY ApplicationServices)
find_library(CARBON_LIBRARY Carbon)
find_library(QUARTZ_LIBRARY Quartz)
find_library(AVFOUNDATION_LIBRARY AVFoundation)
@@ -10,6 +11,7 @@
list(APPEND WebKit2_LIBRARIES
WebKit
+ ${APPLICATION_SERVICES_LIBRARY}
)
if (NOT AVFAUDIO_LIBRARY-NOTFOUND)
@@ -441,6 +443,10 @@
${XPCService_SOURCES}
)
+# FIXME: These should not have Development in production builds.
+set(WebKit2_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development.xpc)
+set(WebKit2_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development.xpc)
+
add_definitions("-include WebKit2Prefix.h")
set(WebKit2_FORWARDING_HEADERS_FILES
@@ -470,6 +476,10 @@
Platform
Shared
+ NetworkProcess/Downloads
+
+ Platform/IPC
+
Shared/API
Shared/Cocoa
@@ -491,6 +501,8 @@
WebProcess/InjectedBundle/API/mac
)
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
+
# This is needed right now to import ObjC headers instead of including them.
# FIXME: Forwarding headers should be copies of actual headers.
file(GLOB ObjCHeaders UIProcess/API/Cocoa/*.h)
@@ -501,6 +513,208 @@
endif ()
endforeach ()
+# FIXME: Forwarding headers should be complete copies of the header.
+set(WebKitLegacyForwardingHeaders
+ DOMElement.h
+ DOMException.h
+ DOMObject.h
+ DOMPrivate.h
+ WebApplicationCache.h
+ WebCache.h
+ WebCoreStatistics.h
+ WebDOMOperationsPrivate.h
+ WebDataSource.h
+ WebDataSourcePrivate.h
+ WebDefaultPolicyDelegate.h
+ WebDeviceOrientation.h
+ WebDeviceOrientationProviderMock.h
+ WebDocument.h
+ WebDocumentPrivate.h
+ WebDynamicScrollBarsView.h
+ WebFrame.h
+ WebFramePrivate.h
+ WebFrameViewPrivate.h
+ WebGeolocationPosition.h
+ WebHTMLRepresentation.h
+ WebHTMLView.h
+ WebHTMLViewPrivate.h
+ WebHistory.h
+ WebHistoryItem.h
+ WebHistoryItemPrivate.h
+ WebHistoryPrivate.h
+ WebIconDatabasePrivate.h
+ WebInspectorPrivate.h
+ WebKitNSStringExtras.h
+ WebNSURLExtras.h
+ WebNavigationData.h
+ WebNotification.h
+ WebPluginDatabase.h
+ WebPolicyDelegate.h
+ WebPolicyDelegatePrivate.h
+ WebPreferenceKeysPrivate.h
+ WebPreferences.h
+ WebPreferencesPrivate.h
+ WebQuotaManager.h
+ WebScriptWorld.h
+ WebSecurityOriginPrivate.h
+ WebTypesInternal.h
+ WebUIDelegate.h
+ WebUIDelegatePrivate.h
+ WebView.h
+ WebViewPrivate
+ WebViewPrivate.h
+)
+foreach (_file ${WebKitLegacyForwardingHeaders})
+ file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
+endforeach ()
+
+set(WebCoreForwardingHeaders
+ DOMAbstractView.h
+ DOMAttr.h
+ DOMBeforeLoadEvent.h
+ DOMBlob.h
+ DOMCDATASection.h
+ DOMCSSCharsetRule.h
+ DOMCSSFontFaceRule.h
+ DOMCSSImportRule.h
+ DOMCSSKeyframeRule.h
+ DOMCSSKeyframesRule.h
+ DOMCSSMediaRule.h
+ DOMCSSPageRule.h
+ DOMCSSPrimitiveValue.h
+ DOMCSSRule.h
+ DOMCSSRuleList.h
+ DOMCSSStyleDeclaration.h
+ DOMCSSStyleRule.h
+ DOMCSSStyleSheet.h
+ DOMCSSSupportsRule.h
+ DOMCSSUnknownRule.h
+ DOMCSSValue.h
+ DOMCSSValueList.h
+ DOMCharacterData.h
+ DOMComment.h
+ DOMCounter.h
+ DOMDOMImplementation.h
+ DOMDOMNamedFlowCollection.h
+ DOMDOMTokenList.h
+ DOMDocument.h
+ DOMDocumentFragment.h
+ DOMDocumentType.h
+ DOMElement.h
+ DOMEntity.h
+ DOMEntityReference.h
+ DOMEvent.h
+ DOMEventException.h
+ DOMEventListener.h
+ DOMEventTarget.h
+ DOMFile.h
+ DOMFileList.h
+ DOMHTMLAnchorElement.h
+ DOMHTMLAppletElement.h
+ DOMHTMLAreaElement.h
+ DOMHTMLBRElement.h
+ DOMHTMLBaseElement.h
+ DOMHTMLBaseFontElement.h
+ DOMHTMLBodyElement.h
+ DOMHTMLButtonElement.h
+ DOMHTMLCanvasElement.h
+ DOMHTMLCollection.h
+ DOMHTMLDListElement.h
+ DOMHTMLDirectoryElement.h
+ DOMHTMLDivElement.h
+ DOMHTMLDocument.h
+ DOMHTMLElement.h
+ DOMHTMLEmbedElement.h
+ DOMHTMLFieldSetElement.h
+ DOMHTMLFontElement.h
+ DOMHTMLFormElement.h
+ DOMHTMLFrameElement.h
+ DOMHTMLFrameSetElement.h
+ DOMHTMLHRElement.h
+ DOMHTMLHeadElement.h
+ DOMHTMLHeadingElement.h
+ DOMHTMLHtmlElement.h
+ DOMHTMLIFrameElement.h
+ DOMHTMLImageElement.h
+ DOMHTMLInputElement.h
+ DOMHTMLInputElementPrivate.h
+ DOMHTMLLIElement.h
+ DOMHTMLLabelElement.h
+ DOMHTMLLegendElement.h
+ DOMHTMLLinkElement.h
+ DOMHTMLMapElement.h
+ DOMHTMLMarqueeElement.h
+ DOMHTMLMediaElement.h
+ DOMHTMLMenuElement.h
+ DOMHTMLMetaElement.h
+ DOMHTMLModElement.h
+ DOMHTMLOListElement.h
+ DOMHTMLObjectElement.h
+ DOMHTMLOptGroupElement.h
+ DOMHTMLOptionElement.h
+ DOMHTMLOptionsCollection.h
+ DOMHTMLParagraphElement.h
+ DOMHTMLParamElement.h
+ DOMHTMLPreElement.h
+ DOMHTMLQuoteElement.h
+ DOMHTMLScriptElement.h
+ DOMHTMLSelectElement.h
+ DOMHTMLStyleElement.h
+ DOMHTMLTableCaptionElement.h
+ DOMHTMLTableCellElement.h
+ DOMHTMLTableColElement.h
+ DOMHTMLTableElement.h
+ DOMHTMLTableRowElement.h
+ DOMHTMLTableSectionElement.h
+ DOMHTMLTextAreaElement.h
+ DOMHTMLTitleElement.h
+ DOMHTMLUListElement.h
+ DOMHTMLVideoElement.h
+ DOMKeyboardEvent.h
+ DOMMediaError.h
+ DOMMediaList.h
+ DOMMessageEvent.h
+ DOMMessagePort.h
+ DOMMouseEvent.h
+ DOMMutationEvent.h
+ DOMNamedNodeMap.h
+ DOMNode.h
+ DOMNodeFilter.h
+ DOMNodeIterator.h
+ DOMNodeList.h
+ DOMOverflowEvent.h
+ DOMProcessingInstruction.h
+ DOMProgressEvent.h
+ DOMRGBColor.h
+ DOMRange.h
+ DOMRangeException.h
+ DOMRect.h
+ DOMStyleSheet.h
+ DOMStyleSheetList.h
+ DOMText.h
+ DOMTextEvent.h
+ DOMTimeRanges.h
+ DOMTreeWalker.h
+ DOMUIEvent.h
+ DOMValidityState.h
+ DOMWebKitCSSFilterValue.h
+ DOMWebKitCSSRegionRule.h
+ DOMWebKitCSSTransformValue.h
+ DOMWebKitNamedFlow.h
+ DOMWheelEvent.h
+ DOMXPathException.h
+ DOMXPathExpression.h
+ DOMXPathNSResolver.h
+ DOMXPathResult.h
+)
+foreach (_file ${WebCoreForwardingHeaders})
+ file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebCore/${_file}>")
+endforeach ()
+
+# FIXME: These should not be necessary.
+file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
+file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
+
set(WebKit2_OUTPUT_NAME WebKit)
add_custom_command(
@@ -512,5 +726,3 @@
list(APPEND WebKit2_SOURCES
${DERIVED_SOURCES_WEBKIT2_DIR}/MessageRecorderProbes.h
)
-
-WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WebKitLegacy.h (from rev 198946, trunk/Source/WebKit/mac/Misc/WebKit.h) (0 => 198947)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WebKitLegacy.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WebKitLegacy.h 2016-04-01 16:45:58 UTC (rev 198947)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2003, 2004 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/DOM.h>
+#import <WebKit/WebArchive.h>
+#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebDOMOperations.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDownload.h>
+#import <WebKit/WebEditingDelegate.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameLoadDelegate.h>
+#import <WebKit/WebFrameView.h>
+#import <WebKit/WebHistory.h>
+#import <WebKit/WebHistoryItem.h>
+#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebPlugin.h>
+#import <WebKit/WebPluginContainer.h>
+#import <WebKit/WebPluginViewFactory.h>
+#import <WebKit/WebPolicyDelegate.h>
+#import <WebKit/WebPreferences.h>
+#import <WebKit/WebResource.h>
+#import <WebKit/WebResourceLoadDelegate.h>
+#import <WebKit/WebScriptObject.h>
+#import <WebKit/WebUIDelegate.h>
+#import <WebKit/WebView.h>
Modified: trunk/Tools/CMakeLists.txt (198946 => 198947)
--- trunk/Tools/CMakeLists.txt 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/CMakeLists.txt 2016-04-01 16:45:58 UTC (rev 198947)
@@ -33,6 +33,10 @@
add_subdirectory(MiniBrowser/win)
endif ()
+if (APPLE)
+ add_subdirectory(DumpRenderTree)
+endif ()
+
if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
add_subdirectory(TestWebKitAPI)
endif ()
Modified: trunk/Tools/ChangeLog (198946 => 198947)
--- trunk/Tools/ChangeLog 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/ChangeLog 2016-04-01 16:45:58 UTC (rev 198947)
@@ -1,3 +1,22 @@
+2016-04-01 Alex Christensen <achristen...@webkit.org>
+
+ Compile DumpRenderTree with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156088
+
+ Reviewed by Brent Fulgham.
+
+ * 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:
+
2016-03-31 Bill Ming <mbb...@gmail.com>
https://bugs.webkit.org/show_bug.cgi?id=156094
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (198946 => 198947)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-04-01 16:45:58 UTC (rev 198947)
@@ -106,10 +106,6 @@
WebKit
)
-list(APPEND TestNetscapePlugin_LIBRARIES
- WebKit
-)
-
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
Modified: trunk/Tools/DumpRenderTree/DefaultPolicyDelegate.m (198946 => 198947)
--- trunk/Tools/DumpRenderTree/DefaultPolicyDelegate.m 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/DumpRenderTree/DefaultPolicyDelegate.m 2016-04-01 16:45:58 UTC (rev 198947)
@@ -20,7 +20,7 @@
return;
}
- WebNavigationType navType = [[actionInformation objectForKey:WebActionNavigationTypeKey] intValue];
+ WebNavigationType navType = (WebNavigationType)[[actionInformation objectForKey:WebActionNavigationTypeKey] intValue];
if (navType == WebNavigationTypePlugInRequest) {
[listener use];
return;
Modified: trunk/Tools/DumpRenderTree/DumpRenderTreeFileDraggingSource.m (198946 => 198947)
--- trunk/Tools/DumpRenderTree/DumpRenderTreeFileDraggingSource.m 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/DumpRenderTree/DumpRenderTreeFileDraggingSource.m 2016-04-01 16:45:58 UTC (rev 198947)
@@ -26,6 +26,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#import "config.h"
#import "DumpRenderTreeFileDraggingSource.h"
@implementation DumpRenderTreeFileDraggingSource
Added: trunk/Tools/DumpRenderTree/PlatformMac.cmake (0 => 198947)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake (rev 0)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-04-01 16:45:58 UTC (rev 198947)
@@ -0,0 +1,84 @@
+find_library(QUARTZ_LIBRARY Quartz)
+find_library(CARBON_LIBRARY Carbon)
+find_library(CORESERVICES_LIBRARY CoreServices)
+add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks -iframework ${CORESERVICES_LIBRARY}/Frameworks)
+
+list(APPEND TestNetscapePlugin_LIBRARIES
+ ${QUARTZ_LIBRARY}
+)
+
+list(APPEND DumpRenderTree_LIBRARIES
+ ${CARBON_LIBRARY}
+)
+
+add_definitions("-ObjC++ -std=c++11")
+
+if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
+elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
+endif ()
+link_directories(../../WebKitLibraries)
+include_directories(../../WebKitLibraries)
+
+list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
+ cg
+ cf
+ mac
+ mac/InternalHeaders/WebKit
+ TestNetscapePlugIn
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy
+ ${WTF_DIR}/icu
+)
+
+list(APPEND TestNetscapePlugin_SOURCES
+ TestNetscapePlugIn/PluginObjectMac.mm
+)
+
+list(APPEND DumpRenderTree_SOURCES
+ DefaultPolicyDelegate.m
+ DumpRenderTreeFileDraggingSource.m
+
+ cf/WebArchiveDumpSupport.cpp
+
+ cg/PixelDumpSupportCG.cpp
+
+ mac/AccessibilityCommonMac.h
+ mac/AccessibilityCommonMac.mm
+ mac/AccessibilityControllerMac.mm
+ mac/AccessibilityNotificationHandler.h
+ mac/AccessibilityNotificationHandler.mm
+ mac/AccessibilityTextMarkerMac.mm
+ mac/AccessibilityUIElementMac.mm
+ mac/AppleScriptController.m
+ mac/CheckedMalloc.cpp
+ mac/DumpRenderTree.mm
+ mac/DumpRenderTreeDraggingInfo.mm
+ mac/DumpRenderTreeMain.mm
+ mac/DumpRenderTreePasteboard.m
+ mac/DumpRenderTreeWindow.mm
+ mac/EditingDelegate.mm
+ mac/EventSendingController.mm
+ mac/FrameLoadDelegate.mm
+ mac/GCControllerMac.mm
+ mac/HistoryDelegate.mm
+ mac/MockGeolocationProvider.mm
+ mac/MockWebNotificationProvider.mm
+ mac/NavigationController.m
+ mac/ObjCController.m
+ mac/ObjCPlugin.m
+ mac/ObjCPluginFunction.m
+ mac/PixelDumpSupportMac.mm
+ mac/PolicyDelegate.mm
+ mac/ResourceLoadDelegate.mm
+ mac/TestRunnerMac.mm
+ mac/TextInputController.m
+ mac/UIDelegate.mm
+ mac/WebArchiveDumpSupportMac.mm
+ mac/WorkQueueItemMac.mm
+)
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (198946 => 198947)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-04-01 16:45:58 UTC (rev 198947)
@@ -23,6 +23,10 @@
win/WorkQueueItemWin.cpp
)
+list(APPEND TestNetscapePlugin_LIBRARIES
+ WebKit
+)
+
set(DumpRenderTree_SOURCES
${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
)
Modified: trunk/Tools/DumpRenderTree/mac/AppleScriptController.m (198946 => 198947)
--- trunk/Tools/DumpRenderTree/mac/AppleScriptController.m 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/DumpRenderTree/mac/AppleScriptController.m 2016-04-01 16:45:58 UTC (rev 198947)
@@ -75,7 +75,7 @@
value = [NSString stringWithFormat:@"%016llX", (unsigned long long)d];
}
break;
- case typeAEList:
+ case typeAEList: {
value = [NSMutableString stringWithString:@"("];
int numItems = [aeDesc numberOfItems];
for (int i = 0; i < numItems; ++i) {
@@ -86,6 +86,7 @@
}
[(NSMutableString*)value appendString:@")"];
break;
+ }
case typeType: {
OSType type = [aeDesc typeCodeValue];
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm (198946 => 198947)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm 2016-04-01 16:45:58 UTC (rev 198947)
@@ -23,6 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#if PLATFORM(MAC)
#include "DumpRenderTreeMac.h"
Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m (198946 => 198947)
--- trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2016-04-01 16:18:15 UTC (rev 198946)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2016-04-01 16:45:58 UTC (rev 198947)
@@ -29,6 +29,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import "config.h"
+
#if !PLATFORM(IOS)
#import <AppKit/AppKit.h>
