Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

5 files changed, 17 insertions, 18 deletions

diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index be465fa..ac0811d 100644
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -5,7 +5,7 @@ SET(WTF_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}"
     "${JAVASCRIPTCORE_DIR}/wtf"
     "${JAVASCRIPTCORE_DIR}/wtf/unicode"
-    "${DERIVED_SOURCES_DIR}"
+    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
 )
 
 IF (WTF_OS_UNIX)
diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index 6b0b080..338c393 100644
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -46,8 +46,8 @@ SET(WTF_USE_ICU_UNICODE 1)
 ADD_DEFINITIONS(-DWTF_USE_ICU_UNICODE=1)
 LIST(APPEND WTF_INCLUDE_DIRECTORIES ${ICU_INCLUDE_DIRS})
 
-SET(WTF_PLATFORM_CAIRO 1)
-ADD_DEFINITIONS(-DWTF_PLATFORM_CAIRO=1)
+SET(WTF_USE_CAIRO 1)
+ADD_DEFINITIONS(-DWTF_USE_CAIRO=1)
 
 SET(JSC_EXECUTABLE_NAME jsc_efl)
 SET(WTF_LIBRARY_NAME wtf_efl)
diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake
index 74e7fb8..6a58e0a 100644
--- a/Source/cmake/WebKitFS.cmake
+++ b/Source/cmake/WebKitFS.cmake
@@ -1,5 +1,4 @@
-SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
-
-FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR})
+FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
+FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs)
diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake
index 58c506b..5bf65a3 100644
--- a/Source/cmake/WebKitHelpers.cmake
+++ b/Source/cmake/WebKitHelpers.cmake
@@ -65,12 +65,12 @@ ENDMACRO()
 
 
 # Append the given dependencies to the source file
-# This one consider the given dependencies are in ${DERIVED_SOURCES_DIR}
+# This one consider the given dependencies are in ${DERIVED_SOURCES_WEBCORE_DIR}
 # and prepends this to every member of dependencies list
-MACRO(ADD_SOURCE_DERIVED_DEPENDENCIES _source _deps)
+MACRO(ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES _source _deps)
   SET(_tmp "")
   FOREACH (f ${_deps})
-    LIST(APPEND _tmp "${DERIVED_SOURCES_DIR}/${f}")
+    LIST(APPEND _tmp "${DERIVED_SOURCES_WEBCORE_DIR}/${f}")
   ENDFOREACH ()
 
   ADD_SOURCE_DEPENDENCIES(${_source} ${_tmp})
diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
index 75a87a6..7bcb3c8 100644
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
@@ -27,7 +27,7 @@ ENDMACRO ()
 MACRO (GENERATE_DOM_NAMES _namespace _attrs)
     SET(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_names.pl)
     SET(_arguments  --attrs ${_attrs})
-    SET(_outputfiles ${DERIVED_SOURCES_DIR}/${_namespace}Names.cpp ${DERIVED_SOURCES_DIR}/${_namespace}Names.h)
+    SET(_outputfiles ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}Names.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}Names.h)
     SET(_extradef)
     SET(_tags)
 
@@ -41,7 +41,7 @@ MACRO (GENERATE_DOM_NAMES _namespace _attrs)
 
     IF (_tags)
         SET(_arguments "${_arguments}" --tags ${_tags} --factory --wrapperFactory)
-        SET(_outputfiles "${_outputfiles}" ${DERIVED_SOURCES_DIR}/${_namespace}ElementFactory.cpp ${DERIVED_SOURCES_DIR}/${_namespace}ElementFactory.h ${DERIVED_SOURCES_DIR}/JS${_namespace}ElementWrapperFactory.cpp ${DERIVED_SOURCES_DIR}/JS${_namespace}ElementWrapperFactory.h)
+        SET(_outputfiles "${_outputfiles}" ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.h ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.h)
     ENDIF ()
 
     IF (_extradef)
@@ -51,7 +51,7 @@ MACRO (GENERATE_DOM_NAMES _namespace _attrs)
     ADD_CUSTOM_COMMAND(
         OUTPUT  ${_outputfiles}
         DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
-        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_DIR} ${_arguments} ${_additionArguments}
+        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
         VERBATIM)
 ENDMACRO ()
 
@@ -88,15 +88,15 @@ MACRO(MAKE_HASH_TOOLS _source)
     GET_FILENAME_COMPONENT(_name ${_source} NAME_WE)
 
     IF (${_source} STREQUAL "DocTypeStrings")
-        SET(_hash_tools_h "${DERIVED_SOURCES_DIR}/HashTools.h")
+        SET(_hash_tools_h "${DERIVED_SOURCES_WEBCORE_DIR}/HashTools.h")
     ELSE ()
         SET(_hash_tools_h "")
     ENDIF ()
 
     ADD_CUSTOM_COMMAND(
-        OUTPUT ${DERIVED_SOURCES_DIR}/${_name}.cpp ${_hash_tools_h}
+        OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_name}.cpp ${_hash_tools_h}
         MAIN_DEPENDENCY ${_source}.gperf 
-        COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_DIR} ${_source}.gperf
+        COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_WEBCORE_DIR} ${_source}.gperf
         VERBATIM)
 
     UNSET(_name)
@@ -108,13 +108,13 @@ MACRO (WEBKIT_WRAP_SOURCELIST)
         GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)
         GET_FILENAME_COMPONENT(_path ${_file} PATH)
 
-		IF (NOT _file MATCHES "${DERIVED_SOURCES_DIR}")
+		IF (NOT _file MATCHES "${DERIVED_SOURCES_WEBCORE_DIR}")
             STRING(REGEX REPLACE "/" "\\\\\\\\" _sourcegroup "${_path}")
             SOURCE_GROUP("${_sourcegroup}" FILES ${_file})
 		ENDIF ()
 
         IF (WTF_PLATFORM_QT)
-            SET(_moc_filename ${DERIVED_SOURCES_DIR}/${_basename}.moc)
+            SET(_moc_filename ${DERIVED_SOURCES_WEBCORE_DIR}/${_basename}.moc)
 
             FILE(READ ${_file} _contents)
 
@@ -126,5 +126,5 @@ MACRO (WEBKIT_WRAP_SOURCELIST)
         ENDIF ()
     ENDFOREACH ()
 
-    SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_DIR}")
+    SOURCE_GROUP("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_WEBCORE_DIR}")
 ENDMACRO ()