Title: [204725] trunk/Source
- Revision
- 204725
- Author
- [email protected]
- Date
- 2016-08-22 10:20:17 -0700 (Mon, 22 Aug 2016)
Log Message
Mostly fix Mac CMake build after r204717.
* PlatformMac.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (204724 => 204725)
--- trunk/Source/WebCore/ChangeLog 2016-08-22 17:19:29 UTC (rev 204724)
+++ trunk/Source/WebCore/ChangeLog 2016-08-22 17:20:17 UTC (rev 204725)
@@ -1,3 +1,9 @@
+2016-08-22 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build after r204717.
+
+ * PlatformMac.cmake:
+
2016-08-22 Antti Koivisto <[email protected]>
Can't style descendants in shadow tree using the :host pseudo class
Modified: trunk/Source/WebCore/PlatformMac.cmake (204724 => 204725)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-08-22 17:19:29 UTC (rev 204724)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-08-22 17:20:17 UTC (rev 204725)
@@ -73,7 +73,6 @@
"${THIRDPARTY_DIR}/ANGLE"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${WEBCORE_DIR}/accessibility/mac"
- "${WEBCORE_DIR}/bindings/objc"
"${WEBCORE_DIR}/bridge/objc"
"${WEBCORE_DIR}/editing/cocoa"
"${WEBCORE_DIR}/editing/mac"
@@ -168,137 +167,6 @@
bindings/js/ScriptControllerMac.mm
- bindings/objc/DOM.mm
- bindings/objc/DOMAbstractView.mm
- bindings/objc/DOMAttr.mm
- bindings/objc/DOMBlob.mm
- bindings/objc/DOMCDATASection.mm
- bindings/objc/DOMCharacterData.mm
- bindings/objc/DOMComment.mm
- bindings/objc/DOMCounter.mm
- bindings/objc/DOMCSS.mm
- bindings/objc/DOMCSSCharsetRule.mm
- bindings/objc/DOMCSSFontFaceRule.mm
- bindings/objc/DOMCSSImportRule.mm
- bindings/objc/DOMCSSMediaRule.mm
- bindings/objc/DOMCSSPageRule.mm
- bindings/objc/DOMCSSPrimitiveValue.mm
- bindings/objc/DOMCSSRule.mm
- bindings/objc/DOMCSSRuleList.mm
- bindings/objc/DOMCSSStyleDeclaration.mm
- bindings/objc/DOMCSSStyleRule.mm
- bindings/objc/DOMCSSStyleSheet.mm
- bindings/objc/DOMCSSUnknownRule.mm
- bindings/objc/DOMCSSValue.mm
- bindings/objc/DOMCSSValueList.mm
- bindings/objc/DOMCustomXPathNSResolver.mm
- bindings/objc/DOMDOMImplementation.mm
- bindings/objc/DOMDOMTokenList.mm
- bindings/objc/DOMDocument.mm
- bindings/objc/DOMDocumentFragment.mm
- bindings/objc/DOMDocumentType.mm
- bindings/objc/DOMElement.mm
- bindings/objc/DOMEntityReference.mm
- bindings/objc/DOMEvent.mm
- bindings/objc/DOMEvents.mm
- bindings/objc/DOMFile.mm
- bindings/objc/DOMFileList.mm
- bindings/objc/DOMHTML.mm
- bindings/objc/DOMHTMLAnchorElement.mm
- bindings/objc/DOMHTMLAppletElement.mm
- bindings/objc/DOMHTMLAreaElement.mm
- bindings/objc/DOMHTMLBRElement.mm
- bindings/objc/DOMHTMLBaseElement.mm
- bindings/objc/DOMHTMLBaseFontElement.mm
- bindings/objc/DOMHTMLBodyElement.mm
- bindings/objc/DOMHTMLButtonElement.mm
- bindings/objc/DOMHTMLCanvasElement.mm
- bindings/objc/DOMHTMLCollection.mm
- bindings/objc/DOMHTMLDListElement.mm
- bindings/objc/DOMHTMLDirectoryElement.mm
- bindings/objc/DOMHTMLDivElement.mm
- bindings/objc/DOMHTMLDocument.mm
- bindings/objc/DOMHTMLElement.mm
- bindings/objc/DOMHTMLEmbedElement.mm
- bindings/objc/DOMHTMLFieldSetElement.mm
- bindings/objc/DOMHTMLFontElement.mm
- bindings/objc/DOMHTMLFormElement.mm
- bindings/objc/DOMHTMLFrameElement.mm
- bindings/objc/DOMHTMLFrameSetElement.mm
- bindings/objc/DOMHTMLHRElement.mm
- bindings/objc/DOMHTMLHeadElement.mm
- bindings/objc/DOMHTMLHeadingElement.mm
- bindings/objc/DOMHTMLHtmlElement.mm
- bindings/objc/DOMHTMLIFrameElement.mm
- bindings/objc/DOMHTMLImageElement.mm
- bindings/objc/DOMHTMLInputElement.mm
- bindings/objc/DOMHTMLLIElement.mm
- bindings/objc/DOMHTMLLabelElement.mm
- bindings/objc/DOMHTMLLegendElement.mm
- bindings/objc/DOMHTMLLinkElement.mm
- bindings/objc/DOMHTMLMapElement.mm
- bindings/objc/DOMHTMLMarqueeElement.mm
- bindings/objc/DOMHTMLMediaElement.mm
- bindings/objc/DOMHTMLMenuElement.mm
- bindings/objc/DOMHTMLMetaElement.mm
- bindings/objc/DOMHTMLModElement.mm
- bindings/objc/DOMHTMLOListElement.mm
- bindings/objc/DOMHTMLObjectElement.mm
- bindings/objc/DOMHTMLOptGroupElement.mm
- bindings/objc/DOMHTMLOptionElement.mm
- bindings/objc/DOMHTMLOptionsCollection.mm
- bindings/objc/DOMHTMLParagraphElement.mm
- bindings/objc/DOMHTMLParamElement.mm
- bindings/objc/DOMHTMLPreElement.mm
- bindings/objc/DOMHTMLQuoteElement.mm
- bindings/objc/DOMHTMLScriptElement.mm
- bindings/objc/DOMHTMLSelectElement.mm
- bindings/objc/DOMHTMLStyleElement.mm
- bindings/objc/DOMHTMLTableCaptionElement.mm
- bindings/objc/DOMHTMLTableCellElement.mm
- bindings/objc/DOMHTMLTableColElement.mm
- bindings/objc/DOMHTMLTableElement.mm
- bindings/objc/DOMHTMLTableRowElement.mm
- bindings/objc/DOMHTMLTableSectionElement.mm
- bindings/objc/DOMHTMLTextAreaElement.mm
- bindings/objc/DOMHTMLTitleElement.mm
- bindings/objc/DOMHTMLUListElement.mm
- bindings/objc/DOMHTMLVideoElement.mm
- bindings/objc/DOMInternal.mm
- bindings/objc/DOMKeyboardEvent.mm
- bindings/objc/DOMMediaError.mm
- bindings/objc/DOMMediaList.mm
- bindings/objc/DOMMouseEvent.mm
- bindings/objc/DOMMutationEvent.mm
- bindings/objc/DOMNamedNodeMap.mm
- bindings/objc/DOMNode.mm
- bindings/objc/DOMNodeIterator.mm
- bindings/objc/DOMNodeList.mm
- bindings/objc/DOMObject.mm
- bindings/objc/DOMOverflowEvent.mm
- bindings/objc/DOMProcessingInstruction.mm
- bindings/objc/DOMProgressEvent.mm
- bindings/objc/DOMRGBColor.mm
- bindings/objc/DOMRange.mm
- bindings/objc/DOMRect.mm
- bindings/objc/DOMStyleSheet.mm
- bindings/objc/DOMStyleSheetList.mm
- bindings/objc/DOMText.mm
- bindings/objc/DOMTextEvent.mm
- bindings/objc/DOMTimeRanges.mm
- bindings/objc/DOMTreeWalker.mm
- bindings/objc/DOMUIEvent.mm
- bindings/objc/DOMUIKitExtensions.mm
- bindings/objc/DOMUtility.mm
- bindings/objc/DOMWheelEvent.mm
- bindings/objc/DOMXPath.mm
- bindings/objc/DOMXPathExpression.mm
- bindings/objc/DOMXPathResult.mm
- bindings/objc/ExceptionHandlers.mm
- bindings/objc/ObjCEventListener.mm
- bindings/objc/ObjCNodeFilterCondition.mm
- bindings/objc/WebScriptObject.mm
-
bridge/objc/ObjCRuntimeObject.mm
bridge/objc/objc_class.mm
bridge/objc/objc_instance.mm
Modified: trunk/Source/WebKit/ChangeLog (204724 => 204725)
--- trunk/Source/WebKit/ChangeLog 2016-08-22 17:19:29 UTC (rev 204724)
+++ trunk/Source/WebKit/ChangeLog 2016-08-22 17:20:17 UTC (rev 204725)
@@ -1,3 +1,9 @@
+2016-08-22 Alex Christensen <[email protected]>
+
+ Mostly fix Mac CMake build after r204717.
+
+ * PlatformMac.cmake:
+
2016-08-22 Darin Adler <[email protected]>
Move Objective-C DOM bindings from WebCore to legacy WebKit
Modified: trunk/Source/WebKit/PlatformMac.cmake (204724 => 204725)
--- trunk/Source/WebKit/PlatformMac.cmake 2016-08-22 17:19:29 UTC (rev 204724)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-08-22 17:20:17 UTC (rev 204725)
@@ -12,7 +12,6 @@
"${_javascript_CORE_DIR}"
"${_javascript_CORE_DIR}/dfg"
"${WEBCORE_DIR}/accessibility/mac"
- "${WEBCORE_DIR}/bindings/objc"
"${WEBCORE_DIR}/bridge"
"${WEBCORE_DIR}/bridge/jsc"
"${WEBCORE_DIR}/bridge/objc"
@@ -74,6 +73,136 @@
mac/Carbon/HIViewAdapter.m
mac/Carbon/HIWebView.mm
+ mac/DOM/DOM.mm
+ mac/DOM/DOMAbstractView.mm
+ mac/DOM/DOMAttr.mm
+ mac/DOM/DOMBlob.mm
+ mac/DOM/DOMCDATASection.mm
+ mac/DOM/DOMCharacterData.mm
+ mac/DOM/DOMComment.mm
+ mac/DOM/DOMCounter.mm
+ mac/DOM/DOMCSS.mm
+ mac/DOM/DOMCSSCharsetRule.mm
+ mac/DOM/DOMCSSFontFaceRule.mm
+ mac/DOM/DOMCSSImportRule.mm
+ mac/DOM/DOMCSSMediaRule.mm
+ mac/DOM/DOMCSSPageRule.mm
+ mac/DOM/DOMCSSPrimitiveValue.mm
+ mac/DOM/DOMCSSRule.mm
+ mac/DOM/DOMCSSRuleList.mm
+ mac/DOM/DOMCSSStyleDeclaration.mm
+ mac/DOM/DOMCSSStyleRule.mm
+ mac/DOM/DOMCSSStyleSheet.mm
+ mac/DOM/DOMCSSUnknownRule.mm
+ mac/DOM/DOMCSSValue.mm
+ mac/DOM/DOMCSSValueList.mm
+ mac/DOM/DOMCustomXPathNSResolver.mm
+ mac/DOM/DOMDOMImplementation.mm
+ mac/DOM/DOMDOMTokenList.mm
+ mac/DOM/DOMDocument.mm
+ mac/DOM/DOMDocumentFragment.mm
+ mac/DOM/DOMDocumentType.mm
+ mac/DOM/DOMElement.mm
+ mac/DOM/DOMEntityReference.mm
+ mac/DOM/DOMEvent.mm
+ mac/DOM/DOMEvents.mm
+ mac/DOM/DOMFile.mm
+ mac/DOM/DOMFileList.mm
+ mac/DOM/DOMHTML.mm
+ mac/DOM/DOMHTMLAnchorElement.mm
+ mac/DOM/DOMHTMLAppletElement.mm
+ mac/DOM/DOMHTMLAreaElement.mm
+ mac/DOM/DOMHTMLBRElement.mm
+ mac/DOM/DOMHTMLBaseElement.mm
+ mac/DOM/DOMHTMLBaseFontElement.mm
+ mac/DOM/DOMHTMLBodyElement.mm
+ mac/DOM/DOMHTMLButtonElement.mm
+ mac/DOM/DOMHTMLCanvasElement.mm
+ mac/DOM/DOMHTMLCollection.mm
+ mac/DOM/DOMHTMLDListElement.mm
+ mac/DOM/DOMHTMLDirectoryElement.mm
+ mac/DOM/DOMHTMLDivElement.mm
+ mac/DOM/DOMHTMLDocument.mm
+ mac/DOM/DOMHTMLElement.mm
+ mac/DOM/DOMHTMLEmbedElement.mm
+ mac/DOM/DOMHTMLFieldSetElement.mm
+ mac/DOM/DOMHTMLFontElement.mm
+ mac/DOM/DOMHTMLFormElement.mm
+ mac/DOM/DOMHTMLFrameElement.mm
+ mac/DOM/DOMHTMLFrameSetElement.mm
+ mac/DOM/DOMHTMLHRElement.mm
+ mac/DOM/DOMHTMLHeadElement.mm
+ mac/DOM/DOMHTMLHeadingElement.mm
+ mac/DOM/DOMHTMLHtmlElement.mm
+ mac/DOM/DOMHTMLIFrameElement.mm
+ mac/DOM/DOMHTMLImageElement.mm
+ mac/DOM/DOMHTMLInputElement.mm
+ mac/DOM/DOMHTMLLIElement.mm
+ mac/DOM/DOMHTMLLabelElement.mm
+ mac/DOM/DOMHTMLLegendElement.mm
+ mac/DOM/DOMHTMLLinkElement.mm
+ mac/DOM/DOMHTMLMapElement.mm
+ mac/DOM/DOMHTMLMarqueeElement.mm
+ mac/DOM/DOMHTMLMediaElement.mm
+ mac/DOM/DOMHTMLMenuElement.mm
+ mac/DOM/DOMHTMLMetaElement.mm
+ mac/DOM/DOMHTMLModElement.mm
+ mac/DOM/DOMHTMLOListElement.mm
+ mac/DOM/DOMHTMLObjectElement.mm
+ mac/DOM/DOMHTMLOptGroupElement.mm
+ mac/DOM/DOMHTMLOptionElement.mm
+ mac/DOM/DOMHTMLOptionsCollection.mm
+ mac/DOM/DOMHTMLParagraphElement.mm
+ mac/DOM/DOMHTMLParamElement.mm
+ mac/DOM/DOMHTMLPreElement.mm
+ mac/DOM/DOMHTMLQuoteElement.mm
+ mac/DOM/DOMHTMLScriptElement.mm
+ mac/DOM/DOMHTMLSelectElement.mm
+ mac/DOM/DOMHTMLStyleElement.mm
+ mac/DOM/DOMHTMLTableCaptionElement.mm
+ mac/DOM/DOMHTMLTableCellElement.mm
+ mac/DOM/DOMHTMLTableColElement.mm
+ mac/DOM/DOMHTMLTableElement.mm
+ mac/DOM/DOMHTMLTableRowElement.mm
+ mac/DOM/DOMHTMLTableSectionElement.mm
+ mac/DOM/DOMHTMLTextAreaElement.mm
+ mac/DOM/DOMHTMLTitleElement.mm
+ mac/DOM/DOMHTMLUListElement.mm
+ mac/DOM/DOMHTMLVideoElement.mm
+ mac/DOM/DOMInternal.mm
+ mac/DOM/DOMKeyboardEvent.mm
+ mac/DOM/DOMMediaError.mm
+ mac/DOM/DOMMediaList.mm
+ mac/DOM/DOMMouseEvent.mm
+ mac/DOM/DOMMutationEvent.mm
+ mac/DOM/DOMNamedNodeMap.mm
+ mac/DOM/DOMNode.mm
+ mac/DOM/DOMNodeIterator.mm
+ mac/DOM/DOMNodeList.mm
+ mac/DOM/DOMObject.mm
+ mac/DOM/DOMOverflowEvent.mm
+ mac/DOM/DOMProcessingInstruction.mm
+ mac/DOM/DOMProgressEvent.mm
+ mac/DOM/DOMRGBColor.mm
+ mac/DOM/DOMRange.mm
+ mac/DOM/DOMRect.mm
+ mac/DOM/DOMStyleSheet.mm
+ mac/DOM/DOMStyleSheetList.mm
+ mac/DOM/DOMText.mm
+ mac/DOM/DOMTextEvent.mm
+ mac/DOM/DOMTimeRanges.mm
+ mac/DOM/DOMTreeWalker.mm
+ mac/DOM/DOMUIEvent.mm
+ mac/DOM/DOMUIKitExtensions.mm
+ mac/DOM/DOMUtility.mm
+ mac/DOM/DOMWheelEvent.mm
+ mac/DOM/DOMXPath.mm
+ mac/DOM/DOMXPathExpression.mm
+ mac/DOM/DOMXPathResult.mm
+ mac/DOM/ExceptionHandlers.mm
+ mac/DOM/ObjCEventListener.mm
+ mac/DOM/ObjCNodeFilterCondition.mm
+
mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
mac/DefaultDelegates/WebDefaultEditingDelegate.m
mac/DefaultDelegates/WebDefaultPolicyDelegate.m
@@ -259,9 +388,6 @@
mac/WebView/WebFrame.h
mac/WebView/WebView.h
- ${WEBCORE_DIR}/bindings/objc/DOMCore.h
- ${WEBCORE_DIR}/bindings/objc/DOMExtensions.h
-
${WEBCORE_DIR}/plugins/npfunctions.h
)
@@ -354,13 +480,6 @@
WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy)
# FIXME: Forwarding headers should be copies of actual headers.
-file(GLOB ObjCHeaders ${WEBCORE_DIR}/bindings/objc/*.h)
-foreach (_file ${ObjCHeaders})
- get_filename_component(_name ${_file} NAME)
- if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name})
- file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
- endif ()
-endforeach ()
file(GLOB ObjCHeaders ${WEBCORE_DIR}/plugins/*.h)
foreach (_file ${ObjCHeaders})
get_filename_component(_name ${_file} NAME)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
