Diff
Modified: trunk/ChangeLog (250549 => 250550)
--- trunk/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,3 +1,12 @@
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * Source/cmake/OptionsMac.cmake:
+
2019-09-30 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] Add about:gpu
Modified: trunk/Source/_javascript_Core/ChangeLog (250549 => 250550)
--- trunk/Source/_javascript_Core/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,5 +1,14 @@
2019-09-30 Alex Christensen <achristen...@webkit.org>
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * PlatformMac.cmake:
+
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
Rename JSTokenType::EXPORT to EXPORT_ to avoid naming conflict with internal header
https://bugs.webkit.org/show_bug.cgi?id=202385
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (250549 => 250550)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -16,11 +16,14 @@
)
list(APPEND _javascript_Core_PUBLIC_FRAMEWORK_HEADERS
+ API/JSCallbackFunction.h
API/JSContext.h
+ API/JSContextPrivate.h
API/JSExport.h
API/JSManagedValue.h
API/JSStringRefCF.h
API/JSValue.h
+ API/JSValuePrivate.h
API/JSVirtualMachine.h
API/_javascript_Core.h
)
Modified: trunk/Source/WTF/ChangeLog (250549 => 250550)
--- trunk/Source/WTF/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WTF/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,3 +1,13 @@
+
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * wtf/PlatformMac.cmake:
+
2019-09-30 Mark Lam <mark....@apple.com>
Add some assertions to convertUTF8ToUTF16().
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (250549 => 250550)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -28,6 +28,7 @@
spi/cocoa/objcSPI.h
spi/darwin/DataVaultSPI.h
+ spi/darwin/ProcessMemoryFootprint.h
spi/darwin/SandboxSPI.h
spi/darwin/XPCSPI.h
spi/darwin/dyldSPI.h
Modified: trunk/Source/WebCore/ChangeLog (250549 => 250550)
--- trunk/Source/WebCore/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebCore/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,3 +1,12 @@
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * PlatformMac.cmake:
+
2019-09-30 Chris Dumez <cdu...@apple.com>
Make GenericEventQueue an ActiveDOMObject
Modified: trunk/Source/WebCore/PAL/ChangeLog (250549 => 250550)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,5 +1,14 @@
2019-09-30 Alex Christensen <achristen...@webkit.org>
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * pal/PlatformMac.cmake:
+
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
Unify more WebKitLegacy sources
https://bugs.webkit.org/show_bug.cgi?id=202390
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (250549 => 250550)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -39,6 +39,7 @@
spi/cocoa/NSFileManagerSPI.h
spi/cocoa/NSFileSizeFormatterSPI.h
spi/cocoa/NSKeyedArchiverSPI.h
+ spi/cocoa/NSProgressSPI.h
spi/cocoa/NSStringSPI.h
spi/cocoa/NSTouchBarSPI.h
spi/cocoa/NSURLConnectionSPI.h
Modified: trunk/Source/WebCore/PlatformMac.cmake (250549 => 250550)
--- trunk/Source/WebCore/PlatformMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebCore/PlatformMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -449,6 +449,7 @@
page/mac/TextIndicatorWindow.h
page/mac/WebCoreFrameView.h
+ page/scrolling/ScrollingStateOverflowScrollProxyNode.h
page/scrolling/cocoa/ScrollingTreeFixedNode.h
page/scrolling/cocoa/ScrollingTreePositionedNode.h
page/scrolling/cocoa/ScrollingTreeStickyNode.h
Modified: trunk/Source/WebKit/ChangeLog (250549 => 250550)
--- trunk/Source/WebKit/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKit/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,3 +1,17 @@
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ * PlatformMac.cmake:
+ * Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ * WebKit2Prefix.h:
+
2019-09-30 Christopher Reid <chris.r...@sony.com>
[WinCairo] Move Remote Inspector Server initialization out of WebView
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (250549 => 250550)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-10-01 06:29:13 UTC (rev 250550)
@@ -55,6 +55,7 @@
#import <wtf/SoftLinking.h>
#import <wtf/URL.h>
#import <wtf/text/WTFString.h>
+#import <wtf/BlockPtr.h>
#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/NetworkSessionCocoaAdditions.h>
Modified: trunk/Source/WebKit/PlatformMac.cmake (250549 => 250550)
--- trunk/Source/WebKit/PlatformMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKit/PlatformMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -177,7 +177,6 @@
UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
- UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
UIProcess/API/Cocoa/LegacyBundleForClass.mm
UIProcess/API/Cocoa/WKBackForwardList.mm
UIProcess/API/Cocoa/WKBackForwardListItem.mm
@@ -399,14 +398,17 @@
"${WEBKIT_DIR}/Platform/spi/Cocoa"
"${WEBKIT_DIR}/Platform/spi/mac"
"${WEBKIT_DIR}/Platform/IPC/mac"
+ "${WEBKIT_DIR}/Platform/IPC/cocoa"
"${WEBKIT_DIR}/Platform/spi/Cocoa"
"${WEBKIT_DIR}/Shared/API/Cocoa"
"${WEBKIT_DIR}/Shared/API/c/cf"
"${WEBKIT_DIR}/Shared/API/c/cg"
"${WEBKIT_DIR}/Shared/API/c/mac"
+ "${WEBKIT_DIR}/Shared/Authentication/cocoa"
+ "${WEBKIT_DIR}/Shared/ios"
"${WEBKIT_DIR}/Shared/cf"
"${WEBKIT_DIR}/Shared/Cocoa"
- "${WEBKIT_DIR}/Shared/EntryPointUtilities/mac/XPCService"
+ "${WEBKIT_DIR}/Shared/EntryPointUtilities/Cocoa/XPCService"
"${WEBKIT_DIR}/Shared/mac"
"${WEBKIT_DIR}/Shared/Plugins/mac"
"${WEBKIT_DIR}/Shared/Scrolling"
Modified: trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm (250549 => 250550)
--- trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm 2019-10-01 06:29:13 UTC (rev 250550)
@@ -41,6 +41,7 @@
#import "_WKRemoteObjectInterface.h"
#import <objc/runtime.h>
+extern "C" const char *_protocol_getMethodTypeEncoding(Protocol *p, SEL sel, BOOL isRequiredMethod, BOOL isInstanceMethod);
extern "C" id __NSMakeSpecialForwardingCaptureBlock(const char *signature, void (^handler)(NSInvocation *inv));
static const void* replyBlockKey = &replyBlockKey;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (250549 => 250550)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-10-01 06:29:13 UTC (rev 250550)
@@ -34,7 +34,6 @@
#import "DiagnosticLoggingClient.h"
#import "DynamicViewportSizeUpdate.h"
#import "FindClient.h"
-#import "FrontBoardServicesSPI.h"
#import "FullscreenClient.h"
#import "GlobalFindInPageState.h"
#import "IconLoadingDelegate.h"
@@ -140,6 +139,7 @@
#endif
#if PLATFORM(IOS_FAMILY)
+#import "FrontBoardServicesSPI.h"
#import "InteractionInformationAtPosition.h"
#import "InteractionInformationRequest.h"
#import "ProcessThrottler.h"
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (250549 => 250550)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2019-10-01 06:29:13 UTC (rev 250550)
@@ -33,6 +33,7 @@
#import "WKProcessPool.h"
#import "WKRetainPtr.h"
#import "WKUserContentController.h"
+#import "WKWebpagePreferencesInternal.h"
#import "WKWebView.h"
#import "WKWebViewContentProviderRegistry.h"
#import "WebKit2Initialize.h"
Modified: trunk/Source/WebKit/WebKit2Prefix.h (250549 => 250550)
--- trunk/Source/WebKit/WebKit2Prefix.h 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKit/WebKit2Prefix.h 2019-10-01 06:29:13 UTC (rev 250550)
@@ -47,10 +47,22 @@
#if USE(APPKIT)
#import <Cocoa/Cocoa.h>
#endif
-#endif
+#endif // __OBJC__
+#ifdef BUILDING_WITH_CMAKE
+#ifndef JSC_API_AVAILABLE
+#define JSC_API_AVAILABLE(...)
#endif
+#ifndef JSC_CLASS_AVAILABLE
+#define JSC_CLASS_AVAILABLE(...) JS_EXPORT
+#endif
+#ifndef JSC_API_DEPRECATED
+#define JSC_API_DEPRECATED(...)
+#endif
+#endif // BUILDING_WITH_CMAKE
+#endif // PLATFORM(COCOA)
+
/* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
* to allow C++ code that expects exceptions to build. These definitions
* interfere with Objective-C++ uses of Objective-C exception handlers, which
Modified: trunk/Source/WebKitLegacy/ChangeLog (250549 => 250550)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,5 +1,14 @@
2019-09-30 Alex Christensen <achristen...@webkit.org>
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * PlatformMac.cmake:
+
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
Unify more WebKitLegacy sources
https://bugs.webkit.org/show_bug.cgi?id=202390
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (250549 => 250550)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -5,155 +5,18 @@
list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
"${WEBKITLEGACY_DIR}/mac"
- "${WEBKITLEGACY_DIR}/mac/Carbon"
- "${WEBKITLEGACY_DIR}/mac/DefaultDelegates"
- "${WEBKITLEGACY_DIR}/mac/DOM"
- "${WEBKITLEGACY_DIR}/mac/History"
- "${WEBKITLEGACY_DIR}/mac/icu"
- "${WEBKITLEGACY_DIR}/mac/Misc"
- "${WEBKITLEGACY_DIR}/mac/Panels"
- "${WEBKITLEGACY_DIR}/mac/Plugins"
- "${WEBKITLEGACY_DIR}/mac/Plugins/Hosted"
- "${WEBKITLEGACY_DIR}/mac/Storage"
- "${WEBKITLEGACY_DIR}/mac/WebCoreSupport"
- "${WEBKITLEGACY_DIR}/mac/WebInspector"
- "${WEBKITLEGACY_DIR}/mac/WebView"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
)
+list(APPEND WebKitLegacy_UNIFIED_SOURCE_LIST_FILES
+ SourcesCocoa.txt
+)
+
list(APPEND WebKitLegacy_SOURCES
cf/WebCoreSupport/WebInspectorClientCF.cpp
- mac/DOM/DOM.mm
- mac/DOM/DOMAbstractView.mm
- mac/DOM/DOMAttr.mm
- mac/DOM/DOMBlob.mm
- mac/DOM/DOMCDATASection.mm
- mac/DOM/DOMCharacterData.mm
- mac/DOM/DOMComment.mm
- mac/DOM/DOMCounter.mm
- mac/DOM/DOMCSS.mm
- mac/DOM/DOMCSSCharsetRule.mm
- mac/DOM/DOMCSSFontFaceRule.mm
- mac/DOM/DOMCSSImportRule.mm
- mac/DOM/DOMCSSMediaRule.mm
- mac/DOM/DOMCSSPageRule.mm
- mac/DOM/DOMCSSPrimitiveValue.mm
- mac/DOM/DOMCSSRule.mm
- mac/DOM/DOMCSSRuleList.mm
- mac/DOM/DOMCSSStyleDeclaration.mm
- mac/DOM/DOMCSSStyleRule.mm
- mac/DOM/DOMCSSStyleSheet.mm
- mac/DOM/DOMCSSUnknownRule.mm
- mac/DOM/DOMCSSValue.mm
- mac/DOM/DOMCSSValueList.mm
- mac/DOM/DOMCustomXPathNSResolver.mm
- mac/DOM/DOMDocument.mm
- mac/DOM/DOMDocumentFragment.mm
- mac/DOM/DOMDocumentType.mm
- mac/DOM/DOMElement.mm
- mac/DOM/DOMEntityReference.mm
- mac/DOM/DOMEvent.mm
- mac/DOM/DOMEvents.mm
- mac/DOM/DOMFile.mm
- mac/DOM/DOMFileList.mm
- mac/DOM/DOMHTML.mm
- mac/DOM/DOMHTMLAnchorElement.mm
- mac/DOM/DOMHTMLAppletElement.mm
- mac/DOM/DOMHTMLAreaElement.mm
- mac/DOM/DOMHTMLBRElement.mm
- mac/DOM/DOMHTMLBaseElement.mm
- mac/DOM/DOMHTMLBaseFontElement.mm
- mac/DOM/DOMHTMLBodyElement.mm
- mac/DOM/DOMHTMLButtonElement.mm
- mac/DOM/DOMHTMLCanvasElement.mm
- mac/DOM/DOMHTMLCollection.mm
- mac/DOM/DOMHTMLDListElement.mm
- mac/DOM/DOMHTMLDirectoryElement.mm
- mac/DOM/DOMHTMLDivElement.mm
- mac/DOM/DOMHTMLDocument.mm
- mac/DOM/DOMHTMLElement.mm
- mac/DOM/DOMHTMLEmbedElement.mm
- mac/DOM/DOMHTMLFieldSetElement.mm
- mac/DOM/DOMHTMLFontElement.mm
- mac/DOM/DOMHTMLFormElement.mm
- mac/DOM/DOMHTMLFrameElement.mm
- mac/DOM/DOMHTMLFrameSetElement.mm
- mac/DOM/DOMHTMLHRElement.mm
- mac/DOM/DOMHTMLHeadElement.mm
- mac/DOM/DOMHTMLHeadingElement.mm
- mac/DOM/DOMHTMLHtmlElement.mm
- mac/DOM/DOMHTMLIFrameElement.mm
- mac/DOM/DOMHTMLImageElement.mm
- mac/DOM/DOMHTMLInputElement.mm
- mac/DOM/DOMHTMLLIElement.mm
- mac/DOM/DOMHTMLLabelElement.mm
- mac/DOM/DOMHTMLLegendElement.mm
- mac/DOM/DOMHTMLLinkElement.mm
- mac/DOM/DOMHTMLMapElement.mm
- mac/DOM/DOMHTMLMarqueeElement.mm
- mac/DOM/DOMHTMLMediaElement.mm
- mac/DOM/DOMHTMLMenuElement.mm
- mac/DOM/DOMHTMLMetaElement.mm
- mac/DOM/DOMHTMLModElement.mm
- mac/DOM/DOMHTMLOListElement.mm
- mac/DOM/DOMHTMLObjectElement.mm
- mac/DOM/DOMHTMLOptGroupElement.mm
- mac/DOM/DOMHTMLOptionElement.mm
- mac/DOM/DOMHTMLOptionsCollection.mm
- mac/DOM/DOMHTMLParagraphElement.mm
- mac/DOM/DOMHTMLParamElement.mm
- mac/DOM/DOMHTMLPreElement.mm
- mac/DOM/DOMHTMLQuoteElement.mm
- mac/DOM/DOMHTMLScriptElement.mm
- mac/DOM/DOMHTMLSelectElement.mm
- mac/DOM/DOMHTMLStyleElement.mm
- mac/DOM/DOMHTMLTableCaptionElement.mm
- mac/DOM/DOMHTMLTableCellElement.mm
- mac/DOM/DOMHTMLTableColElement.mm
- mac/DOM/DOMHTMLTableElement.mm
- mac/DOM/DOMHTMLTableRowElement.mm
- mac/DOM/DOMHTMLTableSectionElement.mm
- mac/DOM/DOMHTMLTextAreaElement.mm
- mac/DOM/DOMHTMLTitleElement.mm
- mac/DOM/DOMHTMLUListElement.mm
- mac/DOM/DOMHTMLVideoElement.mm
- mac/DOM/DOMInternal.mm
- mac/DOM/DOMImplementation.mm
- mac/DOM/DOMKeyboardEvent.mm
- mac/DOM/DOMMediaError.mm
- mac/DOM/DOMMediaList.mm
- mac/DOM/DOMMouseEvent.mm
- mac/DOM/DOMMutationEvent.mm
- mac/DOM/DOMNamedNodeMap.mm
- mac/DOM/DOMNode.mm
- mac/DOM/DOMNodeIterator.mm
- mac/DOM/DOMNodeList.mm
- mac/DOM/DOMObject.mm
- mac/DOM/DOMOverflowEvent.mm
- mac/DOM/DOMProcessingInstruction.mm
- mac/DOM/DOMProgressEvent.mm
- mac/DOM/DOMRGBColor.mm
- mac/DOM/DOMRange.mm
- mac/DOM/DOMRect.mm
- mac/DOM/DOMStyleSheet.mm
- mac/DOM/DOMStyleSheetList.mm
- mac/DOM/DOMText.mm
- mac/DOM/DOMTextEvent.mm
- mac/DOM/DOMTimeRanges.mm
- mac/DOM/DOMTokenList.mm
- mac/DOM/DOMTreeWalker.mm
- mac/DOM/DOMUIEvent.mm
- mac/DOM/DOMUIKitExtensions.mm
- mac/DOM/DOMUtility.mm
- mac/DOM/DOMWheelEvent.mm
- mac/DOM/DOMXPath.mm
- mac/DOM/DOMXPathExpression.mm
- mac/DOM/DOMXPathResult.mm
- mac/DOM/ExceptionHandlers.mm
- mac/DOM/ObjCEventListener.mm
- mac/DOM/ObjCNodeFilterCondition.mm
-
- mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
mac/DefaultDelegates/WebDefaultEditingDelegate.m
mac/DefaultDelegates/WebDefaultPolicyDelegate.m
mac/DefaultDelegates/WebDefaultUIDelegate.mm
@@ -161,7 +24,6 @@
mac/History/BackForwardList.mm
mac/History/BinaryPropertyList.cpp
mac/History/HistoryPropertyList.mm
- mac/History/WebBackForwardList.mm
mac/History/WebHistory.mm
mac/History/WebHistoryItem.mm
mac/History/WebURLsWithTitles.m
@@ -192,7 +54,6 @@
mac/Misc/WebNSUserDefaultsExtras.mm
mac/Misc/WebNSViewExtras.m
mac/Misc/WebNSWindowExtras.m
- mac/Misc/WebSharingServicePickerController.mm
mac/Misc/WebStringTruncator.mm
mac/Misc/WebUserContentURLPattern.mm
@@ -200,15 +61,11 @@
mac/Panels/WebPanelAuthenticationHandler.m
mac/Plugins/WebBaseNetscapePluginView.mm
- mac/Plugins/WebBasePluginPackage.mm
mac/Plugins/WebNetscapePluginEventHandler.mm
mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm
mac/Plugins/WebNetscapePluginPackage.mm
mac/Plugins/WebNetscapePluginStream.mm
mac/Plugins/WebNetscapePluginView.mm
- mac/Plugins/WebPluginContainerCheck.mm
- mac/Plugins/WebPluginController.mm
- mac/Plugins/WebPluginDatabase.mm
mac/Plugins/WebPluginPackage.mm
mac/Plugins/WebPluginRequest.m
mac/Plugins/npapi.mm
@@ -238,14 +95,11 @@
mac/WebCoreSupport/PopupMenuMac.mm
mac/WebCoreSupport/SearchPopupMenuMac.mm
mac/WebCoreSupport/WebAlternativeTextClient.mm
- mac/WebCoreSupport/WebApplicationCache.mm
- mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm
mac/WebCoreSupport/WebChromeClient.mm
mac/WebCoreSupport/WebContextMenuClient.mm
mac/WebCoreSupport/WebDeviceOrientationClient.mm
mac/WebCoreSupport/WebDragClient.mm
mac/WebCoreSupport/WebEditorClient.mm
- mac/WebCoreSupport/WebFrameLoaderClient.mm
mac/WebCoreSupport/WebFrameNetworkingContext.mm
mac/WebCoreSupport/WebGeolocationClient.mm
mac/WebCoreSupport/WebInspectorClient.mm
@@ -261,7 +115,6 @@
mac/WebCoreSupport/WebValidationMessageClient.mm
mac/WebCoreSupport/WebVisitedLinkStore.mm
- mac/WebInspector/WebInspector.mm
mac/WebInspector/WebInspectorFrontend.mm
mac/WebInspector/WebNodeHighlight.mm
mac/WebInspector/WebNodeHighlightView.mm
@@ -268,9 +121,7 @@
mac/WebInspector/WebNodeHighlighter.mm
mac/WebView/WebArchive.mm
- mac/WebView/WebClipView.mm
mac/WebView/WebDashboardRegion.mm
- mac/WebView/WebDataSource.mm
mac/WebView/WebDelegateImplementationCaching.mm
mac/WebView/WebDeviceOrientation.mm
mac/WebView/WebDeviceOrientationProviderMock.mm
@@ -277,65 +128,457 @@
mac/WebView/WebDocumentLoaderMac.mm
mac/WebView/WebDynamicScrollBarsView.mm
mac/WebView/WebFormDelegate.m
- mac/WebView/WebFrame.mm
- mac/WebView/WebFrameView.mm
- mac/WebView/WebFullScreenController.mm
mac/WebView/WebGeolocationPosition.mm
mac/WebView/WebHTMLRepresentation.mm
- mac/WebView/WebHTMLView.mm
- mac/WebView/WebImmediateActionController.mm
mac/WebView/WebIndicateLayer.mm
mac/WebView/WebJSPDFDoc.mm
mac/WebView/WebNavigationData.mm
mac/WebView/WebNotification.mm
mac/WebView/WebPDFDocumentExtras.mm
- mac/WebView/WebPDFRepresentation.mm
- mac/WebView/WebPDFView.mm
mac/WebView/WebPolicyDelegate.mm
mac/WebView/WebPreferences.mm
mac/WebView/WebResource.mm
- mac/WebView/WebScriptDebugDelegate.mm
- mac/WebView/WebScriptDebugger.mm
- mac/WebView/WebScriptWorld.mm
mac/WebView/WebTextCompletionController.mm
mac/WebView/WebTextIterator.mm
- mac/WebView/WebView.mm
mac/WebView/WebViewData.mm
)
-set(WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES
- mac/DOM
- mac/DefaultDelegates
- mac/History
- mac/Misc
- mac/Panels
- mac/Plugins
- mac/Storage
- mac/WebCoreSupport
- mac/WebInspector
- mac/WebView
-)
-
set(WebKitLegacy_FORWARDING_HEADERS_FILES
+ mac/DOM/DOMHTMLHeadingElement.h
+ mac/DOM/DOMHTMLBaseFontElement.h
+ mac/DOM/DOMCSSUnknownRule.h
+ mac/DOM/DOMHTMLCollection.h
+ mac/DOM/DOMHTMLDivElement.h
+ mac/DOM/DOMHTMLFormElement.h
+ mac/DOM/DOMXPathExpressionInternal.h
+ mac/DOM/DOMHTMLHeadElement.h
+ mac/DOM/DOMImplementation.h
+ mac/DOM/DOMCSSStyleRule.h
+ mac/DOM/DOMCSSRule.h
+ mac/DOM/DOMEvents.h
+ mac/DOM/DOMHTMLImageElementInternal.h
+ mac/DOM/DOMMouseEvent.h
+ mac/DOM/DOMElement.h
+ mac/DOM/DOMMediaListInternal.h
+ mac/DOM/DOMHTMLMapElement.h
+ mac/DOM/DOMCSSRuleInternal.h
+ mac/DOM/DOMMediaList.h
+ mac/DOM/DOMCSSRuleListInternal.h
+ mac/DOM/DOMDocumentInternal.h
mac/DOM/WebDOMOperations.h
+ mac/DOM/DOMNodePrivate.h
+ mac/DOM/DOMHTMLParagraphElement.h
+ mac/DOM/DOMHTMLFormElementInternal.h
+ mac/DOM/DOMProgressEvent.h
+ mac/DOM/DOMDocumentFragmentInternal.h
+ mac/DOM/DOMHTMLTextAreaElementPrivate.h
+ mac/DOM/DOMProcessingInstructionInternal.h
+ mac/DOM/DOMDocumentFragmentPrivate.h
+ mac/DOM/DOMRangeInternal.h
+ mac/DOM/DOMRangeException.h
+ mac/DOM/DOMCSSCharsetRule.h
+ mac/DOM/DOMHTMLFrameElement.h
+ mac/DOM/DOMHTMLHRElement.h
+ mac/DOM/DOMViews.h
+ mac/DOM/DOMCSSStyleDeclarationInternal.h
+ mac/DOM/DOMCSSPrimitiveValue.h
+ mac/DOM/DOMCSSMediaRule.h
+ mac/DOM/DOMHTMLLegendElement.h
+ mac/DOM/DOMBlobInternal.h
+ mac/DOM/DOMNodeFilter.h
+ mac/DOM/DOMStylesheets.h
+ mac/DOM/ObjCNodeFilterCondition.h
+ mac/DOM/DOMHTMLCollectionInternal.h
+ mac/DOM/DOMRect.h
+ mac/DOM/DOMCSSRuleList.h
+ mac/DOM/DOMHTMLIFrameElement.h
+ mac/DOM/DOMHTMLUListElement.h
+ mac/DOM/DOMFileList.h
+ mac/DOM/DOMTraversal.h
+ mac/DOM/DOMHTMLTableCellElement.h
+ mac/DOM/DOMHTMLDirectoryElement.h
+ mac/DOM/DOMNodeListInternal.h
+ mac/DOM/DOMExtensions.h
+ mac/DOM/DOMHTMLParamElement.h
+ mac/DOM/DOMCDATASectionInternal.h
+ mac/DOM/DOMHTMLOptGroupElement.h
+ mac/DOM/DOMRanges.h
+ mac/DOM/DOMHTMLOptionElementInternal.h
+ mac/DOM/DOMXPathResultInternal.h
+ mac/DOM/DOMHTMLTitleElement.h
+ mac/DOM/DOMHTMLTextAreaElementInternal.h
+ mac/DOM/DOMDocumentTypeInternal.h
+ mac/DOM/DOMCSSPageRule.h
+ mac/DOM/DOMMutationEvent.h
+ mac/DOM/DOMEventException.h
+ mac/DOM/DOMTimeRangesInternal.h
+ mac/DOM/DOMNamedNodeMapInternal.h
+ mac/DOM/DOMXPathExpression.h
+ mac/DOM/DOMXPathResult.h
+ mac/DOM/DOMFileInternal.h
+ mac/DOM/DOMCSS.h
+ mac/DOM/DOMHTMLTableSectionElement.h
+ mac/DOM/DOMCSSFontFaceRule.h
+ mac/DOM/DOMStyleSheet.h
+ mac/DOM/DOMInternal.h
+ mac/DOM/DOMNodeIterator.h
+ mac/DOM/DOMCounterInternal.h
+ mac/DOM/DOM.h
+ mac/DOM/DOMHTMLBRElement.h
+ mac/DOM/DOMTokenList.h
+ mac/DOM/DOMHTMLMenuElement.h
+ mac/DOM/DOMCSSStyleSheetInternal.h
+ mac/DOM/DOMNodeList.h
+ mac/DOM/DOMHTMLStyleElementInternal.h
+ mac/DOM/DOMXPath.h
+ mac/DOM/DOMWheelEventInternal.h
+ mac/DOM/DOMHTMLBodyElement.h
+ mac/DOM/DOMCSSValueList.h
+ mac/DOM/DOMHTMLScriptElementInternal.h
+ mac/DOM/DOMKeyboardEvent.h
+ mac/DOM/DOMStyleSheetList.h
+ mac/DOM/DOMHTMLObjectElement.h
+ mac/DOM/DOMHTMLLinkElement.h
+ mac/DOM/DOMHTMLLIElement.h
+ mac/DOM/DOMHTMLTableRowElement.h
+ mac/DOM/DOMCDATASection.h
+ mac/DOM/DOMAbstractView.h
+ mac/DOM/DOMHTMLSelectElement.h
+ mac/DOM/DOMHTMLCanvasElement.h
+ mac/DOM/WebDOMOperationsPrivate.h
+ mac/DOM/DOMTreeWalkerInternal.h
+ mac/DOM/DOMMediaError.h
+ mac/DOM/DOMHTMLScriptElement.h
+ mac/DOM/DOMHTMLAnchorElement.h
+ mac/DOM/DOMHTMLInputElement.h
+ mac/DOM/DOMAbstractViewInternal.h
+ mac/DOM/DOMCSSImportRule.h
+ mac/DOM/DOMElementInternal.h
+ mac/DOM/DOMHTMLTableColElementInternal.h
+ mac/DOM/DOMHTMLInputElementPrivate.h
+ mac/DOM/DOMHTML.h
+ mac/DOM/DOMProcessingInstruction.h
+ mac/DOM/DOMNodeIteratorInternal.h
+ mac/DOM/DOMHTMLMarqueeElement.h
+ mac/DOM/DOMHTMLDocumentInternal.h
+ mac/DOM/DOMHTMLElement.h
+ mac/DOM/DOMUIKitExtensions.h
+ mac/DOM/DOMHTMLElementInternal.h
+ mac/DOM/DOMText.h
+ mac/DOM/DOMOverflowEvent.h
+ mac/DOM/DOMAbstractViewFrame.h
+ mac/DOM/DOMHTMLDocument.h
+ mac/DOM/DOMHTMLMediaElement.h
+ mac/DOM/DOMHTMLStyleElement.h
+ mac/DOM/DOMEntityReference.h
+ mac/DOM/WebDOMOperationsInternal.h
+ mac/DOM/DOMHTMLBaseElement.h
+ mac/DOM/ObjCEventListener.h
+ mac/DOM/DOMEventInternal.h
+ mac/DOM/DOMCSSStyleDeclaration.h
+ mac/DOM/DOMDocumentFragment.h
+ mac/DOM/DOMHTMLDListElement.h
+ mac/DOM/DOMCSSStyleSheet.h
+ mac/DOM/DOMNamedNodeMap.h
+ mac/DOM/DOMHTMLHeadElementInternal.h
+ mac/DOM/ExceptionHandlers.h
+ mac/DOM/DOMTextEvent.h
+ mac/DOM/DOMNodeInternal.h
+ mac/DOM/DOMHTMLHtmlElement.h
+ mac/DOM/DOMImplementationInternal.h
+ mac/DOM/DOMHTMLOptionsCollectionInternal.h
+ mac/DOM/DOMCSSPrimitiveValueInternal.h
+ mac/DOM/DOMHTMLTableCaptionElementInternal.h
+ mac/DOM/DOMEventListener.h
+ mac/DOM/DOMCounter.h
+ mac/DOM/DOMDocumentPrivate.h
+ mac/DOM/DOMHTMLTableCaptionElement.h
+ mac/DOM/WebAutocapitalizeTypes.h
+ mac/DOM/DOMHTMLAreaElementInternal.h
+ mac/DOM/DOMAttr.h
+ mac/DOM/DOMWheelEvent.h
+ mac/DOM/DOMTreeWalker.h
+ mac/DOM/DOMHTMLOptionElement.h
+ mac/DOM/DOMDocumentType.h
+ mac/DOM/DOMException.h
+ mac/DOM/DOMHTMLFieldSetElement.h
+ mac/DOM/DOMStyleSheetListInternal.h
+ mac/DOM/DOMCore.h
+ mac/DOM/DOMRGBColor.h
+ mac/DOM/DOMHTMLOptionsCollection.h
+ mac/DOM/DOMRectInternal.h
+ mac/DOM/DOMEvent.h
+ mac/DOM/DOMTokenListInternal.h
+ mac/DOM/DOMTimeRanges.h
+ mac/DOM/DOMHTMLTableCellElementInternal.h
+ mac/DOM/DOMNode.h
+ mac/DOM/DOMEventTarget.h
+ mac/DOM/DOMAttrInternal.h
+ mac/DOM/DOMHTMLTextAreaElement.h
+ mac/DOM/DOMHTMLImageElement.h
+ mac/DOM/DOMRGBColorInternal.h
+ mac/DOM/DOMHTMLLinkElementInternal.h
+ mac/DOM/DOMUIEvent.h
+ mac/DOM/DOMCommentInternal.h
+ mac/DOM/DOMHTMLFrameSetElement.h
+ mac/DOM/DOMHTMLTableElement.h
+ mac/DOM/DOMHTMLLabelElement.h
+ mac/DOM/DOMHTMLOListElement.h
+ mac/DOM/DOMMediaErrorInternal.h
+ mac/DOM/DOMComment.h
+ mac/DOM/DOMHTMLSelectElementInternal.h
+ mac/DOM/DOMXPathNSResolver.h
+ mac/DOM/DOMFileListInternal.h
+ mac/DOM/DOMHTMLTableColElement.h
+ mac/DOM/DOMTextInternal.h
+ mac/DOM/DOMHTMLAreaElement.h
+ mac/DOM/DOMRange.h
+ mac/DOM/DOMCharacterData.h
+ mac/DOM/DOMObject.h
+ mac/DOM/DOMDocument.h
+ mac/DOM/DOMHTMLFontElement.h
+ mac/DOM/DOMHTMLAppletElement.h
+ mac/DOM/DOMStyleSheetInternal.h
+ mac/DOM/DOMHTMLModElement.h
+ mac/DOM/DOMHTMLMetaElement.h
+ mac/DOM/DOMCSSValue.h
+ mac/DOM/DOMBlob.h
+ mac/DOM/DOMPrivate.h
+ mac/DOM/DOMXPathException.h
+ mac/DOM/DOMHTMLTableSectionElementInternal.h
+ mac/DOM/DOMCSSValueInternal.h
+ mac/DOM/DOMFile.h
+ mac/DOM/DOMCustomXPathNSResolver.h
+ mac/DOM/DOMHTMLPreElement.h
+ mac/DOM/DOMHTMLInputElementInternal.h
+ mac/DOM/DOMHTMLQuoteElement.h
+ mac/DOM/DOMHTMLEmbedElement.h
+ mac/DOM/DOMHTMLVideoElement.h
+ mac/DOM/DOMEntity.h
+ mac/DOM/DOMHTMLElementPrivate.h
+ mac/DOM/DOMHTMLButtonElement.h
+ mac/History/WebHistoryItem.h
+ mac/History/HistoryPropertyList.h
+ mac/History/WebBackForwardList.h
+ mac/History/BinaryPropertyList.h
+ mac/History/WebBackForwardListInternal.h
+ mac/History/BackForwardList.h
+ mac/History/WebBackForwardListPrivate.h
mac/History/WebHistory.h
+ mac/History/WebURLsWithTitles.h
+ mac/History/WebHistoryPrivate.h
+ mac/History/WebHistoryItemPrivate.h
+ mac/History/WebHistoryItemInternal.h
+ mac/History/WebHistoryInternal.h
+
+ mac/DefaultDelegates/WebDefaultPolicyDelegate.h
+ mac/DefaultDelegates/WebDefaultUIDelegate.h
+ mac/DefaultDelegates/WebDefaultContextMenuDelegate.h
+ mac/DefaultDelegates/WebDefaultEditingDelegate.h
+
+ mac/History/WebHistory.h
mac/History/WebHistoryItem.h
+ mac/Misc/WebKitStatisticsPrivate.h
+ mac/Misc/WebCache.h
+ mac/Misc/NSURLDownloadSPI.h
+ mac/Misc/WebStringTruncator.h
+ mac/Misc/WebNSFileManagerExtras.h
+ mac/Misc/WebNSWindowExtras.h
+ mac/Misc/WebDownload.h
+ mac/Misc/WebNSControlExtras.h
+ mac/Misc/WebNSObjectExtras.h
+ mac/Misc/WebKitErrors.h
+ mac/Misc/WebNSViewExtras.h
+ mac/Misc/WebNSDictionaryExtras.h
+ mac/Misc/WebNSURLRequestExtras.h
+ mac/Misc/WebSharingServicePickerController.h
+ mac/Misc/WebLocalizableStringsInternal.h
+ mac/Misc/WebNSDataExtrasPrivate.h
+ mac/Misc/WebNSUserDefaultsExtras.h
+ mac/Misc/WebNSEventExtras.h
mac/Misc/WebNSURLExtras.h
+ mac/Misc/WebIconDatabase.h
+ mac/Misc/WebKitStatistics.h
+ mac/Misc/WebKitLogging.h
+ mac/Misc/WebQuotaManager.h
+ mac/Misc/WebKitNSStringExtras.h
+ mac/Misc/WebNSPrintOperationExtras.h
+ mac/Misc/WebNSImageExtras.h
+ mac/Misc/WebKitErrorsPrivate.h
+ mac/Misc/WebUserContentURLPattern.h
+ mac/Misc/WebKitVersionChecks.h
+ mac/Misc/WebLocalizableStrings.h
+ mac/Misc/WebTypesInternal.h
+ mac/Misc/WebCoreStatistics.h
+ mac/Misc/WebNSDataExtras.h
+ mac/Misc/WebElementDictionary.h
+ mac/Misc/WebKit.h
+ mac/Misc/WebNSPasteboardExtras.h
mac/Panels/WebPanelAuthenticationHandler.h
+ mac/Panels/WebAuthenticationPanel.h
+ mac/Plugins/WebPluginViewFactoryPrivate.h
mac/Plugins/WebBasePluginPackage.h
+ mac/Plugins/WebNetscapePluginView.h
+ mac/Plugins/WebNetscapePluginEventHandlerCocoa.h
+ mac/Plugins/WebNetscapePluginStream.h
+ mac/Plugins/WebBaseNetscapePluginView.h
+ mac/Plugins/WebPluginController.h
+ mac/Plugins/Hosted/WebTextInputWindowController.h
+ mac/Plugins/Hosted/NetscapePluginHostProxy.h
+ mac/Plugins/Hosted/ProxyRuntimeObject.h
+ mac/Plugins/Hosted/ProxyInstance.h
+ mac/Plugins/Hosted/NetscapePluginHostManager.h
+ mac/Plugins/Hosted/WebKitPluginHostTypes.h
+ mac/Plugins/Hosted/WebHostedNetscapePluginView.h
+ mac/Plugins/Hosted/HostedNetscapePluginStream.h
+ mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
+ mac/Plugins/WebPluginContainerCheck.h
+ mac/Plugins/WebPluginContainer.h
+ mac/Plugins/WebPluginPackagePrivate.h
+ mac/Plugins/WebPluginPackage.h
+ mac/Plugins/WebPluginRequest.h
+ mac/Plugins/WebNetscapePluginEventHandler.h
+ mac/Plugins/WebPluginContainerPrivate.h
+ mac/Plugins/WebJavaPlugIn.h
+ mac/Plugins/WebPluginViewFactory.h
+ mac/Plugins/WebPluginDatabase.h
+ mac/Plugins/WebNetscapePluginPackage.h
+ mac/Plugins/WebPlugin.h
mac/Storage/WebDatabaseManagerPrivate.h
+ mac/Storage/WebStorageTrackerClient.h
+ mac/Storage/WebDatabaseManagerInternal.h
+ mac/Storage/WebStorageManagerInternal.h
+ mac/Storage/WebDatabaseManagerClient.h
+ mac/Storage/WebStorageManagerPrivate.h
+ mac/Storage/WebDatabaseQuotaManager.h
+ mac/WebInspector/WebNodeHighlighter.h
+ mac/WebInspector/WebNodeHighlightView.h
+ mac/WebInspector/WebNodeHighlight.h
mac/WebInspector/WebInspector.h
+ mac/WebInspector/WebInspectorPrivate.h
+ mac/WebInspector/WebInspectorFrontend.h
+ mac/WebCoreSupport/WebAlternativeTextClient.h
+ mac/WebCoreSupport/WebSecurityOriginPrivate.h
+ mac/WebCoreSupport/WebCreateFragmentInternal.h
+ mac/WebCoreSupport/WebProgressTrackerClient.h
+ mac/WebCoreSupport/WebDragClient.h
+ mac/WebCoreSupport/WebChromeClient.h
+ mac/WebCoreSupport/WebPluginInfoProvider.h
+ mac/WebCoreSupport/WebEditorClient.h
+ mac/WebCoreSupport/CorrectionPanel.h
+ mac/WebCoreSupport/WebSwitchingGPUClient.h
+ mac/WebCoreSupport/WebSecurityOriginInternal.h
+ mac/WebCoreSupport/WebSelectionServiceController.h
+ mac/WebCoreSupport/WebVisitedLinkStore.h
+ mac/WebCoreSupport/WebApplicationCache.h
+ mac/WebCoreSupport/WebInspectorClient.h
+ mac/WebCoreSupport/WebApplicationCacheQuotaManager.h
+ mac/WebCoreSupport/WebContextMenuClient.h
+ mac/WebCoreSupport/SearchPopupMenuMac.h
+ mac/WebCoreSupport/WebJavaScriptTextInputPanel.h
+ mac/WebCoreSupport/WebPaymentCoordinatorClient.h
+ mac/WebCoreSupport/WebApplicationCacheInternal.h
+ mac/WebCoreSupport/WebPlatformStrategies.h
+ mac/WebCoreSupport/WebGeolocationClient.h
+ mac/WebCoreSupport/WebFrameNetworkingContext.h
+ mac/WebCoreSupport/PopupMenuMac.h
+ mac/WebCoreSupport/WebDeviceOrientationClient.h
+ mac/WebCoreSupport/WebValidationMessageClient.h
+ mac/WebCoreSupport/WebCachedFramePlatformData.h
+ mac/WebCoreSupport/WebFrameLoaderClient.h
+ mac/WebCoreSupport/WebNotificationClient.h
+ mac/WebCoreSupport/WebKitFullScreenListener.h
+ mac/WebCoreSupport/WebOpenPanelResultListener.h
+
+ mac/WebView/WebHTMLViewPrivate.h
mac/WebView/WebFrame.h
+ mac/WebView/WebScriptWorld.h
+ mac/WebView/WebFullScreenController.h
+ mac/WebView/WebArchiveInternal.h
+ mac/WebView/WebDocumentInternal.h
+ mac/WebView/WebNavigationData.h
+ mac/WebView/WebResource.h
+ mac/WebView/WebClipView.h
+ mac/WebView/WebNotificationInternal.h
+ mac/WebView/WebVideoFullscreenController.h
+ mac/WebView/WebScriptDebugDelegate.h
+ mac/WebView/WebViewPrivate.h
+ mac/WebView/WebArchive.h
+ mac/WebView/WebDocument.h
+ mac/WebView/WebFrameLoadDelegatePrivate.h
+ mac/WebView/WebFormDelegate.h
+ mac/WebView/WebPolicyDelegate.h
+ mac/WebView/WebDeviceOrientationProvider.h
+ mac/WebView/WebUIDelegate.h
+ mac/WebView/WebResourceLoadDelegatePrivate.h
+ mac/WebView/WebPDFDocumentExtras.h
+ mac/WebView/WebResourceInternal.h
+ mac/WebView/WebResourceLoadDelegate.h
+ mac/WebView/WebJSPDFDoc.h
+ mac/WebView/WebVideoFullscreenHUDWindowController.h
+ mac/WebView/WebDeviceOrientation.h
+ mac/WebView/WebUIDelegatePrivate.h
+ mac/WebView/WebScriptDebugger.h
+ mac/WebView/WebDeviceOrientationProviderMockInternal.h
+ mac/WebView/WebDynamicScrollBarsView.h
+ mac/WebView/WebPreferencesPrivate.h
+ mac/WebView/WebPolicyDelegatePrivate.h
+ mac/WebView/WebGeolocationPosition.h
+ mac/WebView/WebEditingDelegatePrivate.h
+ mac/WebView/WebScriptWorldInternal.h
+ mac/WebView/WebFrameViewPrivate.h
+ mac/WebView/WebViewInternal.h
+ mac/WebView/WebHTMLRepresentationPrivate.h
+ mac/WebView/WebMediaPlaybackTargetPicker.h
+ mac/WebView/WebAllowDenyPolicyListener.h
+ mac/WebView/WebPDFView.h
+ mac/WebView/WebTextIterator.h
+ mac/WebView/WebDataSourceInternal.h
+ mac/WebView/WebDocumentLoaderMac.h
mac/WebView/WebView.h
+ mac/WebView/WebFrameView.h
+ mac/WebView/WebTextCompletionController.h
+ mac/WebView/WebDelegateImplementationCaching.h
+ mac/WebView/WebDataSourcePrivate.h
+ mac/WebView/WebFramePrivate.h
+ mac/WebView/WebDeviceOrientationProviderMock.h
+ mac/WebView/WebDocumentPrivate.h
+ mac/WebView/WebViewData.h
+ mac/WebView/WebImmediateActionController.h
+ mac/WebView/WebFrameInternal.h
+ mac/WebView/WebDeviceOrientationInternal.h
+ mac/WebView/WebFrameLoadDelegate.h
+ mac/WebView/WebPreferenceKeysPrivate.h
+ mac/WebView/WebFrameViewInternal.h
+ mac/WebView/WebFormDelegatePrivate.h
+ mac/WebView/WebNotification.h
+ mac/WebView/PDFViewSPI.h
+ mac/WebView/WebResourcePrivate.h
+ mac/WebView/WebPreferences.h
+ mac/WebView/WebEditingDelegate.h
+ mac/WebView/WebHistoryDelegate.h
+ mac/WebView/WebWindowAnimation.h
+ mac/WebView/WebDashboardRegion.h
+ mac/WebView/WebHTMLView.h
+ mac/WebView/WebIndicateLayer.h
+ mac/WebView/WebHTMLRepresentation.h
+ mac/WebView/WebHTMLViewInternal.h
+ mac/WebView/WebDataSource.h
+ mac/WebView/WebPDFRepresentation.h
+ mac/WebView/WebGeolocationPositionInternal.h
+ mac/WebView/WebDynamicScrollBarsViewInternal.h
+ ${WEBCORE_DIR}/bridge/objc/WebScriptObject.h
+ ${WEBCORE_DIR}/platform/cocoa/WebKitAvailability.h
${WEBCORE_DIR}/plugins/npfunctions.h
+ ${WEBCORE_DIR}/plugins/npapi.h
)
add_definitions("-include WebKitPrefix.h")
@@ -342,42 +585,40 @@
set(C99_FILES
mac/DefaultDelegates/WebDefaultEditingDelegate.m
- mac/DefaultDelegates/WebDefaultPolicyDelegate.m
mac/DefaultDelegates/WebDefaultUIDelegate.m
mac/Misc/WebKitErrors.m
- mac/Misc/WebKitLogging.m
mac/Misc/WebKitStatistics.m
mac/Misc/WebKitSystemBits.m
mac/Misc/WebNSArrayExtras.m
mac/Misc/WebNSControlExtras.m
- mac/Misc/WebNSDictionaryExtras.m
mac/Misc/WebNSEventExtras.m
- mac/Misc/WebNSImageExtras.m
mac/Misc/WebNSPrintOperationExtras.m
mac/Misc/WebNSURLRequestExtras.m
mac/Misc/WebNSViewExtras.m
mac/Misc/WebNSWindowExtras.m
- mac/Panels/WebAuthenticationPanel.m
- mac/Panels/WebPanelAuthenticationHandler.m
-
mac/Plugins/WebPluginRequest.m
mac/Plugins/WebPluginsPrivate.m
mac/Plugins/Hosted/WebTextInputWindowController.m
- mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
-
mac/WebView/WebFormDelegate.m
)
+set(CPP_FILES
+ Storage/StorageThread.cpp
+)
+
foreach (_file ${WebKitLegacy_SOURCES})
list(FIND C99_FILES ${_file} _c99_index)
- if (${_c99_index} EQUAL -1)
+ list(FIND CPP_FILES ${_file} _cpp_index)
+ if (NOT ${_c99_index} EQUAL -1)
+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c99)
+ elseif (NOT ${_cpp_index} EQUAL -1)
+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c++1z)
+ else ()
set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++17")
- else ()
- set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c99)
endif ()
endforeach ()
@@ -426,4 +667,4 @@
set(WebKitLegacy_OUTPUT_NAME WebKitLegacy)
-set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION} -framework SecurityInterface")
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (250549 => 250550)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,5 +1,15 @@
2019-09-30 Alex Christensen <achristen...@webkit.org>
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * DefaultDelegates/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
+
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
Unify more WebKitLegacy sources
https://bugs.webkit.org/show_bug.cgi?id=202390
Modified: trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultPolicyDelegate.m (250549 => 250550)
--- trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultPolicyDelegate.m 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultPolicyDelegate.m 2019-10-01 06:29:13 UTC (rev 250550)
@@ -81,7 +81,7 @@
frame:(WebFrame *)frame
decisionListener:(id <WebPolicyDecisionListener>)listener
{
- WebNavigationType navType = [[actionInformation objectForKey:WebActionNavigationTypeKey] intValue];
+ WebNavigationType navType = (WebNavigationType)[[actionInformation objectForKey:WebActionNavigationTypeKey] intValue];
if ([WebView _canHandleRequest:request forMainFrame:frame == [wv mainFrame]]) {
[listener use];
Modified: trunk/Source/cmake/OptionsMac.cmake (250549 => 250550)
--- trunk/Source/cmake/OptionsMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Source/cmake/OptionsMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -6,10 +6,12 @@
# FIXME: Many of these defaults differ from the XCode build.
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CACHE_PARTITIONING PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_EXTENSIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_FILTERING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE OFF)
Modified: trunk/Tools/ChangeLog (250549 => 250550)
--- trunk/Tools/ChangeLog 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Tools/ChangeLog 2019-10-01 06:29:13 UTC (rev 250550)
@@ -1,3 +1,13 @@
+2019-09-30 Alex Christensen <achristen...@webkit.org>
+
+ Resurrect Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=202384
+
+ Rubber-stamped by Tim Horton.
+
+ * DumpRenderTree/PlatformMac.cmake:
+ * TestWebKitAPI/PlatformMac.cmake:
+
2019-09-30 Zhifei Fang <zhifei_f...@apple.com>
[results.webkit.org Timeline] New axis style
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (250549 => 250550)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -52,7 +52,6 @@
)
list(APPEND DumpRenderTree_ObjC_SOURCES
- DefaultPolicyDelegate.m
DumpRenderTreeFileDraggingSource.m
mac/AppleScriptController.m
Modified: trunk/Tools/TestWebKitAPI/PlatformMac.cmake (250549 => 250550)
--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2019-10-01 06:17:53 UTC (rev 250549)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2019-10-01 06:29:13 UTC (rev 250550)
@@ -18,6 +18,9 @@
${COCOA_LIBRARY}
${COREFOUNDATION_LIBRARY}
)
+list(APPEND TestWTF_SOURCES
+ cocoa/UtilitiesCocoa.mm
+)
list(APPEND TestWebKitAPI_LIBRARIES
${CARBON_LIBRARY}
