Attachment #129803 for bug #79896

View Details Raw Unified Return to Bug 79896

| Differences between



2012-03-01  Kangil Han  <kangil.han@samsung.com>

        [CMake][DRT] Add WebCoreTestSupport.
        https://bugs.webkit.org/show_bug.cgi?id=79896

        Reviewed by NOBODY (OOPS!).

        Add WebCoreTestSupport library for DRT in CMake.
        We will use internals object by linking this library on DRT.

        * CMakeLists.txt:
        * UseJSC.cmake:
        * UseV8.cmake:

2012-03-01  Luke Macpherson   <macpherson@chromium.org>

        Handle CSSPropertyWebkitBorderFit in CSSStyleApplyProperty.



    )
ENDIF ()

SET(WebCoreTestSupport_INCLUDE_DIRECTORIES
    "${WebCore_INCLUDE_DIRECTORIES}"
    "${WEBCORE_DIR}/testing"
)

SET(WebCoreTestSupport_IDL_INCLUDES
    testing
)

SET(WebCoreTestSupport_IDL_FILES
    testing/Internals.idl
    testing/InternalSettings.idl
)

SET(WebCoreTestSupport_SOURCES
    testing/Internals.cpp
    testing/InternalSettings.cpp
)

# Modules that the bindings generator scripts may use
SET(SCRIPTS_RESOLVE_SUPPLEMENTAL
    ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm

    VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)



WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})

ADD_DEFINITIONS(-DBUILDING_WebCore)
INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})

ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
ADD_LIBRARY(${WebCoreTestSupport_LIBRARY_NAME} ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})

ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME})
ADD_DEPENDENCIES(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})

TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})

IF (WebCore_LINK_FLAGS)
    ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
    ADD_TARGET_PROPERTIES(${WebCoreTestSupport_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
ENDIF ()

IF (SHARED_CORE)

Lines 3-8 LIST(APPEND WebCore_INCLUDE_DIRECTORIES a/Source/WebCore/UseJSC.cmake_sec1
- a/Source/WebCore/UseJSC.cmake -1 / +30 lines
3	"${WEBCORE_DIR}/bridge/jsc"	3	"${WEBCORE_DIR}/bridge/jsc"
4	)	4	)
5		5
		6	LIST(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES
		7	"${WEBCORE_DIR}/testing/js"
		8	)
		9
6	LIST(APPEND WebCore_IDL_INCLUDES	10	LIST(APPEND WebCore_IDL_INCLUDES
7	bindings/js	11	bindings/js
8	)	12	)
Lines 164-169 LIST(APPEND WebCore_SOURCES a/Source/WebCore/UseJSC.cmake_sec2
164	bridge/jsc/BridgeJSC.cpp	168	bridge/jsc/BridgeJSC.cpp
165	)	169	)
166		170
		171	LIST(APPEND WebCoreTestSupport_SOURCES
		172	testing/js/JSInternalsCustom.cpp
		173	testing/js/WebCoreTestSupport.cpp
		174	)
		175
167	IF (ENABLE_BLOB)	176	IF (ENABLE_BLOB)
168	LIST(APPEND WebCore_SOURCES	177	LIST(APPEND WebCore_SOURCES
169	bindings/js/JSFileReaderCustom.cpp	178	bindings/js/JSFileReaderCustom.cpp
Lines 254-259 FOREACH (_include ${WebCore_IDL_INCLUDES}) a/Source/WebCore/UseJSC.cmake_sec3
254	LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})	263	LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
255	ENDFOREACH ()	264	ENDFOREACH ()
256		265
		266	FOREACH (_include ${WebCoreTestSupport_IDL_INCLUDES})
		267	LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
		268	ENDFOREACH ()
		269
