Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e

1 files changed, 17 insertions, 4 deletions

diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index a4d4a60..e44dfd4 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -31,7 +31,7 @@ LIST(APPEND WebCore_SOURCES
   platform/efl/FileChooserEfl.cpp
   platform/efl/FileSystemEfl.cpp
   platform/efl/KURLEfl.cpp
-  platform/efl/Language.cpp
+  platform/efl/LanguageEfl.cpp
   platform/efl/LocalizedStringsEfl.cpp
   platform/efl/LoggingEfl.cpp
   platform/efl/MIMETypeRegistryEfl.cpp
@@ -56,10 +56,10 @@ LIST(APPEND WebCore_SOURCES
   platform/graphics/efl/IconEfl.cpp
   platform/graphics/efl/ImageEfl.cpp
   platform/graphics/efl/IntPointEfl.cpp
+  platform/graphics/efl/IntRectEfl.cpp
   platform/posix/FileSystemPOSIX.cpp
   platform/text/efl/TextBreakIteratorInternalICUEfl.cpp
   plugins/PluginDataNone.cpp
-  plugins/PluginViewNone.cpp
 )
 
 IF (WTF_PLATFORM_CAIRO)
@@ -68,19 +68,20 @@ IF (WTF_PLATFORM_CAIRO)
   )
   LIST(APPEND WebCore_SOURCES
     platform/graphics/cairo/CairoUtilities.cpp
+    platform/graphics/cairo/ContextShadowCairo.cpp
     platform/graphics/cairo/FontCacheFreeType.cpp
     platform/graphics/cairo/FontCairo.cpp
     platform/graphics/cairo/FontCustomPlatformData.cpp
     platform/graphics/cairo/FontPlatformDataFreeType.cpp
-    platform/graphics/cairo/OwnPtrCairo.cpp
-    platform/graphics/cairo/PlatformRefPtrCairo.cpp
     platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp
     platform/graphics/cairo/GradientCairo.cpp
     platform/graphics/cairo/GraphicsContextCairo.cpp
     platform/graphics/cairo/ImageBufferCairo.cpp
     platform/graphics/cairo/ImageCairo.cpp
+    platform/graphics/cairo/OwnPtrCairo.cpp
     platform/graphics/cairo/PathCairo.cpp
     platform/graphics/cairo/PatternCairo.cpp
+    platform/graphics/cairo/PlatformRefPtrCairo.cpp
     platform/graphics/cairo/SimpleFontDataCairo.cpp
     platform/graphics/cairo/TransformationMatrixCairo.cpp
 
@@ -91,6 +92,8 @@ ENDIF ()
 IF (WTF_USE_SOUP)
   LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/network/soup"
+    "${WEBCORE_DIR}/platform/network/soup/cache"
+    "${WEBCORE_DIR}/platform/network/soup/cache/webkit"
   )
   LIST(APPEND WebCore_SOURCES
     platform/network/soup/CookieJarSoup.cpp
@@ -99,6 +102,16 @@ IF (WTF_USE_SOUP)
     platform/network/soup/ResourceRequestSoup.cpp
     platform/network/soup/ResourceResponseSoup.cpp
     platform/network/soup/SocketStreamHandleSoup.cpp
+
+    platform/network/soup/cache/soup-directory-input-stream.c
+    platform/network/soup/cache/soup-http-input-stream.c
+    platform/network/soup/cache/soup-request-data.c
+    platform/network/soup/cache/soup-request-file.c
+    platform/network/soup/cache/soup-request-http.c
+    platform/network/soup/cache/soup-request.c
+    platform/network/soup/cache/soup-requester.c
+
+    platform/network/soup/cache/webkit/soup-cache.c
   )
 ENDIF ()