Attachment #120794 for bug #75345

View Details Raw Unified Return to Bug 75345

| Differences between



2011-12-30  Kentaro Hara  <haraken@chromium.org>

        Enable the [Supplemental] IDL on Efl
        https://bugs.webkit.org/show_bug.cgi?id=75345

        Reviewed by NOBODY (OOPS!).

        This patch enables the [Supplemental] IDL on Efl by changing the build
        flow of Efl as follows.

        - Previous build flow:
            foreach $idl (all IDL files) {
                generate-bindings.pl depends on $idl;
                generate-bindings.pl reads $idl;
                generate-bindings.pl generates .h and .cpp files for $idl;
            }

        - New build flow (See the discussions in bug 72138 for more details):
            resolve-supplemental.pl depends on all IDL files;
            resolve-supplemental.pl reads all IDL files;
            resolve-supplemental.pl resolves the dependency of [Supplemental=XXXX];
            resolve-supplemental.pl outputs supplemental_dependency.tmp;
            foreach $idl (all IDL files) {
                generate-bindings.pl depends on $idl and supplemental_dependency.tmp;
                generate-bindings.pl reads $idl;
                generate-bindings.pl reads supplemental_dependency.tmp;
                generate-bindings.pl generates .h and .cpp files for $idl,
                    including all attributes in the IDL files that are implementing $idl;
            }

        Tests: Confirm that build succeeds.
               http/tests/websocket/tests/*

        * CMakeLists.txt:
        * UseJSC.cmake: Described the above build.

2011-12-29  Julien Chaffraix  <jchaffraix@webkit.org>

        REGRESSION (r93614): Safari Reader doesn't repaint correctly when scrolling



    webaudio/AudioSourceNode.idl
    webaudio/ConvolverNode.idl
    webaudio/DelayNode.idl
    webaudio/DOMWindowWebAudio.idl
    webaudio/HighPass2FilterNode.idl
    webaudio/JavaScriptAudioNode.idl
    webaudio/LowPass2FilterNode.idl
    webaudio/RealtimeAnalyserNode.idl

    websockets/CloseEvent.idl
    websockets/DOMWindowWebSocket.idl

    xml/DOMParser.idl
    xml/XMLHttpRequest.idl

ENDIF ()

# Modules that the bindings generator scripts may use
SET(SCRIPTS_RESOLVE_SUPPLEMENTAL
    ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
)
SET(SCRIPTS_BINDINGS
    ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
    ${WEBCORE_DIR}/bindings/scripts/IDLStructure.pm
    ${WEBCORE_DIR}/bindings/scripts/InFilesParser.pm
    ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
)
SET(IDL_FILES_TMP ${DERIVED_SOURCES_WEBCORE_DIR}/idl_files.tmp)
SET(SUPPLEMENTAL_DEPENDENCY_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/supplemental_dependency.tmp)

INCLUDE(${WEBCORE_DIR}/UseJSC.cmake)




ENDFOREACH ()

# Create JavaScript C++ code given an IDL input
SET(IDL_FILES_LIST "")
FOREACH (_idl ${WebCore_IDL_FILES})
    SET(IDL_FILES_LIST "${IDL_FILES_LIST} ${WEBCORE_DIR}/${_idl}")
ENDFOREACH ()

ADD_CUSTOM_COMMAND(
    OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}
    MAIN_DEPENDENCY ${SCRIPTS_RESOLVE_SUPPLEMENTAL} ${WebCore_IDL_FILES}
    DEPENDS ${WEBCORE_DIR}/bindings/scripts/resolve-supplemental.pl ${SCRIPTS_RESOLVE_SUPPLEMENTAL} ${WebCore_IDL_FILES}
    COMMAND echo ${IDL_FILES_LIST} | tr " " \\n > ${IDL_FILES_TMP}
    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/resolve-supplemental.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE}
    COMMAND cat ${IDL_FILES_TMP}
    COMMAND cat ${SUPPLEMENTAL_DEPENDENCY_FILE}
    VERBATIM)

FOREACH (_file ${WebCore_IDL_FILES})
    GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
    ADD_CUSTOM_COMMAND(
        OUTPUT  ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.h
        MAIN_DEPENDENCY ${_file} ${SUPPLEMENTAL_DEPENDENCY_FILE}
        DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm ${_file} ${SUPPLEMENTAL_DEPENDENCY_FILE}
        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}
        VERBATIM)
    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
ENDFOREACH ()

Return to Bug 75345

Lines 370-381 SET(WebCore_IDL_FILES a/Source/WebCore/CMakeLists.txt_sec1
- a/Source/WebCore/CMakeLists.txt +7 lines
370	webaudio/AudioSourceNode.idl	370	webaudio/AudioSourceNode.idl
371	webaudio/ConvolverNode.idl	371	webaudio/ConvolverNode.idl
372	webaudio/DelayNode.idl	372	webaudio/DelayNode.idl
		373	webaudio/DOMWindowWebAudio.idl
373	webaudio/HighPass2FilterNode.idl	374	webaudio/HighPass2FilterNode.idl
374	webaudio/JavaScriptAudioNode.idl	375	webaudio/JavaScriptAudioNode.idl
375	webaudio/LowPass2FilterNode.idl	376	webaudio/LowPass2FilterNode.idl
376	webaudio/RealtimeAnalyserNode.idl	377	webaudio/RealtimeAnalyserNode.idl
377		378
378	websockets/CloseEvent.idl	379	websockets/CloseEvent.idl
		380	websockets/DOMWindowWebSocket.idl
379		381
380	xml/DOMParser.idl	382	xml/DOMParser.idl
381	xml/XMLHttpRequest.idl	383	xml/XMLHttpRequest.idl
Lines 2218-2229 IF (ENABLE_REQUEST_ANIMATION_FRAME) a/Source/WebCore/CMakeLists.txt_sec2
2218	ENDIF ()	2220	ENDIF ()
2219		2221
2220	# Modules that the bindings generator scripts may use	2222	# Modules that the bindings generator scripts may use
		2223	SET(SCRIPTS_RESOLVE_SUPPLEMENTAL
		2224	${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
		2225	)
2221	SET(SCRIPTS_BINDINGS	2226	SET(SCRIPTS_BINDINGS
2222	${WEBCORE_DIR}/bindings/scripts/IDLParser.pm	2227	${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
2223	${WEBCORE_DIR}/bindings/scripts/IDLStructure.pm	2228	${WEBCORE_DIR}/bindings/scripts/IDLStructure.pm
2224	${WEBCORE_DIR}/bindings/scripts/InFilesParser.pm	2229	${WEBCORE_DIR}/bindings/scripts/InFilesParser.pm
2225	${WEBCORE_DIR}/bindings/scripts/preprocessor.pm	2230	${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
2226	)	2231	)
		2232	SET(IDL_FILES_TMP ${DERIVED_SOURCES_WEBCORE_DIR}/idl_files.tmp)
		2233	SET(SUPPLEMENTAL_DEPENDENCY_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/supplemental_dependency.tmp)
2227		2234
2228	INCLUDE(${WEBCORE_DIR}/UseJSC.cmake)	2235	INCLUDE(${WEBCORE_DIR}/UseJSC.cmake)
2229		2236

Lines 258-270 FOREACH (_feature ${FEATURE_DEFINES}) a/Source/WebCore/UseJSC.cmake_sec1
- a/Source/WebCore/UseJSC.cmake -3 / +18 lines
258	ENDFOREACH ()	258	ENDFOREACH ()
259		259
260	# Create JavaScript C++ code given an IDL input	260	# Create JavaScript C++ code given an IDL input
		261	SET(IDL_FILES_LIST "")
		262	FOREACH (_idl ${WebCore_IDL_FILES})
		263	SET(IDL_FILES_LIST "${IDL_FILES_LIST} ${WEBCORE_DIR}/${_idl}")
		264	ENDFOREACH ()
		265
		266	ADD_CUSTOM_COMMAND(
		267	OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE}
		268	MAIN_DEPENDENCY ${SCRIPTS_RESOLVE_SUPPLEMENTAL} ${WebCore_IDL_FILES}
		269	DEPENDS ${WEBCORE_DIR}/bindings/scripts/resolve-supplemental.pl ${SCRIPTS_RESOLVE_SUPPLEMENTAL} ${WebCore_IDL_FILES}
		270	COMMAND echo ${IDL_FILES_LIST} \| tr " " \\n > ${IDL_FILES_TMP}
		271	COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/resolve-supplemental.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE}
		272	COMMAND cat ${IDL_FILES_TMP}
		273	COMMAND cat ${SUPPLEMENTAL_DEPENDENCY_FILE}
		274	VERBATIM)
		275
261	FOREACH (_file ${WebCore_IDL_FILES})	276	FOREACH (_file ${WebCore_IDL_FILES})
262	GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)	277	GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
263	ADD_CUSTOM_COMMAND(	278	ADD_CUSTOM_COMMAND(
264	OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.h	279	OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.h
265	MAIN_DEPENDENCY ${_file}	280	MAIN_DEPENDENCY ${_file} ${SUPPLEMENTAL_DEPENDENCY_FILE}
266	DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm ${_file}	281	DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGeneratorJS.pm ${_file} ${SUPPLEMENTAL_DEPENDENCY_FILE}
267	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}" ${WEBCORE_DIR}/${_file}	282	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}
268	VERBATIM)	283	VERBATIM)
269	LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)	284	LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_name}.cpp)
270	ENDFOREACH ()	285	ENDFOREACH ()

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +36 lines
		1	2011-12-30 Kentaro Hara <haraken@chromium.org>
		2
		3	Enable the [Supplemental] IDL on Efl
		4	https://bugs.webkit.org/show_bug.cgi?id=75345
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	This patch enables the [Supplemental] IDL on Efl by changing the build
		9	flow of Efl as follows.
		10
		11	- Previous build flow:
		12	foreach $idl (all IDL files) {
		13	generate-bindings.pl depends on $idl;
		14	generate-bindings.pl reads $idl;
		15	generate-bindings.pl generates .h and .cpp files for $idl;
		16	}
		17
		18	- New build flow (See the discussions in bug 72138 for more details):
		19	resolve-supplemental.pl depends on all IDL files;
		20	resolve-supplemental.pl reads all IDL files;
		21	resolve-supplemental.pl resolves the dependency of [Supplemental=XXXX];
		22	resolve-supplemental.pl outputs supplemental_dependency.tmp;
		23	foreach $idl (all IDL files) {
		24	generate-bindings.pl depends on $idl and supplemental_dependency.tmp;
		25	generate-bindings.pl reads $idl;
		26	generate-bindings.pl reads supplemental_dependency.tmp;
		27	generate-bindings.pl generates .h and .cpp files for $idl,
		28	including all attributes in the IDL files that are implementing $idl;
		29	}
		30
		31	Tests: Confirm that build succeeds.
		32	http/tests/websocket/tests/*
		33
		34	* CMakeLists.txt:
		35	* UseJSC.cmake: Described the above build.
		36
1	2011-12-29 Julien Chaffraix <jchaffraix@webkit.org>	37	2011-12-29 Julien Chaffraix <jchaffraix@webkit.org>
2		38
3	REGRESSION (r93614): Safari Reader doesn't repaint correctly when scrolling	39	REGRESSION (r93614): Safari Reader doesn't repaint correctly when scrolling