257	SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1")	270	SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1")
258	FOREACH (_feature ${FEATURE_DEFINES})	271	FOREACH (_feature ${FEATURE_DEFINES})
259	SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}")	272	SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}")
Lines 263-273 ENDFOREACH () a/Source/WebCore/UseJSC.cmake_sec4
263	FOREACH (_idl ${WebCore_IDL_FILES})	276	FOREACH (_idl ${WebCore_IDL_FILES})
264	SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")	277	SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
265	ENDFOREACH ()	278	ENDFOREACH ()
		279
		280	FOREACH (_idl ${WebCoreTestSupport_IDL_FILES})
		281	SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
		282	ENDFOREACH ()
		283
266	FILE(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})	284	FILE(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
267		285
268	ADD_CUSTOM_COMMAND(	286	ADD_CUSTOM_COMMAND(
269	OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}	287	OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}
270	DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE}	288	DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
271	COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}	289	COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}
272	VERBATIM)	290	VERBATIM)
273		291
Lines 281-283 FOREACH (_file ${WebCore_IDL_FILES}) a/Source/WebCore/UseJSC.cmake_sec5
281	VERBATIM)	299	VERBATIM)
282	LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)	300	LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
283	ENDFOREACH ()	301	ENDFOREACH ()
		302
		303	FOREACH (_file ${WebCoreTestSupport_IDL_FILES})
		304	GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
		305	ADD_CUSTOM_COMMAND(
		306	OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.h
		307	MAIN_DEPENDENCY ${_file}
		308	DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm ${SUPPLEMENTAL_DEPENDENCY_FILE}
		309	COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator JS ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_WEBCORE_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WEBCORE_DIR}/${_file}
		310	VERBATIM)
		311	LIST(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
		312	ENDFOREACH ()

Lines 8-13 LIST(APPEND WebCore_INCLUDE_DIRECTORIES a/Source/WebCore/UseV8.cmake_sec1
- a/Source/WebCore/UseV8.cmake -1 / +30 lines
8	"${JAVASCRIPTCORE_DIR}/runtime"	8	"${JAVASCRIPTCORE_DIR}/runtime"
9	)	9	)
10		10
		11	LIST(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES
		12	"${WEBCORE_DIR}/testing/v8"
		13	)
		14
11	LIST(APPEND WebCore_IDL_INCLUDES	15	LIST(APPEND WebCore_IDL_INCLUDES
12	bindings/v8	16	bindings/v8
13	)	17	)
Lines 160-165 LIST(APPEND WebCore_SOURCES a/Source/WebCore/UseV8.cmake_sec2
160	bindings/v8/specialization/V8BindingState.cpp	164	bindings/v8/specialization/V8BindingState.cpp
161	)	165	)
162		166
		167	LIST(APPEND WebCoreTestSupport_SOURCES
		168	testing/v8/V8InternalsCustom.cpp
		169	testing/v8/WebCoreTestSupport.cpp
		170	)
		171
163	LIST(APPEND WebCore_SOURCES	172	LIST(APPEND WebCore_SOURCES
164	${JAVASCRIPTCORE_DIR}/yarr/YarrInterpreter.cpp	173	${JAVASCRIPTCORE_DIR}/yarr/YarrInterpreter.cpp
165	${JAVASCRIPTCORE_DIR}/yarr/YarrJIT.cpp	174	${JAVASCRIPTCORE_DIR}/yarr/YarrJIT.cpp
Lines 214-219 FOREACH (_include ${WebCore_IDL_INCLUDES}) a/Source/WebCore/UseV8.cmake_sec3
214	LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})	223	LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
215	ENDFOREACH ()	224	ENDFOREACH ()
216		225
		226	FOREACH (_include ${WebCoreTestSupport_IDL_INCLUDES})
		227	LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
		228	ENDFOREACH ()
		229
