<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167071] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167071">167071</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-10 06:10:04 -0700 (Thu, 10 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move UseJSC.cmake back to CMakeLists.txt
https://bugs.webkit.org/show_bug.cgi?id=130834
Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-04-10
Reviewed by Csaba Osztrogonác.
No new tests required.
* CMakeLists.txt:
* UseJSC.cmake: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreUseJSCcmake">trunk/Source/WebCore/UseJSC.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (167070 => 167071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-04-10 06:40:01 UTC (rev 167070)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-04-10 13:10:04 UTC (rev 167071)
</span><span class="lines">@@ -23,8 +23,10 @@
</span><span class="cx"> "${WEBCORE_DIR}/accessibility"
</span><span class="cx"> "${WEBCORE_DIR}/bindings"
</span><span class="cx"> "${WEBCORE_DIR}/bindings/generic"
</span><ins>+ "${WEBCORE_DIR}/bindings/js"
</ins><span class="cx"> "${WEBCORE_DIR}/bridge"
</span><span class="cx"> "${WEBCORE_DIR}/bridge/c"
</span><ins>+ "${WEBCORE_DIR}/bridge/jsc"
</ins><span class="cx"> "${WEBCORE_DIR}/crypto"
</span><span class="cx"> "${WEBCORE_DIR}/crypto/keys"
</span><span class="cx"> "${WEBCORE_DIR}/css"
</span><span class="lines">@@ -142,6 +144,7 @@
</span><span class="cx"> Modules/webdatabase
</span><span class="cx"> Modules/websockets
</span><span class="cx"> bindings/generic
</span><ins>+ bindings/js
</ins><span class="cx"> css
</span><span class="cx"> dom
</span><span class="cx"> fileapi
</span><span class="lines">@@ -1011,6 +1014,180 @@
</span><span class="cx"> bindings/generic/ActiveDOMCallback.cpp
</span><span class="cx"> bindings/generic/RuntimeEnabledFeatures.cpp
</span><span class="cx">
</span><ins>+ bindings/js/ArrayValue.cpp
+ bindings/js/CallbackFunction.cpp
+ bindings/js/DOMObjectHashTableMap.cpp
+ bindings/js/DOMWrapperWorld.cpp
+ bindings/js/Dictionary.cpp
+ bindings/js/GCController.cpp
+ bindings/js/IDBBindingUtilities.cpp
+ bindings/js/JSAttrCustom.cpp
+ bindings/js/JSAudioBufferSourceNodeCustom.cpp
+ bindings/js/JSAudioContextCustom.cpp
+ bindings/js/JSAudioTrackCustom.cpp
+ bindings/js/JSAudioTrackListCustom.cpp
+ bindings/js/JSBiquadFilterNodeCustom.cpp
+ bindings/js/JSBlobCustom.cpp
+ bindings/js/JSCDATASectionCustom.cpp
+ bindings/js/JSCSSRuleCustom.cpp
+ bindings/js/JSCSSRuleListCustom.cpp
+ bindings/js/JSCSSStyleDeclarationCustom.cpp
+ bindings/js/JSCSSValueCustom.cpp
+ bindings/js/JSCallbackData.cpp
+ bindings/js/JSCanvasRenderingContext2DCustom.cpp
+ bindings/js/JSCanvasRenderingContextCustom.cpp
+ bindings/js/JSDataTransferCustom.cpp
+ bindings/js/JSCommandLineAPIHostCustom.cpp
+ bindings/js/JSCryptoAlgorithmBuilder.cpp
+ bindings/js/JSCryptoAlgorithmDictionary.cpp
+ bindings/js/JSCryptoCustom.cpp
+ bindings/js/JSCryptoKeyCustom.cpp
+ bindings/js/JSCryptoKeyPairCustom.cpp
+ bindings/js/JSCryptoKeySerializationJWK.cpp
+ bindings/js/JSCryptoOperationData.cpp
+ bindings/js/JSCustomSQLStatementErrorCallback.cpp
+ bindings/js/JSCustomXPathNSResolver.cpp
+ bindings/js/JSDOMBinding.cpp
+ bindings/js/JSDOMFormDataCustom.cpp
+ bindings/js/JSDOMGlobalObject.cpp
+ bindings/js/JSDOMGlobalObjectTask.cpp
+ bindings/js/JSDOMMimeTypeArrayCustom.cpp
+ bindings/js/JSDOMPluginArrayCustom.cpp
+ bindings/js/JSDOMPluginCustom.cpp
+ bindings/js/JSDOMPromise.cpp
+ bindings/js/JSDOMStringListCustom.cpp
+ bindings/js/JSDOMStringMapCustom.cpp
+ bindings/js/JSDOMWindowBase.cpp
+ bindings/js/JSDOMWindowCustom.cpp
+ bindings/js/JSDOMWindowShell.cpp
+ bindings/js/JSDOMWrapper.cpp
+ bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
+ bindings/js/JSDeviceMotionEventCustom.cpp
+ bindings/js/JSDeviceOrientationEventCustom.cpp
+ bindings/js/JSDictionary.cpp
+ bindings/js/JSDocumentCustom.cpp
+ bindings/js/JSElementCustom.cpp
+ bindings/js/JSErrorHandler.cpp
+ bindings/js/JSEventCustom.cpp
+ bindings/js/JSEventListener.cpp
+ bindings/js/JSEventTargetCustom.cpp
+ bindings/js/JSExceptionBase.cpp
+ bindings/js/JSFileReaderCustom.cpp
+ bindings/js/JSGeolocationCustom.cpp
+ bindings/js/JSHTMLAllCollectionCustom.cpp
+ bindings/js/JSHTMLAppletElementCustom.cpp
+ bindings/js/JSHTMLCanvasElementCustom.cpp
+ bindings/js/JSHTMLCollectionCustom.cpp
+ bindings/js/JSHTMLDocumentCustom.cpp
+ bindings/js/JSHTMLElementCustom.cpp
+ bindings/js/JSHTMLEmbedElementCustom.cpp
+ bindings/js/JSHTMLFormControlsCollectionCustom.cpp
+ bindings/js/JSHTMLFormElementCustom.cpp
+ bindings/js/JSHTMLFrameElementCustom.cpp
+ bindings/js/JSHTMLFrameSetElementCustom.cpp
+ bindings/js/JSHTMLInputElementCustom.cpp
+ bindings/js/JSHTMLLinkElementCustom.cpp
+ bindings/js/JSHTMLMediaElementCustom.cpp
+ bindings/js/JSHTMLObjectElementCustom.cpp
+ bindings/js/JSHTMLOptionsCollectionCustom.cpp
+ bindings/js/JSHTMLSelectElementCustom.cpp
+ bindings/js/JSHTMLTemplateElementCustom.cpp
+ bindings/js/JSHistoryCustom.cpp
+ bindings/js/JSIDBAnyCustom.cpp
+ bindings/js/JSIDBDatabaseCustom.cpp
+ bindings/js/JSIDBObjectStoreCustom.cpp
+ bindings/js/JSImageConstructor.cpp
+ bindings/js/JSImageDataCustom.cpp
+ bindings/js/JSInspectorFrontendHostCustom.cpp
+ bindings/js/JSLazyEventListener.cpp
+ bindings/js/JSLocationCustom.cpp
+ bindings/js/JSMainThreadExecState.cpp
+ bindings/js/JSMediaSourceStatesCustom.cpp
+ bindings/js/JSMediaStreamCapabilitiesCustom.cpp
+ bindings/js/JSMessageChannelCustom.cpp
+ bindings/js/JSMessageEventCustom.cpp
+ bindings/js/JSMessagePortCustom.cpp
+ bindings/js/JSMutationCallback.cpp
+ bindings/js/JSMutationObserverCustom.cpp
+ bindings/js/JSNamedNodeMapCustom.cpp
+ bindings/js/JSNavigatorCustom.cpp
+ bindings/js/JSNodeCustom.cpp
+ bindings/js/JSNodeFilterCondition.cpp
+ bindings/js/JSNodeFilterCustom.cpp
+ bindings/js/JSNodeIteratorCustom.cpp
+ bindings/js/JSNodeListCustom.cpp
+ bindings/js/JSOscillatorNodeCustom.cpp
+ bindings/js/JSPannerNodeCustom.cpp
+ bindings/js/JSPerformanceEntryCustom.cpp
+ bindings/js/JSPluginElementFunctions.cpp
+ bindings/js/JSPopStateEventCustom.cpp
+ bindings/js/JSRTCIceCandidateCustom.cpp
+ bindings/js/JSRTCPeerConnectionCustom.cpp
+ bindings/js/JSRTCSessionDescriptionCustom.cpp
+ bindings/js/JSRTCStatsResponseCustom.cpp
+ bindings/js/JSRequestAnimationFrameCallbackCustom.cpp
+ bindings/js/JSSQLResultSetRowListCustom.cpp
+ bindings/js/JSSQLTransactionCustom.cpp
+ bindings/js/JSSQLTransactionSyncCustom.cpp
+ bindings/js/JSSVGElementInstanceCustom.cpp
+ bindings/js/JSSVGLengthCustom.cpp
+ bindings/js/JSSVGPathSegCustom.cpp
+ bindings/js/JSSharedWorkerCustom.cpp
+ bindings/js/JSStorageCustom.cpp
+ bindings/js/JSStyleSheetCustom.cpp
+ bindings/js/JSStyleSheetListCustom.cpp
+ bindings/js/JSSubtleCryptoCustom.cpp
+ bindings/js/JSSVGElementInstanceCustom.cpp
+ bindings/js/JSSVGLengthCustom.cpp
+ bindings/js/JSSVGPathSegCustom.cpp
+ bindings/js/JSTextCustom.cpp
+ bindings/js/JSTextTrackCueCustom.cpp
+ bindings/js/JSTextTrackCustom.cpp
+ bindings/js/JSTextTrackListCustom.cpp
+ bindings/js/JSTouchCustom.cpp
+ bindings/js/JSTouchListCustom.cpp
+ bindings/js/JSTrackCustom.cpp
+ bindings/js/JSTrackEventCustom.cpp
+ bindings/js/JSTreeWalkerCustom.cpp
+ bindings/js/JSVideoTrackCustom.cpp
+ bindings/js/JSVideoTrackListCustom.cpp
+ bindings/js/JSWebGLRenderingContextCustom.cpp
+ bindings/js/JSWebKitPointCustom.cpp
+ bindings/js/JSWorkerCustom.cpp
+ bindings/js/JSWorkerGlobalScopeBase.cpp
+ bindings/js/JSWorkerGlobalScopeCustom.cpp
+ bindings/js/JSXMLHttpRequestCustom.cpp
+ bindings/js/JSXPathResultCustom.cpp
+ bindings/js/JSXSLTProcessorCustom.cpp
+ bindings/js/PageScriptDebugServer.cpp
+ bindings/js/ScheduledAction.cpp
+ bindings/js/ScriptCachedFrameData.cpp
+ bindings/js/ScriptController.cpp
+ bindings/js/ScriptGlobalObject.cpp
+ bindings/js/ScriptProfile.cpp
+ bindings/js/ScriptProfiler.cpp
+ bindings/js/ScriptState.cpp
+ bindings/js/SerializedScriptValue.cpp
+ bindings/js/WebCoreTypedArrayController.cpp
+ bindings/js/WorkerScriptController.cpp
+ bindings/js/WorkerScriptDebugServer.cpp
+
+ bridge/IdentifierRep.cpp
+ bridge/NP_jsobject.cpp
+ bridge/npruntime.cpp
+ bridge/runtime_array.cpp
+ bridge/runtime_method.cpp
+ bridge/runtime_object.cpp
+ bridge/runtime_root.cpp
+
+ bridge/c/CRuntimeObject.cpp
+ bridge/c/c_class.cpp
+ bridge/c/c_instance.cpp
+ bridge/c/c_runtime.cpp
+ bridge/c/c_utility.cpp
+
+ bridge/jsc/BridgeJSC.cpp
+
</ins><span class="cx"> css/BasicShapeFunctions.cpp
</span><span class="cx"> css/CSSAspectRatioValue.cpp
</span><span class="cx"> css/CSSBasicShapes.cpp
</span><span class="lines">@@ -1034,8 +1211,8 @@
</span><span class="cx"> css/CSSFontValue.cpp
</span><span class="cx"> css/CSSFunctionValue.cpp
</span><span class="cx"> css/CSSGradientValue.cpp
</span><ins>+ css/CSSGridLineNamesValue.cpp
</ins><span class="cx"> css/CSSGridTemplateAreasValue.cpp
</span><del>- css/CSSGridLineNamesValue.cpp
</del><span class="cx"> css/CSSGroupingRule.cpp
</span><span class="cx"> css/CSSImageGeneratorValue.cpp
</span><span class="cx"> css/CSSImageSetValue.cpp
</span><span class="lines">@@ -2981,6 +3158,8 @@
</span><span class="cx">
</span><span class="cx"> testing/InternalSettings.cpp
</span><span class="cx"> testing/Internals.cpp
</span><ins>+
+ testing/js/WebCoreTestSupport.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCoreTestSupport_LIBRARIES
</span><span class="lines">@@ -2994,6 +3173,8 @@
</span><span class="cx"> ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
</span><span class="cx"> )
</span><span class="cx"> set(SCRIPTS_BINDINGS
</span><ins>+ ${WEBCORE_DIR}/bindings/scripts/CodeGenerator.pm
+ ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm
</ins><span class="cx"> ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
</span><span class="cx"> ${WEBCORE_DIR}/bindings/scripts/InFilesParser.pm
</span><span class="cx"> ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
</span><span class="lines">@@ -3191,8 +3372,66 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
</span><span class="cx">
</span><span class="cx">
</span><del>-include(${WEBCORE_DIR}/UseJSC.cmake)
</del><ins>+set(IDL_INCLUDES "")
+foreach (_include ${WebCore_IDL_INCLUDES})
+ list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
+endforeach ()
</ins><span class="cx">
</span><ins>+foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
+ list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
+endforeach ()
+
+set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
+
+# Create JavaScript C++ code given an IDL input
+foreach (_idl ${WebCore_IDL_FILES})
+ set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
+endforeach ()
+
+foreach (_idl ${WebCoreTestSupport_IDL_FILES})
+ set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
+endforeach ()
+
+set(IDL_FILES_LIST "${IDL_FILES_LIST}${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl\n")
+list(APPEND IDL_INCLUDES --include=${DERIVED_SOURCES_WEBCORE_DIR})
+list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
+
+file(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
+
+add_custom_command(
+ OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES}
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE} --workerGlobalScopeConstructorsFile ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+--sharedWorkerGlobalScopeConstructorsFile ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE} --dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ VERBATIM)
+
+GENERATE_BINDINGS(WebCore_SOURCES
+ "${WebCore_IDL_FILES}"
+ "${WEBCORE_DIR}"
+ "${IDL_INCLUDES}"
+ "${FEATURE_DEFINES_JAVASCRIPT}"
+ ${DERIVED_SOURCES_WEBCORE_DIR} JS JS
+ ${IDL_ATTRIBUTES_FILE}
+ ${SUPPLEMENTAL_DEPENDENCY_FILE}
+ ${WINDOW_CONSTRUCTORS_FILE}
+ ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
+
+GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
+ "${WebCoreTestSupport_IDL_FILES}"
+ "${WEBCORE_DIR}"
+ "${IDL_INCLUDES}"
+ "${FEATURE_DEFINES_JAVASCRIPT}"
+ ${DERIVED_SOURCES_WEBCORE_DIR} JS JS
+ ${IDL_ATTRIBUTES_FILE}
+ ${SUPPLEMENTAL_DEPENDENCY_FILE}
+ ${WINDOW_CONSTRUCTORS_FILE}
+ ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
+
+
</ins><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167070 => 167071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-10 06:40:01 UTC (rev 167070)
+++ trunk/Source/WebCore/ChangeLog 2014-04-10 13:10:04 UTC (rev 167071)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-10 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Move UseJSC.cmake back to CMakeLists.txt
+ https://bugs.webkit.org/show_bug.cgi?id=130834
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests required.
+
+ * CMakeLists.txt:
+ * UseJSC.cmake: Removed.
+
</ins><span class="cx"> 2014-04-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r167046.
</span></span></pre></div>
<a id="trunkSourceWebCoreUseJSCcmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/UseJSC.cmake (167070 => 167071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/UseJSC.cmake 2014-04-10 06:40:01 UTC (rev 167070)
+++ trunk/Source/WebCore/UseJSC.cmake 2014-04-10 13:10:04 UTC (rev 167071)
</span><span class="lines">@@ -1,256 +0,0 @@
</span><del>-list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/bindings/js"
- "${WEBCORE_DIR}/bridge/jsc"
-)
-
-list(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/testing/js"
-)
-
-list(APPEND WebCore_IDL_INCLUDES
- bindings/js
-)
-
-list(APPEND WebCore_SOURCES
- bindings/js/ArrayValue.cpp
- bindings/js/CallbackFunction.cpp
- bindings/js/DOMObjectHashTableMap.cpp
- bindings/js/DOMWrapperWorld.cpp
- bindings/js/Dictionary.cpp
- bindings/js/GCController.cpp
- bindings/js/IDBBindingUtilities.cpp
- bindings/js/JSAttrCustom.cpp
- bindings/js/JSAudioBufferSourceNodeCustom.cpp
- bindings/js/JSAudioContextCustom.cpp
- bindings/js/JSAudioTrackCustom.cpp
- bindings/js/JSAudioTrackListCustom.cpp
- bindings/js/JSBiquadFilterNodeCustom.cpp
- bindings/js/JSBlobCustom.cpp
- bindings/js/JSCDATASectionCustom.cpp
- bindings/js/JSCSSRuleCustom.cpp
- bindings/js/JSCSSRuleListCustom.cpp
- bindings/js/JSCSSStyleDeclarationCustom.cpp
- bindings/js/JSCSSValueCustom.cpp
- bindings/js/JSCallbackData.cpp
- bindings/js/JSCanvasRenderingContext2DCustom.cpp
- bindings/js/JSCanvasRenderingContextCustom.cpp
- bindings/js/JSDataTransferCustom.cpp
- bindings/js/JSCommandLineAPIHostCustom.cpp
- bindings/js/JSCryptoAlgorithmBuilder.cpp
- bindings/js/JSCryptoAlgorithmDictionary.cpp
- bindings/js/JSCryptoCustom.cpp
- bindings/js/JSCryptoKeyCustom.cpp
- bindings/js/JSCryptoKeyPairCustom.cpp
- bindings/js/JSCryptoKeySerializationJWK.cpp
- bindings/js/JSCryptoOperationData.cpp
- bindings/js/JSCustomSQLStatementErrorCallback.cpp
- bindings/js/JSCustomXPathNSResolver.cpp
- bindings/js/JSDOMBinding.cpp
- bindings/js/JSDOMFormDataCustom.cpp
- bindings/js/JSDOMGlobalObject.cpp
- bindings/js/JSDOMGlobalObjectTask.cpp
- bindings/js/JSDOMMimeTypeArrayCustom.cpp
- bindings/js/JSDOMPluginArrayCustom.cpp
- bindings/js/JSDOMPluginCustom.cpp
- bindings/js/JSDOMPromise.cpp
- bindings/js/JSDOMStringListCustom.cpp
- bindings/js/JSDOMStringMapCustom.cpp
- bindings/js/JSDOMWindowBase.cpp
- bindings/js/JSDOMWindowCustom.cpp
- bindings/js/JSDOMWindowShell.cpp
- bindings/js/JSDOMWrapper.cpp
- bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
- bindings/js/JSDeviceMotionEventCustom.cpp
- bindings/js/JSDeviceOrientationEventCustom.cpp
- bindings/js/JSDictionary.cpp
- bindings/js/JSDocumentCustom.cpp
- bindings/js/JSElementCustom.cpp
- bindings/js/JSErrorHandler.cpp
- bindings/js/JSEventCustom.cpp
- bindings/js/JSEventListener.cpp
- bindings/js/JSEventTargetCustom.cpp
- bindings/js/JSExceptionBase.cpp
- bindings/js/JSFileReaderCustom.cpp
- bindings/js/JSGeolocationCustom.cpp
- bindings/js/JSHTMLAllCollectionCustom.cpp
- bindings/js/JSHTMLAppletElementCustom.cpp
- bindings/js/JSHTMLCanvasElementCustom.cpp
- bindings/js/JSHTMLCollectionCustom.cpp
- bindings/js/JSHTMLDocumentCustom.cpp
- bindings/js/JSHTMLElementCustom.cpp
- bindings/js/JSHTMLEmbedElementCustom.cpp
- bindings/js/JSHTMLFormControlsCollectionCustom.cpp
- bindings/js/JSHTMLFormElementCustom.cpp
- bindings/js/JSHTMLFrameElementCustom.cpp
- bindings/js/JSHTMLFrameSetElementCustom.cpp
- bindings/js/JSHTMLInputElementCustom.cpp
- bindings/js/JSHTMLLinkElementCustom.cpp
- bindings/js/JSHTMLMediaElementCustom.cpp
- bindings/js/JSHTMLObjectElementCustom.cpp
- bindings/js/JSHTMLOptionsCollectionCustom.cpp
- bindings/js/JSHTMLSelectElementCustom.cpp
- bindings/js/JSHTMLTemplateElementCustom.cpp
- bindings/js/JSHistoryCustom.cpp
- bindings/js/JSIDBAnyCustom.cpp
- bindings/js/JSIDBDatabaseCustom.cpp
- bindings/js/JSIDBObjectStoreCustom.cpp
- bindings/js/JSImageConstructor.cpp
- bindings/js/JSImageDataCustom.cpp
- bindings/js/JSInspectorFrontendHostCustom.cpp
- bindings/js/JSLazyEventListener.cpp
- bindings/js/JSLocationCustom.cpp
- bindings/js/JSMainThreadExecState.cpp
- bindings/js/JSMediaSourceStatesCustom.cpp
- bindings/js/JSMediaStreamCapabilitiesCustom.cpp
- bindings/js/JSMessageChannelCustom.cpp
- bindings/js/JSMessageEventCustom.cpp
- bindings/js/JSMessagePortCustom.cpp
- bindings/js/JSMutationCallback.cpp
- bindings/js/JSMutationObserverCustom.cpp
- bindings/js/JSNamedNodeMapCustom.cpp
- bindings/js/JSNavigatorCustom.cpp
- bindings/js/JSNodeCustom.cpp
- bindings/js/JSNodeFilterCondition.cpp
- bindings/js/JSNodeFilterCustom.cpp
- bindings/js/JSNodeIteratorCustom.cpp
- bindings/js/JSNodeListCustom.cpp
- bindings/js/JSOscillatorNodeCustom.cpp
- bindings/js/JSPannerNodeCustom.cpp
- bindings/js/JSPerformanceEntryCustom.cpp
- bindings/js/JSPluginElementFunctions.cpp
- bindings/js/JSPopStateEventCustom.cpp
- bindings/js/JSRTCIceCandidateCustom.cpp
- bindings/js/JSRTCPeerConnectionCustom.cpp
- bindings/js/JSRTCSessionDescriptionCustom.cpp
- bindings/js/JSRTCStatsResponseCustom.cpp
- bindings/js/JSRequestAnimationFrameCallbackCustom.cpp
- bindings/js/JSSQLResultSetRowListCustom.cpp
- bindings/js/JSSQLTransactionCustom.cpp
- bindings/js/JSSQLTransactionSyncCustom.cpp
- bindings/js/JSSVGElementInstanceCustom.cpp
- bindings/js/JSSVGLengthCustom.cpp
- bindings/js/JSSVGPathSegCustom.cpp
- bindings/js/JSSharedWorkerCustom.cpp
- bindings/js/JSStorageCustom.cpp
- bindings/js/JSStyleSheetCustom.cpp
- bindings/js/JSStyleSheetListCustom.cpp
- bindings/js/JSSubtleCryptoCustom.cpp
- bindings/js/JSSVGElementInstanceCustom.cpp
- bindings/js/JSSVGLengthCustom.cpp
- bindings/js/JSSVGPathSegCustom.cpp
- bindings/js/JSTextCustom.cpp
- bindings/js/JSTextTrackCueCustom.cpp
- bindings/js/JSTextTrackCustom.cpp
- bindings/js/JSTextTrackListCustom.cpp
- bindings/js/JSTouchCustom.cpp
- bindings/js/JSTouchListCustom.cpp
- bindings/js/JSTrackCustom.cpp
- bindings/js/JSTrackEventCustom.cpp
- bindings/js/JSTreeWalkerCustom.cpp
- bindings/js/JSVideoTrackCustom.cpp
- bindings/js/JSVideoTrackListCustom.cpp
- bindings/js/JSWebGLRenderingContextCustom.cpp
- bindings/js/JSWebKitPointCustom.cpp
- bindings/js/JSWorkerCustom.cpp
- bindings/js/JSWorkerGlobalScopeBase.cpp
- bindings/js/JSWorkerGlobalScopeCustom.cpp
- bindings/js/JSXMLHttpRequestCustom.cpp
- bindings/js/JSXPathResultCustom.cpp
- bindings/js/JSXSLTProcessorCustom.cpp
- bindings/js/PageScriptDebugServer.cpp
- bindings/js/ScheduledAction.cpp
- bindings/js/ScriptCachedFrameData.cpp
- bindings/js/ScriptController.cpp
- bindings/js/ScriptGlobalObject.cpp
- bindings/js/ScriptProfile.cpp
- bindings/js/ScriptProfiler.cpp
- bindings/js/ScriptState.cpp
- bindings/js/SerializedScriptValue.cpp
- bindings/js/WebCoreTypedArrayController.cpp
- bindings/js/WorkerScriptController.cpp
- bindings/js/WorkerScriptDebugServer.cpp
-
- bridge/IdentifierRep.cpp
- bridge/NP_jsobject.cpp
- bridge/npruntime.cpp
- bridge/runtime_array.cpp
- bridge/runtime_method.cpp
- bridge/runtime_object.cpp
- bridge/runtime_root.cpp
-
- bridge/c/CRuntimeObject.cpp
- bridge/c/c_class.cpp
- bridge/c/c_instance.cpp
- bridge/c/c_runtime.cpp
- bridge/c/c_utility.cpp
-
- bridge/jsc/BridgeJSC.cpp
-)
-
-list(APPEND WebCoreTestSupport_SOURCES
- testing/js/WebCoreTestSupport.cpp
-)
-
-list(APPEND SCRIPTS_BINDINGS
- ${WEBCORE_DIR}/bindings/scripts/CodeGenerator.pm
- ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm
-)
-
-set(IDL_INCLUDES "")
-foreach (_include ${WebCore_IDL_INCLUDES})
- list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
-endforeach ()
-
-foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
- list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
-endforeach ()
-
-set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
-
-# Create JavaScript C++ code given an IDL input
-foreach (_idl ${WebCore_IDL_FILES})
- set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
-endforeach ()
-
-foreach (_idl ${WebCoreTestSupport_IDL_FILES})
- set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
-endforeach ()
-
-set(IDL_FILES_LIST "${IDL_FILES_LIST}${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl\n")
-list(APPEND IDL_INCLUDES --include=${DERIVED_SOURCES_WEBCORE_DIR})
-list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
-
-file(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
-
-add_custom_command(
- OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE} --workerGlobalScopeConstructorsFile ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
---sharedWorkerGlobalScopeConstructorsFile ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE} --dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- VERBATIM)
-
-GENERATE_BINDINGS(WebCore_SOURCES
- "${WebCore_IDL_FILES}"
- "${WEBCORE_DIR}"
- "${IDL_INCLUDES}"
- "${FEATURE_DEFINES_JAVASCRIPT}"
- ${DERIVED_SOURCES_WEBCORE_DIR} JS JS
- ${IDL_ATTRIBUTES_FILE}
- ${SUPPLEMENTAL_DEPENDENCY_FILE}
- ${WINDOW_CONSTRUCTORS_FILE}
- ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
-
-GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
- "${WebCoreTestSupport_IDL_FILES}"
- "${WEBCORE_DIR}"
- "${IDL_INCLUDES}"
- "${FEATURE_DEFINES_JAVASCRIPT}"
- ${DERIVED_SOURCES_WEBCORE_DIR} JS JS
- ${IDL_ATTRIBUTES_FILE}
- ${SUPPLEMENTAL_DEPENDENCY_FILE}
- ${WINDOW_CONSTRUCTORS_FILE}
- ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
</del></span></pre>
</div>
</div>
</body>
</html>