Attachment 372610 Details for Bug 198979 – Patch

[patch] Patch

bug-198979-20190620191459.patch (text/plain), 102.14 KB, created by Alex Christensen on 2019-06-20 19:15:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-06-20 19:15:00 PDT

Size: 102.14 KB

patch

obsolete

>Index: Source/JavaScriptCore/CMakeLists.txt
>===================================================================
>--- Source/JavaScriptCore/CMakeLists.txt	(revision 246656)
>+++ Source/JavaScriptCore/CMakeLists.txt	(working copy)
>@@ -1301,7 +1301,7 @@ WEBKIT_COPY_FILES(JavaScriptCore_CopyPri
> # dependency of JavaScriptCore for CMake Visual Studio generator to
> # eliminate duplicated custom commands. Otherwise,
> # CombinedDomains.json will be generated in both projects.
>-add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore)
>+add_dependencies(JavaScriptCore JavaScriptCore_CopyPrivateHeaders)
> 
> target_include_directories(LLIntSettingsExtractor PRIVATE
>     ${JavaScriptCore_INCLUDE_DIRECTORIES}
>Index: Source/ThirdParty/ANGLE/ChangeLog
>===================================================================
>--- Source/ThirdParty/ANGLE/ChangeLog	(revision 246656)
>+++ Source/ThirdParty/ANGLE/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-06-20  Alex Christensen  <achristensen@webkit.org>
>+
>+        Allow CMake to build WebCore on Mac
>+        https://bugs.webkit.org/show_bug.cgi?id=198979
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * include/GLSLANG/ShaderLang.h:
>+
> 2019-06-18  Kenneth Russell  <kbr@chromium.org>
> 
>         Add preliminary ANGLE backend to WebCore
>Index: Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
>===================================================================
>--- Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h	(revision 246656)
>+++ Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h	(working copy)
>@@ -8,7 +8,7 @@
> 
> #include <stddef.h>
> 
>-#if defined(__APPLE__)
>+#if defined(__APPLE__) && !defined(BUILDING_WITH_CMAKE)
> #include "khrplatform.h"
> #else
> #include "../KHR/khrplatform.h"
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 246656)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-06-20  Alex Christensen  <achristensen@webkit.org>
>+
>+        Allow CMake to build WebCore on Mac
>+        https://bugs.webkit.org/show_bug.cgi?id=198979
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Modules/websockets/ThreadableWebSocketChannel.cpp:
>+        (WebCore::ThreadableWebSocketChannel::validateURL):
>+        * PlatformMac.cmake:
>+        * platform/cocoa/VideoFullscreenModelVideoElement.mm:
>+        * platform/ios/WebItemProviderPasteboard.h:
>+
> 2019-06-20  Greg Doolittle  <gr3g@apple.com>
> 
>         Web Inspector: AXI: Audit: image label test is throwing spurious errors on elements with existing alt attr, but no value: <img alt>
>Index: Source/WebCore/Headers.cmake
>===================================================================
>--- Source/WebCore/Headers.cmake	(revision 246656)
>+++ Source/WebCore/Headers.cmake	(working copy)
>@@ -374,6 +374,7 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
>     dom/Document.h
>     dom/DocumentEventQueue.h
>     dom/DocumentFragment.h
>+    dom/DocumentFullscreen.h
>     dom/DocumentIdentifier.h
>     dom/DocumentMarker.h
>     dom/DocumentMarkerController.h
>Index: Source/WebCore/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PlatformMac.cmake	(revision 246656)
>+++ Source/WebCore/PlatformMac.cmake	(working copy)
>@@ -163,6 +163,8 @@ list(APPEND WebCore_SOURCES
>     page/mac/TextIndicatorWindow.mm
>     page/mac/WheelEventDeltaFilterMac.mm
> 
>+    page/scrolling/ScrollingTreeScrollingNodeDelegate.cpp
>+
>     page/scrolling/mac/ScrollingCoordinatorMac.mm
>     page/scrolling/mac/ScrollingMomentumCalculatorMac.mm
>     page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
>@@ -302,6 +304,7 @@ list(APPEND WebCore_SOURCES
>     platform/graphics/cocoa/WebGLLayer.mm
>     platform/graphics/cocoa/WebGPULayer.mm
> 
>+    platform/graphics/cv/ImageRotationSessionVT.mm
>     platform/graphics/cv/PixelBufferConformerCV.cpp
>     platform/graphics/cv/TextureCacheCV.mm
>     platform/graphics/cv/VideoTextureCopierCV.cpp
>@@ -433,6 +436,9 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HE
>     editing/cocoa/DataDetection.h
>     editing/cocoa/HTMLConverter.h
> 
>+    # FIXME: Move this file to a cocoa directory
>+    editing/ios/AutofillElements.h
>+
>     editing/mac/AlternativeTextUIController.h
>     editing/mac/DictionaryLookup.h
>     editing/mac/TextAlternativeWithRange.h
>@@ -568,7 +574,7 @@ set(ADDITIONAL_BINDINGS_DEPENDENCIES
>     ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
>     ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
> )
>-set(CSS_VALUE_PLATFORM_DEFINES WTF_PLATFORM_MAC=1)
>+set(CSS_VALUE_PLATFORM_DEFINES "WTF_PLATFORM_MAC=1 HAVE_OS_DARK_MODE_SUPPORT=1")
> 
> list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
> list(APPEND WebCoreTestSupport_SOURCES
>Index: Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp
>===================================================================
>--- Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp	(revision 246656)
>+++ Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp	(working copy)
>@@ -83,6 +83,8 @@ Optional<ThreadableWebSocketChannel::Val
>             validatedURL.areCookiesAllowed = !results.summary.blockedCookies;
>         }
>     }
>+#else
>+    UNUSED_PARAM(document);
> #endif
>     return validatedURL;
> }
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 246656)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-06-20  Alex Christensen  <achristensen@webkit.org>
>+
>+        Allow CMake to build WebCore on Mac
>+        https://bugs.webkit.org/show_bug.cgi?id=198979
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/PlatformMac.cmake:
>+
> 2019-06-19  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Network: replace CFNetwork SPI with new API where able
>Index: Source/WebCore/PAL/pal/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PAL/pal/PlatformMac.cmake	(revision 246656)
>+++ Source/WebCore/PAL/pal/PlatformMac.cmake	(working copy)
>@@ -105,6 +105,7 @@ list(APPEND PAL_SOURCES
> 
>     cf/CoreMediaSoftLink.cpp
> 
>+    cocoa/AVFoundationSoftLink.mm
>     cocoa/FileSizeFormatterCocoa.mm
>     cocoa/PassKitSoftLink.mm
> 
>Index: Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm
>===================================================================
>--- Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm	(revision 246656)
>+++ Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm	(working copy)
>@@ -29,19 +29,19 @@
> #import "VideoFullscreenModelVideoElement.h"
> 
> #import "DOMWindow.h"
>+#import "Event.h"
>+#import "EventListener.h"
>+#import "EventNames.h"
>+#import "HTMLElement.h"
>+#import "HTMLVideoElement.h"
> #import "History.h"
> #import "Logging.h"
> #import "MediaControlsHost.h"
>+#import "Page.h"
> #import "PlaybackSessionModelMediaElement.h"
>+#import "TextTrackList.h"
>+#import "TimeRanges.h"
> #import <QuartzCore/CoreAnimation.h>
>-#import <WebCore/Event.h>
>-#import <WebCore/EventListener.h>
>-#import <WebCore/EventNames.h>
>-#import <WebCore/HTMLElement.h>
>-#import <WebCore/HTMLVideoElement.h>
>-#import <WebCore/Page.h>
>-#import <WebCore/TextTrackList.h>
>-#import <WebCore/TimeRanges.h>
> #import <wtf/NeverDestroyed.h>
> #import <wtf/SoftLinking.h>
> 
>Index: Source/WebCore/platform/ios/WebItemProviderPasteboard.h
>===================================================================
>--- Source/WebCore/platform/ios/WebItemProviderPasteboard.h	(revision 246656)
>+++ Source/WebCore/platform/ios/WebItemProviderPasteboard.h	(working copy)
>@@ -23,9 +23,11 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>+#if TARGET_OS_IPHONE
>+
> #import <WebCore/AbstractPasteboard.h>
> 
>-#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
> 
> struct CGSize;
> 
>@@ -112,4 +114,5 @@ WEBCORE_EXPORT @interface WebItemProvide
> 
> NS_ASSUME_NONNULL_END
> 
>-#endif // TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
>+#endif // __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
>+#endif // TARGET_OS_IPHONE
>Index: Source/WebKitLegacy/PlatformMac.cmake
>===================================================================
>--- Source/WebKitLegacy/PlatformMac.cmake	(revision 246656)
>+++ Source/WebKitLegacy/PlatformMac.cmake	(working copy)
>@@ -4,20 +4,8 @@ add_definitions(-iframework ${QUARTZ_LIB
> add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
> 
> list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
>+    "${FORWARDING_HEADERS_DIR}/WebKitLegacy"
>     "${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"
> )
> 
> list(APPEND WebKitLegacy_SOURCES
>@@ -304,39 +292,462 @@ list(APPEND WebKitLegacy_SOURCES
>     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
>+    Storage/StorageAreaSync.h
>+    Storage/StorageSyncManager.h
>+    Storage/StorageAreaImpl.h
>+    Storage/StorageTrackerClient.h
>+    Storage/StorageThread.h
>+    Storage/StorageNamespaceImpl.h
>+    Storage/StorageTracker.h
>+    Storage/WebStorageNamespaceProvider.h
>+    Storage/WebDatabaseProvider.h
>+
>+    WebCoreSupport/WebViewGroup.h
>+    WebCoreSupport/WebResourceLoadScheduler.h
>+    WebCoreSupport/PingHandle.h
>+    WebCoreSupport/NetworkStorageSessionMap.h
>+    WebCoreSupport/PageStorageSessionProvider.h
>+
>+    mac/WebKitPrefix.h
>+
>+    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/DefaultDelegates/WebDefaultPolicyDelegate.h
>+    mac/DefaultDelegates/WebDefaultUIDelegate.h
>+    mac/DefaultDelegates/WebDefaultContextMenuDelegate.h
>+    mac/DefaultDelegates/WebDefaultEditingDelegate.h
> 
>-    mac/History/WebHistory.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/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/WebNetscapePluginEventHandlerCarbon.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/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/WebInspector/WebNodeHighlighter.h
>+    mac/WebInspector/WebNodeHighlightView.h
>+    mac/WebInspector/WebNodeHighlight.h
>     mac/WebInspector/WebInspector.h
>+    mac/WebInspector/WebInspectorPrivate.h
>+    mac/WebInspector/WebInspectorFrontend.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/npapi.h
>     ${WEBCORE_DIR}/plugins/npfunctions.h
>+    ${WEBCORE_DIR}/plugins/npruntime.h
>+    ${WEBCORE_DIR}/plugins/nptypes.h
> )
> 
> add_definitions("-include WebKitPrefix.h")
>@@ -348,42 +759,40 @@ set(C99_FILES
>     ${WEBKITLEGACY_DIR}/mac/Carbon/HIViewAdapter.m
> 
>     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)
>-        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++17")
>-    else ()
>+    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++17)
>+    else ()
>+        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++17")
>     endif ()
> endforeach ()
> 
>Index: Source/WebKitLegacy/mac/DOM/DOMEvents.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMEvents.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMEvents.mm	(working copy)
>@@ -27,13 +27,13 @@
> 
> #import "DOMEventInternal.h"
> 
>-#import "DOMKeyboardEvent.h"
>-#import "DOMMouseEvent.h"
>-#import "DOMMutationEvent.h"
>-#import "DOMOverflowEvent.h"
>-#import "DOMProgressEvent.h"
>-#import "DOMTextEvent.h"
>-#import "DOMWheelEvent.h"
>+#import <WebKitLegacy/DOMKeyboardEvent.h>
>+#import <WebKitLegacy/DOMMouseEvent.h>
>+#import <WebKitLegacy/DOMMutationEvent.h>
>+#import <WebKitLegacy/DOMOverflowEvent.h>
>+#import <WebKitLegacy/DOMProgressEvent.h>
>+#import <WebKitLegacy/DOMTextEvent.h>
>+#import <WebKitLegacy/DOMWheelEvent.h>
> #import <WebCore/Event.h>
> #import <WebCore/EventNames.h>
> 
>Index: Source/WebKitLegacy/mac/DOM/DOMHTMLAnchorElement.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMHTMLAnchorElement.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMHTMLAnchorElement.mm	(working copy)
>@@ -23,11 +23,11 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "DOMHTMLAnchorElement.h"
>+#import <WebKitLegacy/DOMHTMLAnchorElement.h>
> 
>-#import "DOMNodeInternal.h"
>-#import "DOMPrivate.h"
>-#import "DOMTokenListInternal.h"
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMPrivate.h>
>+#import <WebKitLegacy/DOMTokenListInternal.h>
> #import <WebCore/DOMTokenList.h>
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLAnchorElement.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMHTMLObjectElement.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMHTMLObjectElement.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMHTMLObjectElement.mm	(working copy)
>@@ -23,12 +23,12 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "DOMHTMLObjectElement.h"
>+#import <WebKitLegacy/DOMHTMLObjectElement.h>
> 
>-#import "DOMDocumentInternal.h"
>-#import "DOMHTMLFormElementInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "DOMPrivate.h"
>+#import <WebKitLegacy/DOMDocumentInternal.h>
>+#import <WebKitLegacy/DOMHTMLFormElementInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMPrivate.h>
> #import <WebCore/Document.h>
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLFormElement.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMInternal.h
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMInternal.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMInternal.h	(working copy)
>@@ -25,9 +25,9 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>  */
> 
>-#import "DOMNodeFilter.h"
>-#import "DOMObject.h"
>-#import "DOMXPathNSResolver.h"
>+#import <WebKitLegacy/DOMNodeFilter.h>
>+#import <WebKitLegacy/DOMObject.h>
>+#import <WebKitLegacy/DOMXPathNSResolver.h>
> #import <wtf/Forward.h>
> 
> namespace JSC {
>Index: Source/WebKitLegacy/mac/DOM/DOMMediaError.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMMediaError.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMMediaError.mm	(working copy)
>@@ -27,13 +27,13 @@
> 
> #if ENABLE(VIDEO)
> 
>-#import "DOMInternal.h"
>+#import <WebKitLegacy/DOMInternal.h>
> 
>-#import "DOMMediaError.h"
>+#import <WebKitLegacy/DOMMediaError.h>
> 
>-#import "DOMMediaErrorInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "ExceptionHandlers.h"
>+#import <WebKitLegacy/DOMMediaErrorInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/ExceptionHandlers.h>
> #import <WebCore/JSExecState.h>
> #import <WebCore/MediaError.h>
> #import <WebCore/ThreadCheck.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMMediaList.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMMediaList.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMMediaList.mm	(working copy)
>@@ -23,13 +23,13 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "DOMInternal.h"
>+#import <WebKitLegacy/DOMInternal.h>
> 
>-#import "DOMMediaList.h"
>+#import <WebKitLegacy/DOMMediaList.h>
> 
>-#import "DOMMediaListInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "ExceptionHandlers.h"
>+#import <WebKitLegacy/DOMMediaListInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/ExceptionHandlers.h>
> #import <WebCore/JSExecState.h>
> #import <WebCore/MediaList.h>
> #import <WebCore/ThreadCheck.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMMouseEvent.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMMouseEvent.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMMouseEvent.mm	(working copy)
>@@ -25,11 +25,11 @@
> 
> #import "DOMMouseEvent.h"
> 
>-#import "DOMAbstractViewInternal.h"
>-#import "DOMEventInternal.h"
>-#import "DOMEventTarget.h"
>-#import "DOMNode.h"
>-#import "DOMNodeInternal.h"
>+#import <WebKitLegacy/DOMAbstractViewInternal.h>
>+#import <WebKitLegacy/DOMEventInternal.h>
>+#import <WebKitLegacy/DOMEventTarget.h>
>+#import <WebKitLegacy/DOMNode.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
> #import <WebCore/DOMWindow.h>
> #import "ExceptionHandlers.h"
> #import <WebCore/JSExecState.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMNodeIterator.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMNodeIterator.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMNodeIterator.mm	(working copy)
>@@ -23,13 +23,13 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "DOMInternal.h"
>+#import <WebKitLegacy/DOMInternal.h>
> 
>-#import "DOMNodeIterator.h"
>+#import <WebKitLegacy/DOMNodeIterator.h>
> 
>-#import "DOMNodeInternal.h"
>-#import "DOMNodeIteratorInternal.h"
>-#import "ExceptionHandlers.h"
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMNodeIteratorInternal.h>
>+#import <WebKitLegacy/ExceptionHandlers.h>
> #import <WebCore/JSExecState.h>
> #import <WebCore/NativeNodeFilter.h>
> #import <WebCore/Node.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMObject.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMObject.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMObject.mm	(working copy)
>@@ -25,13 +25,13 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>  */
> 
>-#import "DOMObject.h"
>+#import <WebKitLegacy/DOMObject.h>
> 
>-#import "DOMHTMLLinkElementInternal.h"
>-#import "DOMHTMLStyleElementInternal.h"
>-#import "DOMInternal.h"
>-#import "DOMProcessingInstructionInternal.h"
>-#import "DOMStyleSheetInternal.h"
>+#import <WebKitLegacy/DOMHTMLLinkElementInternal.h>
>+#import <WebKitLegacy/DOMHTMLStyleElementInternal.h>
>+#import <WebKitLegacy/DOMInternal.h>
>+#import <WebKitLegacy/DOMProcessingInstructionInternal.h>
>+#import <WebKitLegacy/DOMStyleSheetInternal.h>
> #import <WebCore/HTMLLinkElement.h>
> #import <WebCore/HTMLStyleElement.h>
> #import <WebCore/ProcessingInstruction.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMStyleSheet.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMStyleSheet.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMStyleSheet.mm	(working copy)
>@@ -23,14 +23,14 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "DOMInternal.h"
>+#import <WebKitLegacy/DOMInternal.h>
> 
>-#import "DOMStyleSheet.h"
>+#import <WebKitLegacy/DOMStyleSheet.h>
> 
>-#import "DOMMediaListInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "DOMStyleSheetInternal.h"
>-#import "ExceptionHandlers.h"
>+#import <WebKitLegacy/DOMMediaListInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMStyleSheetInternal.h>
>+#import <WebKitLegacy/ExceptionHandlers.h>
> #import <WebCore/JSExecState.h>
> #import <WebCore/MediaList.h>
> #import <WebCore/Node.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMStyleSheetList.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMStyleSheetList.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMStyleSheetList.mm	(working copy)
>@@ -23,14 +23,14 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "DOMInternal.h"
>+#import <WebKitLegacy/DOMInternal.h>
> 
>-#import "DOMStyleSheetList.h"
>+#import <WebKitLegacy/DOMStyleSheetList.h>
> 
>-#import "DOMNodeInternal.h"
>-#import "DOMStyleSheetInternal.h"
>-#import "DOMStyleSheetListInternal.h"
>-#import "ExceptionHandlers.h"
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMStyleSheetInternal.h>
>+#import <WebKitLegacy/DOMStyleSheetListInternal.h>
>+#import <WebKitLegacy/ExceptionHandlers.h>
> #import <WebCore/JSExecState.h>
> #import <WebCore/StyleSheet.h>
> #import <WebCore/StyleSheetList.h>
>Index: Source/WebKitLegacy/mac/DOM/DOMTimeRanges.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/DOMTimeRanges.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/DOMTimeRanges.mm	(working copy)
>@@ -26,13 +26,13 @@
> 
> #if ENABLE(VIDEO)
> 
>-#import "DOMInternal.h"
>+#import <WebKitLegacy/DOMInternal.h>
> 
>-#import "DOMTimeRanges.h"
>+#import <WebKitLegacy/DOMTimeRanges.h>
> 
>-#import "DOMNodeInternal.h"
>-#import "DOMTimeRangesInternal.h"
>-#import "ExceptionHandlers.h"
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMTimeRangesInternal.h>
>+#import <WebKitLegacy/ExceptionHandlers.h>
> #import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/TimeRanges.h>
>Index: Source/WebKitLegacy/mac/DOM/WebDOMOperations.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DOM/WebDOMOperations.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DOM/WebDOMOperations.mm	(working copy)
>@@ -26,19 +26,19 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebDOMOperationsPrivate.h"
>+#import <WebKitLegacy/WebDOMOperationsPrivate.h>
> 
>-#import "DOMDocumentInternal.h"
>-#import "DOMElementInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "DOMRangeInternal.h"
>-#import "DOMWheelEventInternal.h"
>-#import "WebArchiveInternal.h"
>-#import "WebDataSourcePrivate.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameLoaderClient.h"
>-#import "WebFramePrivate.h"
>-#import "WebKitNSStringExtras.h"
>+#import <WebKitLegacy/DOMDocumentInternal.h>
>+#import <WebKitLegacy/DOMElementInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMRangeInternal.h>
>+#import <WebKitLegacy/DOMWheelEventInternal.h>
>+#import <WebKitLegacy/WebArchiveInternal.h>
>+#import <WebKitLegacy/WebDataSourcePrivate.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameLoaderClient.h>
>+#import <WebKitLegacy/WebFramePrivate.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
> #import <JavaScriptCore/APICast.h>
> #import <JavaScriptCore/JSCJSValue.h>
> #import <JavaScriptCore/JSLock.h>
>Index: Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm	(working copy)
>@@ -28,21 +28,21 @@
> 
> #if !PLATFORM(IOS_FAMILY)
> 
>-#import "WebDefaultContextMenuDelegate.h"
>+#import <WebKitLegacy/WebDefaultContextMenuDelegate.h>
> 
>-#import "WebDOMOperations.h"
>-#import "WebDataSourcePrivate.h"
>-#import "WebDefaultUIDelegate.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameView.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebLocalizableStringsInternal.h"
>-#import "WebNSPasteboardExtras.h"
>-#import "WebNSURLRequestExtras.h"
>-#import "WebPolicyDelegate.h"
>-#import "WebUIDelegate.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebDOMOperations.h>
>+#import <WebKitLegacy/WebDataSourcePrivate.h>
>+#import <WebKitLegacy/WebDefaultUIDelegate.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameView.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebLocalizableStringsInternal.h>
>+#import <WebKitLegacy/WebNSPasteboardExtras.h>
>+#import <WebKitLegacy/WebNSURLRequestExtras.h>
>+#import <WebKitLegacy/WebPolicyDelegate.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <Foundation/NSURLConnection.h>
> #import <Foundation/NSURLRequest.h>
> #import <WebCore/Editor.h>
>Index: Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultPolicyDelegate.m
>===================================================================
>--- Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultPolicyDelegate.m	(revision 246656)
>+++ Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultPolicyDelegate.m	(working copy)
>@@ -26,12 +26,12 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebDefaultPolicyDelegate.h"
>+#import <WebKitLegacy/WebDefaultPolicyDelegate.h>
> 
>-#import "WebDataSource.h"
>-#import "WebFrame.h"
>-#import "WebPolicyDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebDataSource.h>
>+#import <WebKitLegacy/WebFrame.h>
>+#import <WebKitLegacy/WebPolicyDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <Foundation/NSURLConnection.h>
> #import <Foundation/NSURLRequest.h>
> #import <Foundation/NSURLResponse.h>
>@@ -81,7 +81,7 @@ - (void)webView: (WebView *)wv decidePol
>                                                          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];
>Index: Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultUIDelegate.h
>===================================================================
>--- Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultUIDelegate.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultUIDelegate.h	(working copy)
>@@ -26,7 +26,7 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebUIDelegate.h"
>+#import <WebKitLegacy/WebUIDelegate.h>
> 
> @interface WebDefaultUIDelegate : NSObject <WebUIDelegate>
> {
>Index: Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultUIDelegate.mm
>===================================================================
>--- Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultUIDelegate.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultUIDelegate.mm	(working copy)
>@@ -26,15 +26,15 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebDefaultUIDelegate.h"
>+#import <WebKitLegacy/WebDefaultUIDelegate.h>
> 
>-#import "WebTypesInternal.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebView.h"
>+#import <WebKitLegacy/WebTypesInternal.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebView.h>
> 
> #if !PLATFORM(IOS_FAMILY)
>-#import "WebJavaScriptTextInputPanel.h"
>-#import "WebKitVersionChecks.h"
>+#import <WebKitLegacy/WebJavaScriptTextInputPanel.h>
>+#import <WebKitLegacy/WebKitVersionChecks.h>
> #endif
> 
> #if PLATFORM(IOS_FAMILY)
>Index: Source/WebKitLegacy/mac/History/WebBackForwardList.mm
>===================================================================
>--- Source/WebKitLegacy/mac/History/WebBackForwardList.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/History/WebBackForwardList.mm	(working copy)
>@@ -26,19 +26,19 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebBackForwardList.h"
>-#import "WebBackForwardListInternal.h"
>+#import <WebKitLegacy/WebBackForwardList.h>
>+#import <WebKitLegacy/WebBackForwardListInternal.h>
> 
>-#import "BackForwardList.h"
>-#import "WebFrameInternal.h"
>-#import "WebHistoryItemInternal.h"
>-#import "WebHistoryItemPrivate.h"
>-#import "WebKitLogging.h"
>-#import "WebKitVersionChecks.h"
>-#import "WebNSObjectExtras.h"
>-#import "WebPreferencesPrivate.h"
>-#import "WebTypesInternal.h"
>-#import "WebViewPrivate.h"
>+#import <WebKitLegacy/BackForwardList.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebHistoryItemInternal.h>
>+#import <WebKitLegacy/WebHistoryItemPrivate.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebKitVersionChecks.h>
>+#import <WebKitLegacy/WebNSObjectExtras.h>
>+#import <WebKitLegacy/WebPreferencesPrivate.h>
>+#import <WebKitLegacy/WebTypesInternal.h>
>+#import <WebKitLegacy/WebViewPrivate.h>
> #import <JavaScriptCore/InitializeThreading.h>
> #import <WebCore/HistoryItem.h>
> #import <WebCore/PageCache.h>
>Index: Source/WebKitLegacy/mac/History/WebHistoryItemInternal.h
>===================================================================
>--- Source/WebKitLegacy/mac/History/WebHistoryItemInternal.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/History/WebHistoryItemInternal.h	(working copy)
>@@ -26,8 +26,8 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebBackForwardList.h"
>-#import "WebHistoryItemPrivate.h"
>+#import <WebKitLegacy/WebBackForwardList.h>
>+#import <WebKitLegacy/WebHistoryItemPrivate.h>
> #import <wtf/RefPtr.h>
> #import <wtf/Vector.h>
> #import <wtf/text/WTFString.h>
>Index: Source/WebKitLegacy/mac/Misc/WebCache.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Misc/WebCache.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Misc/WebCache.mm	(working copy)
>@@ -23,14 +23,14 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>  */
> 
>-#import "WebCache.h"
>+#import <WebKitLegacy/WebCache.h>
> 
>-#import "NetworkStorageSessionMap.h"
>-#import "WebApplicationCacheInternal.h"
>-#import "WebNSObjectExtras.h"
>-#import "WebPreferences.h"
>-#import "WebView.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/NetworkStorageSessionMap.h>
>+#import <WebKitLegacy/WebApplicationCacheInternal.h>
>+#import <WebKitLegacy/WebNSObjectExtras.h>
>+#import <WebKitLegacy/WebPreferences.h>
>+#import <WebKitLegacy/WebView.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <JavaScriptCore/InitializeThreading.h>
> #import <WebCore/ApplicationCacheStorage.h>
> #import <WebCore/CookieJar.h>
>Index: Source/WebKitLegacy/mac/Misc/WebElementDictionary.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Misc/WebElementDictionary.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Misc/WebElementDictionary.mm	(working copy)
>@@ -26,16 +26,16 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebElementDictionary.h"
>+#import <WebKitLegacy/WebElementDictionary.h>
> 
>-#import "DOMNodeInternal.h"
>-#import "WebDOMOperations.h"
>-#import "WebFrame.h"
>-#import "WebFrameInternal.h"
>-#import "WebKitLogging.h"
>-#import "WebTypesInternal.h"
>-#import "WebView.h"
>-#import "WebViewPrivate.h"
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/WebDOMOperations.h>
>+#import <WebKitLegacy/WebFrame.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebTypesInternal.h>
>+#import <WebKitLegacy/WebView.h>
>+#import <WebKitLegacy/WebViewPrivate.h>
> #import <JavaScriptCore/InitializeThreading.h>
> #import <WebCore/DragController.h>
> #import <WebCore/Frame.h>
>Index: Source/WebKitLegacy/mac/Misc/WebSharingServicePickerController.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Misc/WebSharingServicePickerController.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Misc/WebSharingServicePickerController.mm	(working copy)
>@@ -23,12 +23,12 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebSharingServicePickerController.h"
>+#import <WebKitLegacy/WebSharingServicePickerController.h>
> 
> #if ENABLE(SERVICE_CONTROLS)
> 
>-#import "WebContextMenuClient.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebContextMenuClient.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <WebCore/BitmapImage.h>
> #import <WebCore/ContextMenuController.h>
> #import <WebCore/Document.h>
>Index: Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm	(working copy)
>@@ -26,13 +26,13 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebBasePluginPackage.h"
>+#import <WebKitLegacy/WebBasePluginPackage.h>
> 
>-#import "WebKitLogging.h"
>-#import "WebKitNSStringExtras.h"
>-#import "WebNetscapePluginPackage.h"
>-#import "WebPluginPackage.h"
>-#import "WebTypesInternal.h"
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
>+#import <WebKitLegacy/WebNetscapePluginPackage.h>
>+#import <WebKitLegacy/WebPluginPackage.h>
>+#import <WebKitLegacy/WebTypesInternal.h>
> #import <JavaScriptCore/InitializeThreading.h>
> #import <algorithm>
> #import <mach-o/arch.h>
>Index: Source/WebKitLegacy/mac/Plugins/WebNetscapePluginPackage.h
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/WebNetscapePluginPackage.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/Plugins/WebNetscapePluginPackage.h	(working copy)
>@@ -27,8 +27,7 @@
>  */
> 
> #if ENABLE(NETSCAPE_PLUGIN_API)
>-#import "WebBasePluginPackage.h"
>-
>+#import <WebKitLegacy/WebBasePluginPackage.h>
> 
> @interface WebNetscapePluginPackage : WebBasePluginPackage
> {
>Index: Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm	(working copy)
>@@ -28,28 +28,28 @@
> 
> #if ENABLE(NETSCAPE_PLUGIN_API)
> 
>-#import "WebNetscapePluginView.h"
>+#import <WebKitLegacy/WebNetscapePluginView.h>
> 
>-#import "WebDataSourceInternal.h"
>-#import "WebDefaultUIDelegate.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameView.h"
>-#import "WebKitErrorsPrivate.h"
>-#import "WebKitLogging.h"
>-#import "WebKitNSStringExtras.h"
>-#import "WebNSDataExtras.h"
>-#import "WebNSDictionaryExtras.h"
>-#import "WebNSObjectExtras.h"
>-#import "WebNSURLExtras.h"
>-#import "WebNSURLRequestExtras.h"
>-#import "WebNSViewExtras.h"
>-#import "WebNetscapePluginEventHandler.h"
>-#import "WebNetscapePluginPackage.h"
>-#import "WebNetscapePluginStream.h"
>-#import "WebPluginRequest.h"
>-#import "WebPreferences.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebDefaultUIDelegate.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameView.h>
>+#import <WebKitLegacy/WebKitErrorsPrivate.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
>+#import <WebKitLegacy/WebNSDataExtras.h>
>+#import <WebKitLegacy/WebNSDictionaryExtras.h>
>+#import <WebKitLegacy/WebNSObjectExtras.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebNSURLRequestExtras.h>
>+#import <WebKitLegacy/WebNSViewExtras.h>
>+#import <WebKitLegacy/WebNetscapePluginEventHandler.h>
>+#import <WebKitLegacy/WebNetscapePluginPackage.h>
>+#import <WebKitLegacy/WebNetscapePluginStream.h>
>+#import <WebKitLegacy/WebPluginRequest.h>
>+#import <WebKitLegacy/WebPreferences.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <Carbon/Carbon.h>
> #import <JavaScriptCore/InitializeThreading.h>
> #import <JavaScriptCore/JSLock.h>
>Index: Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm	(working copy)
>@@ -26,14 +26,14 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebPluginContainerCheck.h"
>+#import <WebKitLegacy/WebPluginContainerCheck.h>
> 
>-#import "WebFrameInternal.h"
>-#import "WebPluginContainerPrivate.h"
>-#import "WebPluginController.h"
>-#import "WebPolicyDelegatePrivate.h"
>-#import "WebView.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebPluginContainerPrivate.h>
>+#import <WebKitLegacy/WebPluginController.h>
>+#import <WebKitLegacy/WebPolicyDelegatePrivate.h>
>+#import <WebKitLegacy/WebView.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <Foundation/NSDictionary.h>
> #import <Foundation/NSURL.h>
> #import <Foundation/NSURLRequest.h>
>Index: Source/WebKitLegacy/mac/Plugins/WebPluginController.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/WebPluginController.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Plugins/WebPluginController.mm	(working copy)
>@@ -27,26 +27,26 @@
>  */
> 
> 
>-#import "WebPluginController.h"
>+#import <WebKitLegacy/WebPluginController.h>
> 
>-#import "DOMNodeInternal.h"
>-#import "WebBasePluginPackage.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameView.h"
>-#import "WebHTMLViewPrivate.h"
>-#import "WebKitErrorsPrivate.h"
>-#import "WebKitLogging.h"
>-#import "WebNSObjectExtras.h"
>-#import "WebNSURLExtras.h"
>-#import "WebNSViewExtras.h"
>-#import "WebPlugin.h"
>-#import "WebPluginContainer.h"
>-#import "WebPluginContainerCheck.h"
>-#import "WebPluginPackage.h"
>-#import "WebPluginViewFactory.h"
>-#import "WebUIDelegate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/WebBasePluginPackage.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameView.h>
>+#import <WebKitLegacy/WebHTMLViewPrivate.h>
>+#import <WebKitLegacy/WebKitErrorsPrivate.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebNSObjectExtras.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebNSViewExtras.h>
>+#import <WebKitLegacy/WebPlugin.h>
>+#import <WebKitLegacy/WebPluginContainer.h>
>+#import <WebKitLegacy/WebPluginContainerCheck.h>
>+#import <WebKitLegacy/WebPluginPackage.h>
>+#import <WebKitLegacy/WebPluginViewFactory.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <Foundation/NSURLRequest.h>
> #import <JavaScriptCore/JSLock.h>
> #import <WebCore/CommonVM.h>
>Index: Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm	(working copy)
>@@ -26,22 +26,22 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebPluginDatabase.h"
>+#import <WebKitLegacy/WebPluginDatabase.h>
> 
>-#import "WebBaseNetscapePluginView.h"
>-#import "WebBasePluginPackage.h"
>-#import "WebDataSourcePrivate.h"
>-#import "WebFrame.h"
>-#import "WebFrameViewInternal.h"
>-#import "WebHTMLRepresentation.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebKitLogging.h"
>-#import "WebNSFileManagerExtras.h"
>-#import "WebNetscapePluginPackage.h"
>-#import "WebPluginController.h"
>-#import "WebPluginPackage.h"
>-#import "WebViewInternal.h"
>-#import "WebViewPrivate.h"
>+#import <WebKitLegacy/WebBaseNetscapePluginView.h>
>+#import <WebKitLegacy/WebBasePluginPackage.h>
>+#import <WebKitLegacy/WebDataSourcePrivate.h>
>+#import <WebKitLegacy/WebFrame.h>
>+#import <WebKitLegacy/WebFrameViewInternal.h>
>+#import <WebKitLegacy/WebHTMLRepresentation.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebNSFileManagerExtras.h>
>+#import <WebKitLegacy/WebNetscapePluginPackage.h>
>+#import <WebKitLegacy/WebPluginController.h>
>+#import <WebKitLegacy/WebPluginPackage.h>
>+#import <WebKitLegacy/WebViewInternal.h>
>+#import <WebKitLegacy/WebViewPrivate.h>
> #import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
> #import <wtf/Assertions.h>
> 
>Index: Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm	(working copy)
>@@ -25,22 +25,22 @@
> 
> #if USE(PLUGIN_HOST_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
> 
>-#import "NetscapePluginInstanceProxy.h"
>+#import <WebKitLegacy/NetscapePluginInstanceProxy.h>
> 
>-#import "HostedNetscapePluginStream.h"
>-#import "NetscapePluginHostProxy.h"
>-#import "ProxyInstance.h"
>-#import "ProxyRuntimeObject.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebFrameInternal.h"
>-#import "WebHostedNetscapePluginView.h"
>-#import "WebKitNSStringExtras.h"
>-#import "WebNSDataExtras.h"
>-#import "WebNSURLExtras.h"
>-#import "WebPluginRequest.h"
>-#import "WebUIDelegate.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/HostedNetscapePluginStream.h>
>+#import <WebKitLegacy/NetscapePluginHostProxy.h>
>+#import <WebKitLegacy/ProxyInstance.h>
>+#import <WebKitLegacy/ProxyRuntimeObject.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebHostedNetscapePluginView.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
>+#import <WebKitLegacy/WebNSDataExtras.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebPluginRequest.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <JavaScriptCore/CatchScope.h>
> #import <JavaScriptCore/Completion.h>
> #import <JavaScriptCore/Error.h>
>Index: Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm	(working copy)
>@@ -25,17 +25,17 @@
> 
> #if USE(PLUGIN_HOST_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
> 
>-#import "WebHostedNetscapePluginView.h"
>+#import <WebKitLegacy/WebHostedNetscapePluginView.h>
> 
>-#import "HostedNetscapePluginStream.h"
>-#import "NetscapePluginInstanceProxy.h"
>-#import "NetscapePluginHostManager.h"
>-#import "NetscapePluginHostProxy.h"
>-#import "WebTextInputWindowController.h"
>-#import "WebFrameInternal.h"
>-#import "WebView.h"
>-#import "WebViewInternal.h"
>-#import "WebUIDelegate.h"
>+#import <WebKitLegacy/HostedNetscapePluginStream.h>
>+#import <WebKitLegacy/NetscapePluginInstanceProxy.h>
>+#import <WebKitLegacy/NetscapePluginHostManager.h>
>+#import <WebKitLegacy/NetscapePluginHostProxy.h>
>+#import <WebKitLegacy/WebTextInputWindowController.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebView.h>
>+#import <WebKitLegacy/WebViewInternal.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
> 
> #import <CoreFoundation/CoreFoundation.h>
> #import <JavaScriptCore/InitializeThreading.h>
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm	(working copy)
>@@ -27,33 +27,33 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebChromeClient.h"
>+#import <WebKitLegacy/WebChromeClient.h>
> 
>-#import "DOMElementInternal.h"
>-#import "DOMHTMLInputElementInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "PopupMenuMac.h"
>-#import "SearchPopupMenuMac.h"
>-#import "WebBasePluginPackage.h"
>-#import "WebDefaultUIDelegate.h"
>-#import "WebDelegateImplementationCaching.h"
>-#import "WebElementDictionary.h"
>-#import "WebFormDelegate.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameView.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebHistoryInternal.h"
>-#import "WebKitFullScreenListener.h"
>-#import "WebKitPrefix.h"
>-#import "WebNSURLRequestExtras.h"
>-#import "WebOpenPanelResultListener.h"
>-#import "WebPlugin.h"
>-#import "WebQuotaManager.h"
>-#import "WebSecurityOriginInternal.h"
>-#import "WebSelectionServiceController.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebView.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/DOMElementInternal.h>
>+#import <WebKitLegacy/DOMHTMLInputElementInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/PopupMenuMac.h>
>+#import <WebKitLegacy/SearchPopupMenuMac.h>
>+#import <WebKitLegacy/WebBasePluginPackage.h>
>+#import <WebKitLegacy/WebDefaultUIDelegate.h>
>+#import <WebKitLegacy/WebDelegateImplementationCaching.h>
>+#import <WebKitLegacy/WebElementDictionary.h>
>+#import <WebKitLegacy/WebFormDelegate.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameView.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebHistoryInternal.h>
>+#import <WebKitLegacy/WebKitFullScreenListener.h>
>+#import <WebKitLegacy/WebKitPrefix.h>
>+#import <WebKitLegacy/WebNSURLRequestExtras.h>
>+#import <WebKitLegacy/WebOpenPanelResultListener.h>
>+#import <WebKitLegacy/WebPlugin.h>
>+#import <WebKitLegacy/WebQuotaManager.h>
>+#import <WebKitLegacy/WebSecurityOriginInternal.h>
>+#import <WebKitLegacy/WebSelectionServiceController.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebView.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <Foundation/Foundation.h>
> #import <WebCore/ColorChooser.h>
> #import <WebCore/ContextMenu.h>
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.h	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if ENABLE(CONTEXT_MENUS)
> 
>-#import "WebSharingServicePickerController.h"
>+#import <WebKitLegacy/WebSharingServicePickerController.h>
> #import <WebCore/ContextMenuClient.h>
> #import <WebCore/IntRect.h>
> 
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm	(working copy)
>@@ -28,18 +28,18 @@
> 
> #if !PLATFORM(IOS_FAMILY)
> 
>-#import "WebContextMenuClient.h"
>+#import <WebKitLegacy/WebContextMenuClient.h>
> 
>-#import "WebDelegateImplementationCaching.h"
>-#import "WebElementDictionary.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameView.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebKitVersionChecks.h"
>-#import "WebNSPasteboardExtras.h"
>-#import "WebSharingServicePickerController.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebDelegateImplementationCaching.h>
>+#import <WebKitLegacy/WebElementDictionary.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameView.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebKitVersionChecks.h>
>+#import <WebKitLegacy/WebNSPasteboardExtras.h>
>+#import <WebKitLegacy/WebSharingServicePickerController.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <WebCore/BitmapImage.h>
> #import <WebCore/ContextMenu.h>
> #import <WebCore/ContextMenuController.h>
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm	(working copy)
>@@ -23,26 +23,26 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>  */
> 
>-#import "WebDragClient.h"
>+#import <WebKitLegacy/WebDragClient.h>
> 
> #if ENABLE(DRAG_SUPPORT)
> 
>-#import "DOMElementInternal.h"
>-#import "WebArchive.h"
>-#import "WebDOMOperations.h"
>-#import "WebFrame.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameView.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebKitLogging.h"
>-#import "WebKitNSStringExtras.h"
>-#import "WebNSURLExtras.h"
>-#import "WebUIDelegate.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/DOMElementInternal.h>
>+#import <WebKitLegacy/WebArchive.h>
>+#import <WebKitLegacy/WebDOMOperations.h>
>+#import <WebKitLegacy/WebFrame.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameView.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> 
> #if PLATFORM(MAC)
>-#import "WebNSPasteboardExtras.h"
>+#import <WebKitLegacy/WebNSPasteboardExtras.h>
> #endif
> 
> #import <WebCore/DataTransfer.h>
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm	(working copy)
>@@ -26,54 +26,64 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebFrameLoaderClient.h"
>-
>-#import "BackForwardList.h"
>-#import "DOMElementInternal.h"
>-#import "DOMHTMLFormElementInternal.h"
>-#import "WebBackForwardList.h"
>-#import "WebBasePluginPackage.h"
>-#import "WebCachedFramePlatformData.h"
>-#import "WebChromeClient.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebDelegateImplementationCaching.h"
>-#import "WebDocumentInternal.h"
>-#import "WebDocumentLoaderMac.h"
>-#import "WebDownload.h"
>-#import "WebDynamicScrollBarsViewInternal.h"
>-#import "WebElementDictionary.h"
>-#import "WebFormDelegate.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameLoadDelegatePrivate.h"
>-#import "WebFrameNetworkingContext.h"
>-#import "WebFrameViewInternal.h"
>-#import "WebHTMLRepresentationPrivate.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebHistoryDelegate.h"
>-#import "WebHistoryInternal.h"
>-#import "WebHistoryItemInternal.h"
>-#import "WebKitErrorsPrivate.h"
>-#import "WebKitLogging.h"
>-#import "WebKitNSStringExtras.h"
>-#import "WebKitVersionChecks.h"
>-#import "WebNSURLExtras.h"
>-#import "WebNavigationData.h"
>-#import "WebNetscapePluginPackage.h"
>-#import "WebNetscapePluginView.h"
>-#import "WebPanelAuthenticationHandler.h"
>-#import "WebPluginController.h"
>-#import "WebPluginPackage.h"
>-#import "WebPluginViewFactoryPrivate.h"
>-#import "WebPolicyDelegate.h"
>-#import "WebPolicyDelegatePrivate.h"
>-#import "WebPreferences.h"
>-#import "WebResourceLoadDelegate.h"
>-#import "WebResourceLoadDelegatePrivate.h"
>-#import "WebScriptWorldInternal.h"
>-#import "WebSecurityOriginInternal.h"
>-#import "WebUIDelegate.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+// FIXME: Do not commit this code.
>+#if defined(BUILDING_WITH_CMAKE)
>+#define JSC_API_AVAILABLE(...)
>+#define JSC_CLASS_AVAILABLE(...) JS_EXPORT
>+#define JSC_API_DEPRECATED(...)
>+// Use zero since it will be less than any possible version number.
>+#define JSC_MAC_VERSION_TBA 0
>+#define JSC_IOS_VERSION_TBA 0
>+#endif
>+
>+#import <WebKitLegacy/WebFrameLoaderClient.h>
>+
>+#import <WebKitLegacy/BackForwardList.h>
>+#import <WebKitLegacy/DOMElementInternal.h>
>+#import <WebKitLegacy/DOMHTMLFormElementInternal.h>
>+#import <WebKitLegacy/WebBackForwardList.h>
>+#import <WebKitLegacy/WebBasePluginPackage.h>
>+#import <WebKitLegacy/WebCachedFramePlatformData.h>
>+#import <WebKitLegacy/WebChromeClient.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebDelegateImplementationCaching.h>
>+#import <WebKitLegacy/WebDocumentInternal.h>
>+#import <WebKitLegacy/WebDocumentLoaderMac.h>
>+#import <WebKitLegacy/WebDownload.h>
>+#import <WebKitLegacy/WebDynamicScrollBarsViewInternal.h>
>+#import <WebKitLegacy/WebElementDictionary.h>
>+#import <WebKitLegacy/WebFormDelegate.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameLoadDelegatePrivate.h>
>+#import <WebKitLegacy/WebFrameNetworkingContext.h>
>+#import <WebKitLegacy/WebFrameViewInternal.h>
>+#import <WebKitLegacy/WebHTMLRepresentationPrivate.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebHistoryDelegate.h>
>+#import <WebKitLegacy/WebHistoryInternal.h>
>+#import <WebKitLegacy/WebHistoryItemInternal.h>
>+#import <WebKitLegacy/WebKitErrorsPrivate.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
>+#import <WebKitLegacy/WebKitVersionChecks.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebNavigationData.h>
>+#import <WebKitLegacy/WebNetscapePluginPackage.h>
>+#import <WebKitLegacy/WebNetscapePluginView.h>
>+#import <WebKitLegacy/WebPanelAuthenticationHandler.h>
>+#import <WebKitLegacy/WebPluginController.h>
>+#import <WebKitLegacy/WebPluginPackage.h>
>+#import <WebKitLegacy/WebPluginViewFactoryPrivate.h>
>+#import <WebKitLegacy/WebPolicyDelegate.h>
>+#import <WebKitLegacy/WebPolicyDelegatePrivate.h>
>+#import <WebKitLegacy/WebPreferences.h>
>+#import <WebKitLegacy/WebResourceLoadDelegate.h>
>+#import <WebKitLegacy/WebResourceLoadDelegatePrivate.h>
>+#import <WebKitLegacy/WebScriptWorldInternal.h>
>+#import <WebKitLegacy/WebSecurityOriginInternal.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <JavaScriptCore/InitializeThreading.h>
> #import <JavaScriptCore/JSContextInternal.h>
> #import <WebCore/AuthenticationMac.h>
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm	(working copy)
>@@ -26,22 +26,22 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebInspectorClient.h"
>+#import <WebKitLegacy/WebInspectorClient.h>
> 
>-#import "DOMNodeInternal.h"
>-#import "WebDelegateImplementationCaching.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameView.h"
>-#import "WebInspector.h"
>-#import "WebInspectorFrontend.h"
>-#import "WebInspectorPrivate.h"
>-#import "WebLocalizableStringsInternal.h"
>-#import "WebNodeHighlighter.h"
>-#import "WebPolicyDelegate.h"
>-#import "WebQuotaManager.h"
>-#import "WebSecurityOriginPrivate.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/WebDelegateImplementationCaching.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameView.h>
>+#import <WebKitLegacy/WebInspector.h>
>+#import <WebKitLegacy/WebInspectorFrontend.h>
>+#import <WebKitLegacy/WebInspectorPrivate.h>
>+#import <WebKitLegacy/WebLocalizableStringsInternal.h>
>+#import <WebKitLegacy/WebNodeHighlighter.h>
>+#import <WebKitLegacy/WebPolicyDelegate.h>
>+#import <WebKitLegacy/WebQuotaManager.h>
>+#import <WebKitLegacy/WebSecurityOriginPrivate.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <JavaScriptCore/InspectorAgentBase.h>
> #import <SecurityInterface/SFCertificatePanel.h>
> #import <SecurityInterface/SFCertificateView.h>
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebOpenPanelResultListener.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebOpenPanelResultListener.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebOpenPanelResultListener.h	(working copy)
>@@ -23,7 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebUIDelegate.h"
>+#import <WebKitLegacy/WebUIDelegate.h>
> #import <wtf/RefPtr.h>
> 
> namespace WebCore {
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebProgressTrackerClient.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebProgressTrackerClient.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebProgressTrackerClient.mm	(working copy)
>@@ -23,10 +23,10 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebProgressTrackerClient.h"
>+#import <WebKitLegacy/WebProgressTrackerClient.h>
> 
>-#import "WebFramePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebFramePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> 
> #if PLATFORM(IOS_FAMILY)
> #import <WebCore/WebCoreThreadMessage.h>
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebSelectionServiceController.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebSelectionServiceController.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebSelectionServiceController.h	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if ENABLE(SERVICE_CONTROLS)
> 
>-#import "WebSharingServicePickerController.h"
>+#import <WebKitLegacy/WebSharingServicePickerController.h>
> #import <wtf/RetainPtr.h>
> #import <wtf/Vector.h>
> #import <wtf/text/WTFString.h>
>Index: Source/WebKitLegacy/mac/WebInspector/WebInspector.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebInspector/WebInspector.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebInspector/WebInspector.mm	(working copy)
>@@ -26,11 +26,11 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebInspector.h"
>+#import <WebKitLegacy/WebInspector.h>
> 
>-#import "WebFrameInternal.h"
>-#import "WebInspectorPrivate.h"
>-#import "WebInspectorFrontend.h"
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebInspectorPrivate.h>
>+#import <WebKitLegacy/WebInspectorFrontend.h>
> 
> #include <WebCore/Document.h>
> #include <WebCore/Frame.h>
>Index: Source/WebKitLegacy/mac/WebInspector/WebNodeHighlight.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebInspector/WebNodeHighlight.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebInspector/WebNodeHighlight.mm	(working copy)
>@@ -26,17 +26,17 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebNodeHighlight.h"
>-#import "WebNodeHighlightView.h"
>-#import "WebNSViewExtras.h"
>+#import <WebKitLegacy/WebNodeHighlight.h>
>+#import <WebKitLegacy/WebNodeHighlightView.h>
>+#import <WebKitLegacy/WebNSViewExtras.h>
> 
> #import <WebCore/InspectorController.h>
> #import <wtf/Assertions.h>
> 
> #if PLATFORM(IOS_FAMILY)
>-#import "WebFramePrivate.h"
>-#import "WebHTMLView.h"
>-#import "WebView.h"
>+#import <WebKitLegacy/WebFramePrivate.h>
>+#import <WebKitLegacy/WebHTMLView.h>
>+#import <WebKitLegacy/WebView.h>
> #import <WebCore/WAKWindow.h>
> #import <pal/spi/cocoa/QuartzCoreSPI.h>
> #endif
>Index: Source/WebKitLegacy/mac/WebView/WebDataSource.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebDataSource.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebDataSource.mm	(working copy)
>@@ -26,34 +26,33 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebDataSource.h"
>+#import <WebKitLegacy/WebDataSource.h>
> 
>-#import "WebArchive.h"
>-#import "WebArchiveInternal.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebDocument.h"
>-#import "WebDocumentLoaderMac.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameLoadDelegate.h"
>-#import "WebFrameLoaderClient.h"
>-#import "WebFrameViewInternal.h"
>-#import "WebHTMLRepresentation.h"
>-#import "WebKitErrorsPrivate.h"
>-#import "WebKitLogging.h"
>-#import "WebKitNSStringExtras.h"
>-#import "WebKitStatisticsPrivate.h"
>-#import "WebNSURLExtras.h"
>-#import "WebNSURLRequestExtras.h"
>-#import "WebPDFRepresentation.h"
>-#import "WebResourceInternal.h"
>-#import "WebResourceLoadDelegate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebArchive.h>
>+#import <WebKitLegacy/WebArchiveInternal.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebDocument.h>
>+#import <WebKitLegacy/WebDocumentLoaderMac.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameLoadDelegate.h>
>+#import <WebKitLegacy/WebFrameLoaderClient.h>
>+#import <WebKitLegacy/WebFrameViewInternal.h>
>+#import <WebKitLegacy/WebHTMLRepresentation.h>
>+#import <WebKitLegacy/WebKitErrorsPrivate.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
>+#import <WebKitLegacy/WebKitStatisticsPrivate.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebNSURLRequestExtras.h>
>+#import <WebKitLegacy/WebPDFRepresentation.h>
>+#import <WebKitLegacy/WebResourceInternal.h>
>+#import <WebKitLegacy/WebResourceLoadDelegate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <JavaScriptCore/InitializeThreading.h>
> #import <WebCore/ApplicationCacheStorage.h>
> #import <WebCore/FrameLoader.h>
> #import <WebCore/LegacyWebArchive.h>
> #import <WebCore/MIMETypeRegistry.h>
>-#import <WebCore/PreviewLoaderClient.h>
> #import <WebCore/ResourceRequest.h>
> #import <WebCore/SharedBuffer.h>
> #import <WebCore/WebCoreObjCExtras.h>
>@@ -73,6 +72,7 @@
> 
> #if USE(QUICK_LOOK)
> #import <WebCore/QuickLook.h>
>+#import <WebCore/PreviewLoaderClient.h>
> #endif
> 
> using namespace WebCore;
>Index: Source/WebKitLegacy/mac/WebView/WebFrame.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebFrame.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebFrame.mm	(working copy)
>@@ -26,32 +26,42 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebFrameInternal.h"
>-
>-#import "DOMCSSStyleDeclarationInternal.h"
>-#import "DOMDocumentFragmentInternal.h"
>-#import "DOMDocumentInternal.h"
>-#import "DOMElementInternal.h"
>-#import "DOMHTMLElementInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "DOMRangeInternal.h"
>-#import "WebArchiveInternal.h"
>-#import "WebChromeClient.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebDocumentLoaderMac.h"
>-#import "WebDynamicScrollBarsView.h"
>-#import "WebElementDictionary.h"
>-#import "WebFrameLoaderClient.h"
>-#import "WebFrameViewInternal.h"
>-#import "WebHTMLView.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebKitStatisticsPrivate.h"
>-#import "WebKitVersionChecks.h"
>-#import "WebNSObjectExtras.h"
>-#import "WebNSURLExtras.h"
>-#import "WebScriptDebugger.h"
>-#import "WebScriptWorldInternal.h"
>-#import "WebViewInternal.h"
>+// FIXME: Do not commit this code.
>+#if defined(BUILDING_WITH_CMAKE)
>+#define JSC_API_AVAILABLE(...)
>+#define JSC_CLASS_AVAILABLE(...) JS_EXPORT
>+#define JSC_API_DEPRECATED(...)
>+// Use zero since it will be less than any possible version number.
>+#define JSC_MAC_VERSION_TBA 0
>+#define JSC_IOS_VERSION_TBA 0
>+#endif
>+
>+#import <WebKitLegacy/WebFrameInternal.h>
>+
>+#import <WebKitLegacy/DOMCSSStyleDeclarationInternal.h>
>+#import <WebKitLegacy/DOMDocumentFragmentInternal.h>
>+#import <WebKitLegacy/DOMDocumentInternal.h>
>+#import <WebKitLegacy/DOMElementInternal.h>
>+#import <WebKitLegacy/DOMHTMLElementInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMRangeInternal.h>
>+#import <WebKitLegacy/WebArchiveInternal.h>
>+#import <WebKitLegacy/WebChromeClient.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebDocumentLoaderMac.h>
>+#import <WebKitLegacy/WebDynamicScrollBarsView.h>
>+#import <WebKitLegacy/WebElementDictionary.h>
>+#import <WebKitLegacy/WebFrameLoaderClient.h>
>+#import <WebKitLegacy/WebFrameViewInternal.h>
>+#import <WebKitLegacy/WebHTMLView.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebKitStatisticsPrivate.h>
>+#import <WebKitLegacy/WebKitVersionChecks.h>
>+#import <WebKitLegacy/WebNSObjectExtras.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebScriptDebugger.h>
>+#import <WebKitLegacy/WebScriptWorldInternal.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <JavaScriptCore/APICast.h>
> #import <JavaScriptCore/JSCJSValue.h>
> #import <JavaScriptCore/JSContextInternal.h>
>Index: Source/WebKitLegacy/mac/WebView/WebFrameInternal.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebFrameInternal.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebFrameInternal.h	(working copy)
>@@ -28,8 +28,8 @@
> 
> // This header contains WebFrame declarations that can be used anywhere in WebKit, but are neither SPI nor API.
> 
>-#import "WebFramePrivate.h"
>-#import "WebPreferencesPrivate.h"
>+#import <WebKitLegacy/WebFramePrivate.h>
>+#import <WebKitLegacy/WebPreferencesPrivate.h>
> #import <WebCore/EditAction.h>
> #import <WebCore/FrameLoaderTypes.h>
> #import <WebCore/FrameSelection.h>
>Index: Source/WebKitLegacy/mac/WebView/WebFrameView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebFrameView.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebFrameView.mm	(working copy)
>@@ -26,30 +26,30 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebFrameView.h"
>+#import <WebKitLegacy/WebFrameView.h>
> 
>-#import "BackForwardList.h"
>-#import "WebClipView.h"
>-#import "WebDataSourcePrivate.h"
>-#import "WebDocument.h"
>-#import "WebDynamicScrollBarsViewInternal.h"
>-#import "WebFrame.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameViewInternal.h"
>-#import "WebFrameViewPrivate.h"
>-#import "WebHistoryItemInternal.h"
>-#import "WebHTMLViewPrivate.h"
>-#import "WebKitErrorsPrivate.h"
>-#import "WebKitStatisticsPrivate.h"
>-#import "WebKitVersionChecks.h"
>-#import "WebNSDictionaryExtras.h"
>-#import "WebNSObjectExtras.h"
>-#import "WebNSViewExtras.h"
>-#import "WebPDFView.h"
>-#import "WebPreferenceKeysPrivate.h"
>-#import "WebResourceInternal.h"
>-#import "WebViewInternal.h"
>-#import "WebViewPrivate.h"
>+#import <WebKitLegacy/BackForwardList.h>
>+#import <WebKitLegacy/WebClipView.h>
>+#import <WebKitLegacy/WebDataSourcePrivate.h>
>+#import <WebKitLegacy/WebDocument.h>
>+#import <WebKitLegacy/WebDynamicScrollBarsViewInternal.h>
>+#import <WebKitLegacy/WebFrame.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameViewInternal.h>
>+#import <WebKitLegacy/WebFrameViewPrivate.h>
>+#import <WebKitLegacy/WebHistoryItemInternal.h>
>+#import <WebKitLegacy/WebHTMLViewPrivate.h>
>+#import <WebKitLegacy/WebKitErrorsPrivate.h>
>+#import <WebKitLegacy/WebKitStatisticsPrivate.h>
>+#import <WebKitLegacy/WebKitVersionChecks.h>
>+#import <WebKitLegacy/WebNSDictionaryExtras.h>
>+#import <WebKitLegacy/WebNSObjectExtras.h>
>+#import <WebKitLegacy/WebNSViewExtras.h>
>+#import <WebKitLegacy/WebPDFView.h>
>+#import <WebKitLegacy/WebPreferenceKeysPrivate.h>
>+#import <WebKitLegacy/WebResourceInternal.h>
>+#import <WebKitLegacy/WebViewInternal.h>
>+#import <WebKitLegacy/WebViewPrivate.h>
> #import <Foundation/NSURLRequest.h>
> #import <WebCore/BackForwardController.h>
> #import <WebCore/DragController.h>
>Index: Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	(working copy)
>@@ -27,51 +27,51 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebHTMLView.h"
>+#import <WebKitLegacy/WebHTMLView.h>
> 
>-#import "DOMCSSStyleDeclarationInternal.h"
>-#import "DOMDocumentFragmentInternal.h"
>-#import "DOMDocumentInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "DOMRangeInternal.h"
>-#import "WebArchive.h"
>-#import "WebClipView.h"
>-#import "WebContextMenuClient.h"
>-#import "WebDOMOperationsInternal.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebDefaultUIDelegate.h"
>-#import "WebDelegateImplementationCaching.h"
>-#import "WebDocumentInternal.h"
>-#import "WebDynamicScrollBarsViewInternal.h"
>-#import "WebEditingDelegate.h"
>-#import "WebElementDictionary.h"
>-#import "WebFrameInternal.h"
>-#import "WebFramePrivate.h"
>-#import "WebFrameViewInternal.h"
>-#import "WebHTMLRepresentationPrivate.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebImmediateActionController.h"
>-#import "WebKitLogging.h"
>-#import "WebKitNSStringExtras.h"
>-#import "WebKitVersionChecks.h"
>-#import "WebLocalizableStringsInternal.h"
>-#import "WebNSFileManagerExtras.h"
>-#import "WebNSImageExtras.h"
>-#import "WebNSObjectExtras.h"
>-#import "WebNSPrintOperationExtras.h"
>-#import "WebNSURLExtras.h"
>-#import "WebNSViewExtras.h"
>-#import "WebNetscapePluginView.h"
>-#import "WebNodeHighlight.h"
>-#import "WebPluginController.h"
>-#import "WebPreferences.h"
>-#import "WebPreferencesPrivate.h"
>-#import "WebResourcePrivate.h"
>-#import "WebSharingServicePickerController.h"
>-#import "WebTextCompletionController.h"
>-#import "WebTypesInternal.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/DOMCSSStyleDeclarationInternal.h>
>+#import <WebKitLegacy/DOMDocumentFragmentInternal.h>
>+#import <WebKitLegacy/DOMDocumentInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMRangeInternal.h>
>+#import <WebKitLegacy/WebArchive.h>
>+#import <WebKitLegacy/WebClipView.h>
>+#import <WebKitLegacy/WebContextMenuClient.h>
>+#import <WebKitLegacy/WebDOMOperationsInternal.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebDefaultUIDelegate.h>
>+#import <WebKitLegacy/WebDelegateImplementationCaching.h>
>+#import <WebKitLegacy/WebDocumentInternal.h>
>+#import <WebKitLegacy/WebDynamicScrollBarsViewInternal.h>
>+#import <WebKitLegacy/WebEditingDelegate.h>
>+#import <WebKitLegacy/WebElementDictionary.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFramePrivate.h>
>+#import <WebKitLegacy/WebFrameViewInternal.h>
>+#import <WebKitLegacy/WebHTMLRepresentationPrivate.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebImmediateActionController.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
>+#import <WebKitLegacy/WebKitVersionChecks.h>
>+#import <WebKitLegacy/WebLocalizableStringsInternal.h>
>+#import <WebKitLegacy/WebNSFileManagerExtras.h>
>+#import <WebKitLegacy/WebNSImageExtras.h>
>+#import <WebKitLegacy/WebNSObjectExtras.h>
>+#import <WebKitLegacy/WebNSPrintOperationExtras.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebNSViewExtras.h>
>+#import <WebKitLegacy/WebNetscapePluginView.h>
>+#import <WebKitLegacy/WebNodeHighlight.h>
>+#import <WebKitLegacy/WebPluginController.h>
>+#import <WebKitLegacy/WebPreferences.h>
>+#import <WebKitLegacy/WebPreferencesPrivate.h>
>+#import <WebKitLegacy/WebResourcePrivate.h>
>+#import <WebKitLegacy/WebSharingServicePickerController.h>
>+#import <WebKitLegacy/WebTextCompletionController.h>
>+#import <WebKitLegacy/WebTypesInternal.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <JavaScriptCore/InitializeThreading.h>
> #import <QuartzCore/QuartzCore.h>
> #import <WebCore/CSSStyleDeclaration.h>
>Index: Source/WebKitLegacy/mac/WebView/WebIndicateLayer.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebIndicateLayer.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebIndicateLayer.mm	(working copy)
>@@ -25,10 +25,10 @@
> 
> #if PLATFORM(IOS_FAMILY) && ENABLE(REMOTE_INSPECTOR)
> 
>-#import "WebIndicateLayer.h"
>+#import <WebKitLegacy/WebIndicateLayer.h>
> 
>-#import "WebFramePrivate.h"
>-#import "WebView.h"
>+#import <WebKitLegacy/WebFramePrivate.h>
>+#import <WebKitLegacy/WebView.h>
> #import <WebCore/ColorMac.h>
> #import <WebCore/WAKWindow.h>
> #import <pal/spi/cocoa/QuartzCoreSPI.h>
>Index: Source/WebKitLegacy/mac/WebView/WebJSPDFDoc.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebJSPDFDoc.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebJSPDFDoc.mm	(working copy)
>@@ -23,13 +23,13 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>  */
> 
>-#import "WebJSPDFDoc.h"
>+#import <WebKitLegacy/WebJSPDFDoc.h>
> 
>-#import "WebDataSource.h"
>-#import "WebDelegateImplementationCaching.h"
>-#import "WebFrame.h"
>-#import "WebUIDelegate.h"
>-#import "WebView.h"
>+#import <WebKitLegacy/WebDataSource.h>
>+#import <WebKitLegacy/WebDelegateImplementationCaching.h>
>+#import <WebKitLegacy/WebFrame.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
>+#import <WebKitLegacy/WebView.h>
> #import <JavaScriptCore/JSObjectRef.h>
> 
> static void jsPDFDocInitialize(JSContextRef ctx, JSObjectRef object)
>Index: Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm	(working copy)
>@@ -28,14 +28,14 @@
> 
> #if !PLATFORM(IOS_FAMILY)
> 
>-#import "WebPDFRepresentation.h"
>+#import <WebKitLegacy/WebPDFRepresentation.h>
> 
>-#import "WebDataSourcePrivate.h"
>-#import "WebFrame.h"
>-#import "WebJSPDFDoc.h"
>-#import "WebPDFDocumentExtras.h"
>-#import "WebPDFView.h"
>-#import "WebTypesInternal.h"
>+#import <WebKitLegacy/WebDataSourcePrivate.h>
>+#import <WebKitLegacy/WebFrame.h>
>+#import <WebKitLegacy/WebJSPDFDoc.h>
>+#import <WebKitLegacy/WebPDFDocumentExtras.h>
>+#import <WebKitLegacy/WebPDFView.h>
>+#import <WebKitLegacy/WebTypesInternal.h>
> #import <JavaScriptCore/JSContextRef.h>
> #import <JavaScriptCore/OpaqueJSString.h>
> #import <wtf/Assertions.h>
>Index: Source/WebKitLegacy/mac/WebView/WebPDFView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebPDFView.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebPDFView.mm	(working copy)
>@@ -26,29 +26,29 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebPDFView.h"
>+#import <WebKitLegacy/WebPDFView.h>
> 
> #if PLATFORM(MAC)
> 
>-#import "DOMNodeInternal.h"
>-#import "DOMRangeInternal.h"
>-#import "PDFViewSPI.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebDelegateImplementationCaching.h"
>-#import "WebDocumentInternal.h"
>-#import "WebDocumentPrivate.h"
>-#import "WebFrame.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameView.h"
>-#import "WebLocalizableStringsInternal.h"
>-#import "WebNSPasteboardExtras.h"
>-#import "WebNSViewExtras.h"
>-#import "WebPDFRepresentation.h"
>-#import "WebPreferencesPrivate.h"
>-#import "WebUIDelegate.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebView.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMRangeInternal.h>
>+#import <WebKitLegacy/PDFViewSPI.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebDelegateImplementationCaching.h>
>+#import <WebKitLegacy/WebDocumentInternal.h>
>+#import <WebKitLegacy/WebDocumentPrivate.h>
>+#import <WebKitLegacy/WebFrame.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameView.h>
>+#import <WebKitLegacy/WebLocalizableStringsInternal.h>
>+#import <WebKitLegacy/WebNSPasteboardExtras.h>
>+#import <WebKitLegacy/WebNSViewExtras.h>
>+#import <WebKitLegacy/WebPDFRepresentation.h>
>+#import <WebKitLegacy/WebPreferencesPrivate.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebView.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <WebCore/DataTransfer.h>
> #import <WebCore/EventNames.h>
> #import <WebCore/FormState.h>
>Index: Source/WebKitLegacy/mac/WebView/WebScriptDebugDelegate.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebScriptDebugDelegate.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebScriptDebugDelegate.mm	(working copy)
>@@ -26,12 +26,12 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebScriptDebugDelegate.h"
>-#import "WebDataSource.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebFrameInternal.h"
>-#import "WebScriptDebugger.h"
>-#import "WebViewInternal.h"
>+#import <WebKitLegacy/WebScriptDebugDelegate.h>
>+#import <WebKitLegacy/WebDataSource.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebScriptDebugger.h>
>+#import <WebKitLegacy/WebViewInternal.h>
> #import <JavaScriptCore/CallFrame.h>
> #import <JavaScriptCore/Completion.h>
> #import <JavaScriptCore/Debugger.h>
>Index: Source/WebKitLegacy/mac/WebView/WebScriptWorld.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebScriptWorld.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebScriptWorld.mm	(working copy)
>@@ -22,6 +22,16 @@
>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>+// FIXME: Do not commit this code.
>+#if defined(BUILDING_WITH_CMAKE)
>+#define JSC_API_AVAILABLE(...)
>+#define JSC_CLASS_AVAILABLE(...) JS_EXPORT
>+#define JSC_API_DEPRECATED(...)
>+// Use zero since it will be less than any possible version number.
>+#define JSC_MAC_VERSION_TBA 0
>+#define JSC_IOS_VERSION_TBA 0
>+#endif
>+
> #import "WebScriptWorld.h"
> 
> #import "WebScriptWorldInternal.h"
>Index: Source/WebKitLegacy/mac/WebView/WebView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebView.mm	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebView.mm	(working copy)
>@@ -28,95 +28,95 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "WebViewInternal.h"
>-#import "WebViewData.h"
>+#import <WebKitLegacy/WebViewInternal.h>
>+#import <WebKitLegacy/WebViewData.h>
> 
>-#import "BackForwardList.h"
>-#import "DOMCSSStyleDeclarationInternal.h"
>-#import "DOMDocumentInternal.h"
>-#import "DOMInternal.h"
>-#import "DOMNodeInternal.h"
>-#import "DOMRangeInternal.h"
>-#import "PageStorageSessionProvider.h"
>-#import "StorageThread.h"
>-#import "WebAlternativeTextClient.h"
>-#import "WebApplicationCacheInternal.h"
>-#import "WebArchive.h"
>-#import "WebBackForwardListInternal.h"
>-#import "WebBaseNetscapePluginView.h"
>-#import "WebCache.h"
>-#import "WebChromeClient.h"
>-#import "WebDOMOperationsPrivate.h"
>-#import "WebDataSourceInternal.h"
>-#import "WebDatabaseManagerPrivate.h"
>-#import "WebDatabaseProvider.h"
>-#import "WebDefaultEditingDelegate.h"
>-#import "WebDefaultPolicyDelegate.h"
>-#import "WebDefaultUIDelegate.h"
>-#import "WebDelegateImplementationCaching.h"
>-#import "WebDeviceOrientationClient.h"
>-#import "WebDeviceOrientationProvider.h"
>-#import "WebDocument.h"
>-#import "WebDocumentInternal.h"
>-#import "WebDownload.h"
>-#import "WebDragClient.h"
>-#import "WebDynamicScrollBarsViewInternal.h"
>-#import "WebEditingDelegate.h"
>-#import "WebEditorClient.h"
>-#import "WebFormDelegatePrivate.h"
>-#import "WebFrameInternal.h"
>-#import "WebFrameLoadDelegatePrivate.h"
>-#import "WebFrameLoaderClient.h"
>-#import "WebFrameNetworkingContext.h"
>-#import "WebFrameViewInternal.h"
>-#import "WebGeolocationClient.h"
>-#import "WebGeolocationPositionInternal.h"
>-#import "WebHTMLRepresentation.h"
>-#import "WebHTMLViewInternal.h"
>-#import "WebHistoryDelegate.h"
>-#import "WebHistoryItemInternal.h"
>-#import "WebIconDatabase.h"
>-#import "WebInspector.h"
>-#import "WebInspectorClient.h"
>-#import "WebKitErrors.h"
>-#import "WebKitFullScreenListener.h"
>-#import "WebKitLogging.h"
>-#import "WebKitNSStringExtras.h"
>-#import "WebKitStatisticsPrivate.h"
>-#import "WebKitVersionChecks.h"
>-#import "WebLocalizableStrings.h"
>-#import "WebNSDataExtras.h"
>-#import "WebNSDataExtrasPrivate.h"
>-#import "WebNSDictionaryExtras.h"
>-#import "WebNSURLExtras.h"
>-#import "WebNSURLRequestExtras.h"
>-#import "WebNSViewExtras.h"
>-#import "WebNodeHighlight.h"
>-#import "WebNotificationClient.h"
>-#import "WebPDFView.h"
>-#import "WebPaymentCoordinatorClient.h"
>-#import "WebPlatformStrategies.h"
>-#import "WebPluginDatabase.h"
>-#import "WebPluginInfoProvider.h"
>-#import "WebPolicyDelegate.h"
>-#import "WebPreferenceKeysPrivate.h"
>-#import "WebPreferencesPrivate.h"
>-#import "WebProgressTrackerClient.h"
>-#import "WebResourceLoadDelegate.h"
>-#import "WebResourceLoadDelegatePrivate.h"
>-#import "WebResourceLoadScheduler.h"
>-#import "WebScriptDebugDelegate.h"
>-#import "WebScriptWorldInternal.h"
>-#import "WebSelectionServiceController.h"
>-#import "WebStorageManagerInternal.h"
>-#import "WebStorageNamespaceProvider.h"
>-#import "WebTextCompletionController.h"
>-#import "WebTextIterator.h"
>-#import "WebUIDelegate.h"
>-#import "WebUIDelegatePrivate.h"
>-#import "WebValidationMessageClient.h"
>-#import "WebViewGroup.h"
>-#import "WebVisitedLinkStore.h"
>+#import <WebKitLegacy/BackForwardList.h>
>+#import <WebKitLegacy/DOMCSSStyleDeclarationInternal.h>
>+#import <WebKitLegacy/DOMDocumentInternal.h>
>+#import <WebKitLegacy/DOMInternal.h>
>+#import <WebKitLegacy/DOMNodeInternal.h>
>+#import <WebKitLegacy/DOMRangeInternal.h>
>+#import <WebKitLegacy/PageStorageSessionProvider.h>
>+#import <WebKitLegacy/StorageThread.h>
>+#import <WebKitLegacy/WebAlternativeTextClient.h>
>+#import <WebKitLegacy/WebApplicationCacheInternal.h>
>+#import <WebKitLegacy/WebArchive.h>
>+#import <WebKitLegacy/WebBackForwardListInternal.h>
>+#import <WebKitLegacy/WebBaseNetscapePluginView.h>
>+#import <WebKitLegacy/WebCache.h>
>+#import <WebKitLegacy/WebChromeClient.h>
>+#import <WebKitLegacy/WebDOMOperationsPrivate.h>
>+#import <WebKitLegacy/WebDataSourceInternal.h>
>+#import <WebKitLegacy/WebDatabaseManagerPrivate.h>
>+#import <WebKitLegacy/WebDatabaseProvider.h>
>+#import <WebKitLegacy/WebDefaultEditingDelegate.h>
>+#import <WebKitLegacy/WebDefaultPolicyDelegate.h>
>+#import <WebKitLegacy/WebDefaultUIDelegate.h>
>+#import <WebKitLegacy/WebDelegateImplementationCaching.h>
>+#import <WebKitLegacy/WebDeviceOrientationClient.h>
>+#import <WebKitLegacy/WebDeviceOrientationProvider.h>
>+#import <WebKitLegacy/WebDocument.h>
>+#import <WebKitLegacy/WebDocumentInternal.h>
>+#import <WebKitLegacy/WebDownload.h>
>+#import <WebKitLegacy/WebDragClient.h>
>+#import <WebKitLegacy/WebDynamicScrollBarsViewInternal.h>
>+#import <WebKitLegacy/WebEditingDelegate.h>
>+#import <WebKitLegacy/WebEditorClient.h>
>+#import <WebKitLegacy/WebFormDelegatePrivate.h>
>+#import <WebKitLegacy/WebFrameInternal.h>
>+#import <WebKitLegacy/WebFrameLoadDelegatePrivate.h>
>+#import <WebKitLegacy/WebFrameLoaderClient.h>
>+#import <WebKitLegacy/WebFrameNetworkingContext.h>
>+#import <WebKitLegacy/WebFrameViewInternal.h>
>+#import <WebKitLegacy/WebGeolocationClient.h>
>+#import <WebKitLegacy/WebGeolocationPositionInternal.h>
>+#import <WebKitLegacy/WebHTMLRepresentation.h>
>+#import <WebKitLegacy/WebHTMLViewInternal.h>
>+#import <WebKitLegacy/WebHistoryDelegate.h>
>+#import <WebKitLegacy/WebHistoryItemInternal.h>
>+#import <WebKitLegacy/WebIconDatabase.h>
>+#import <WebKitLegacy/WebInspector.h>
>+#import <WebKitLegacy/WebInspectorClient.h>
>+#import <WebKitLegacy/WebKitErrors.h>
>+#import <WebKitLegacy/WebKitFullScreenListener.h>
>+#import <WebKitLegacy/WebKitLogging.h>
>+#import <WebKitLegacy/WebKitNSStringExtras.h>
>+#import <WebKitLegacy/WebKitStatisticsPrivate.h>
>+#import <WebKitLegacy/WebKitVersionChecks.h>
>+#import <WebKitLegacy/WebLocalizableStrings.h>
>+#import <WebKitLegacy/WebNSDataExtras.h>
>+#import <WebKitLegacy/WebNSDataExtrasPrivate.h>
>+#import <WebKitLegacy/WebNSDictionaryExtras.h>
>+#import <WebKitLegacy/WebNSURLExtras.h>
>+#import <WebKitLegacy/WebNSURLRequestExtras.h>
>+#import <WebKitLegacy/WebNSViewExtras.h>
>+#import <WebKitLegacy/WebNodeHighlight.h>
>+#import <WebKitLegacy/WebNotificationClient.h>
>+#import <WebKitLegacy/WebPDFView.h>
>+#import <WebKitLegacy/WebPaymentCoordinatorClient.h>
>+#import <WebKitLegacy/WebPlatformStrategies.h>
>+#import <WebKitLegacy/WebPluginDatabase.h>
>+#import <WebKitLegacy/WebPluginInfoProvider.h>
>+#import <WebKitLegacy/WebPolicyDelegate.h>
>+#import <WebKitLegacy/WebPreferenceKeysPrivate.h>
>+#import <WebKitLegacy/WebPreferencesPrivate.h>
>+#import <WebKitLegacy/WebProgressTrackerClient.h>
>+#import <WebKitLegacy/WebResourceLoadDelegate.h>
>+#import <WebKitLegacy/WebResourceLoadDelegatePrivate.h>
>+#import <WebKitLegacy/WebResourceLoadScheduler.h>
>+#import <WebKitLegacy/WebScriptDebugDelegate.h>
>+#import <WebKitLegacy/WebScriptWorldInternal.h>
>+#import <WebKitLegacy/WebSelectionServiceController.h>
>+#import <WebKitLegacy/WebStorageManagerInternal.h>
>+#import <WebKitLegacy/WebStorageNamespaceProvider.h>
>+#import <WebKitLegacy/WebTextCompletionController.h>
>+#import <WebKitLegacy/WebTextIterator.h>
>+#import <WebKitLegacy/WebUIDelegate.h>
>+#import <WebKitLegacy/WebUIDelegatePrivate.h>
>+#import <WebKitLegacy/WebValidationMessageClient.h>
>+#import <WebKitLegacy/WebViewGroup.h>
>+#import <WebKitLegacy/WebVisitedLinkStore.h>
> #import <CoreFoundation/CFSet.h>
> #import <Foundation/NSURLConnection.h>
> #import <JavaScriptCore/APICast.h>
>@@ -249,16 +249,16 @@
> #import <wtf/spi/darwin/dyldSPI.h>
> 
> #if !PLATFORM(IOS_FAMILY)
>-#import "WebContextMenuClient.h"
>-#import "WebFullScreenController.h"
>-#import "WebImmediateActionController.h"
>-#import "WebNSEventExtras.h"
>-#import "WebNSObjectExtras.h"
>-#import "WebNSPasteboardExtras.h"
>-#import "WebNSPrintOperationExtras.h"
>-#import "WebPDFView.h"
>-#import "WebSwitchingGPUClient.h"
>-#import "WebVideoFullscreenController.h"
>+#import <WebKitLegacy/WebContextMenuClient.h>
>+#import <WebKitLegacy/WebFullScreenController.h>
>+#import <WebKitLegacy/WebImmediateActionController.h>
>+#import <WebKitLegacy/WebNSEventExtras.h>
>+#import <WebKitLegacy/WebNSObjectExtras.h>
>+#import <WebKitLegacy/WebNSPasteboardExtras.h>
>+#import <WebKitLegacy/WebNSPrintOperationExtras.h>
>+#import <WebKitLegacy/WebPDFView.h>
>+#import <WebKitLegacy/WebSwitchingGPUClient.h>
>+#import <WebKitLegacy/WebVideoFullscreenController.h>
> #import <WebCore/TextIndicator.h>
> #import <WebCore/TextIndicatorWindow.h>
> #import <pal/spi/cocoa/AVKitSPI.h>
>Index: Source/WebKitLegacy/mac/WebView/WebViewInternal.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebViewInternal.h	(revision 246656)
>+++ Source/WebKitLegacy/mac/WebView/WebViewInternal.h	(working copy)
>@@ -29,9 +29,9 @@
> 
> // This header contains WebView declarations that can be used anywhere in WebKit, but are neither SPI nor API.
> 
>-#import "WebPreferences.h"
>-#import "WebViewPrivate.h"
>-#import "WebTypesInternal.h"
>+#import <WebKitLegacy/WebPreferences.h>
>+#import <WebKitLegacy/WebViewPrivate.h>
>+#import <WebKitLegacy/WebTypesInternal.h>
> 
> #ifdef __cplusplus
> #import <WebCore/AlternativeTextClient.h>
>Index: Source/cmake/OptionsMac.cmake
>===================================================================
>--- Source/cmake/OptionsMac.cmake	(revision 246656)
>+++ Source/cmake/OptionsMac.cmake	(working copy)
>@@ -20,11 +20,11 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE ON)

Actions: View | Formatted Diff | Diff

Attachments on bug 198979: 372396 | 372610 | 373780 | 373803