217	SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 V8_BINDING=1")	230	SET(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 V8_BINDING=1")
218	FOREACH (_feature ${FEATURE_DEFINES})	231	FOREACH (_feature ${FEATURE_DEFINES})
219	SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}")	232	SET(FEATURE_DEFINES_JAVASCRIPT "${FEATURE_DEFINES_JAVASCRIPT} ${_feature}")
Lines 249-259 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/V8ArrayBufferViewCust a/Source/WebCore/UseV8.cmake_sec4
249	FOREACH (_idl ${WebCore_IDL_FILES})	262	FOREACH (_idl ${WebCore_IDL_FILES})
250	SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")	263	SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
251	ENDFOREACH ()	264	ENDFOREACH ()
		265
		266	FOREACH (_idl ${WebCoreTestSupport_IDL_FILES})
		267	SET(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
		268	ENDFOREACH ()
		269
252	FILE(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})	270	FILE(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
253		271
254	ADD_CUSTOM_COMMAND(	272	ADD_CUSTOM_COMMAND(
255	OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}	273	OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}
256	DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${IDL_ATTRIBUTES_FILE}	274	DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES} ${IDL_ATTRIBUTES_FILE}
257	COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}	275	COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --idlAttributesFile ${IDL_ATTRIBUTES_FILE}
258	VERBATIM)	276	VERBATIM)
259		277
Lines 267-269 FOREACH (_file ${WebCore_IDL_FILES}) a/Source/WebCore/UseV8.cmake_sec5
267	VERBATIM)	285	VERBATIM)
268	LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp)	286	LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp)
269	ENDFOREACH ()	287	ENDFOREACH ()
		288
		289	FOREACH (_file ${WebCoreTestSupport_IDL_FILES})
		290	GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
		291	ADD_CUSTOM_COMMAND(
		292	OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.h
		293	MAIN_DEPENDENCY ${_file}
		294	DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorV8.pm ${SUPPLEMENTAL_DEPENDENCY_FILE}
		295	COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator V8 ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_WEBCORE_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WEBCORE_DIR}/${_file}
		296	VERBATIM)
		297	LIST(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/V8${_name}.cpp)
		298	ENDFOREACH ()



SET(WebCore_LIBRARY_NAME WebCore)
SET(WebKit_LIBRARY_NAME WebKit)
SET(WebKit2_LIBRARY_NAME WebKit2)
SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)

# -----------------------------------------------------------------------------
# Default library types


SET(WebKit_LIBRARY_TYPE SHARED)
SET(WebKit2_LIBRARY_TYPE SHARED)
SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)

# -----------------------------------------------------------------------------
# Port-specific options



2012-03-01  Kangil Han  <kangil.han@samsung.com>

        [CMake][DRT] Add WebCoreTestSupport.
        https://bugs.webkit.org/show_bug.cgi?id=79896

        Reviewed by NOBODY (OOPS!).

        Add WebCoreTestSupport library for DRT in CMake.
        We will use internals object by linking this library on DRT.

        * CMakeLists.txt:

2012-03-01  Ryosuke Niwa  <rniwa@webkit.org>

        Perf-o-matic: generate dashboard images for 30, 90, and 365 days

Return to Bug 79896

Lines 2289-2294 IF (ENABLE_VIBRATION) a/Source/WebCore/CMakeLists.txt_sec1
- a/Source/WebCore/CMakeLists.txt -3 / +28 lines
2289	)	2289	)
2290	ENDIF ()	2290	ENDIF ()
2291		2291
		2292	SET(WebCoreTestSupport_INCLUDE_DIRECTORIES
		2293	"${WebCore_INCLUDE_DIRECTORIES}"
		2294	"${WEBCORE_DIR}/testing"
		2295	)
		2296
		2297	SET(WebCoreTestSupport_IDL_INCLUDES
		2298	testing
		2299	)
		2300
		2301	SET(WebCoreTestSupport_IDL_FILES
		2302	testing/Internals.idl
		2303	testing/InternalSettings.idl
		2304	)
		2305
		2306	SET(WebCoreTestSupport_SOURCES
		2307	testing/Internals.cpp
		2308	testing/InternalSettings.cpp
		2309	)
		2310
2292	# Modules that the bindings generator scripts may use	2311	# Modules that the bindings generator scripts may use
2293	SET(SCRIPTS_RESOLVE_SUPPLEMENTAL	2312	SET(SCRIPTS_RESOLVE_SUPPLEMENTAL
2294	${WEBCORE_DIR}/bindings/scripts/IDLParser.pm	2313	${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
Lines 2497-2513 ADD_CUSTOM_COMMAND( a/Source/WebCore/CMakeLists.txt_sec2
2497	VERBATIM)	2516	VERBATIM)
2498	LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)	2517	LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
2499		2518
2500
2501
2502	WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})	2519	WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
		2520	WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
		2521
2503	ADD_DEFINITIONS(-DBUILDING_WebCore)	2522	ADD_DEFINITIONS(-DBUILDING_WebCore)
2504	INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})	2523	INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
		2524
2505	ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})	2525	ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
		2526	ADD_LIBRARY(${WebCoreTestSupport_LIBRARY_NAME} ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
		2527
2506	ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME})	2528	ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME})
		2529	ADD_DEPENDENCIES(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
		2530
2507	TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})	2531	TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
2508		2532
2509	IF (WebCore_LINK_FLAGS)	2533	IF (WebCore_LINK_FLAGS)
2510	ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")	2534	ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
		2535	ADD_TARGET_PROPERTIES(${WebCoreTestSupport_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
2511	ENDIF ()	2536	ENDIF ()
2512		2537
2513	IF (SHARED_CORE)	2538	IF (SHARED_CORE)

Lines 116-121 SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore) a/CMakeLists.txt_sec1
- a/CMakeLists.txt +2 lines
116	SET(WebCore_LIBRARY_NAME WebCore)	116	SET(WebCore_LIBRARY_NAME WebCore)
117	SET(WebKit_LIBRARY_NAME WebKit)	117	SET(WebKit_LIBRARY_NAME WebKit)
118	SET(WebKit2_LIBRARY_NAME WebKit2)	118	SET(WebKit2_LIBRARY_NAME WebKit2)
		119	SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
119		120
120	# -----------------------------------------------------------------------------	121	# -----------------------------------------------------------------------------
121	# Default library types	122	# Default library types
Lines 132-137 ENDIF () a/CMakeLists.txt_sec2
132		133
133	SET(WebKit_LIBRARY_TYPE SHARED)	134	SET(WebKit_LIBRARY_TYPE SHARED)
134	SET(WebKit2_LIBRARY_TYPE SHARED)	135	SET(WebKit2_LIBRARY_TYPE SHARED)
		136	SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
135		137
136	# -----------------------------------------------------------------------------	138	# -----------------------------------------------------------------------------
137	# Port-specific options	139	# Port-specific options

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +14 lines
		1	2012-03-01 Kangil Han <kangil.han@samsung.com>
		2
		3	[CMake][DRT] Add WebCoreTestSupport.
		4	https://bugs.webkit.org/show_bug.cgi?id=79896
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Add WebCoreTestSupport library for DRT in CMake.
		9	We will use internals object by linking this library on DRT.
		10
		11	* CMakeLists.txt:
		12	* UseJSC.cmake:
		13	* UseV8.cmake:
		14
1	2012-03-01 Luke Macpherson <macpherson@chromium.org>	15	2012-03-01 Luke Macpherson <macpherson@chromium.org>
2		16
3	Handle CSSPropertyWebkitBorderFit in CSSStyleApplyProperty.	17	Handle CSSPropertyWebkitBorderFit in CSSStyleApplyProperty.

Lines 1-3 a/ChangeLog_sec1
- a/ChangeLog +12 lines
		1	2012-03-01 Kangil Han <kangil.han@samsung.com>
		2
		3	[CMake][DRT] Add WebCoreTestSupport.
		4	https://bugs.webkit.org/show_bug.cgi?id=79896
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Add WebCoreTestSupport library for DRT in CMake.
		9	We will use internals object by linking this library on DRT.
		10
		11	* CMakeLists.txt:
		12
1	2012-03-01 Ryosuke Niwa <rniwa@webkit.org>	13	2012-03-01 Ryosuke Niwa <rniwa@webkit.org>
2		14
3	Perf-o-matic: generate dashboard images for 30, 90, and 365 days	15	Perf-o-matic: generate dashboard images for 30, 90, and 365 days