[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[leandro at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 89598bb89bd2d0cd9d577de3cc9331e5003f45cc
Author: leandro at webkit.org <leandro at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 22:46:36 2010 +0000

    2010-10-13  Leandro Pereira  <leandro at profusion.mobi>
    
            [EFL] Unreviewed. Build fix.
    
            * WebCoreSupport/FrameLoaderClientEfl.h: Use String instead of
            WebCore::String.
    2010-10-13  Leandro Pereira  <leandro at profusion.mobi>
    
            [EFL] Unreviewed. Build fix.
    
            * CMakeLists.txt: Add ContextShadow.cpp.
            * CMakeListsEfl.txt: Add ContextShadowCairo.cpp.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 1a5bc33..13dca94 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1261,6 +1261,7 @@ SET(WebCore_SOURCES
 
     platform/graphics/BitmapImage.cpp
     platform/graphics/Color.cpp
+    platform/graphics/ContextShadow.cpp
     platform/graphics/FloatPoint.cpp
     platform/graphics/FloatPoint3D.cpp
     platform/graphics/FloatQuad.cpp
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index f34841f..2131c23 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -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
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 07b3884..7838fb7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-13  Leandro Pereira  <leandro at profusion.mobi>
+
+        [EFL] Unreviewed. Build fix.
+
+        * CMakeLists.txt: Add ContextShadow.cpp.
+        * CMakeListsEfl.txt: Add ContextShadowCairo.cpp.
+
 2010-10-13  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Holger Freyther.
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 59d761a..48b17a3 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-13  Leandro Pereira  <leandro at profusion.mobi>
+
+        [EFL] Unreviewed. Build fix.
+
+        * WebCoreSupport/FrameLoaderClientEfl.h: Use String instead of
+        WebCore::String.
+
 2010-10-13  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
index db1285d..1b880e6 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
@@ -91,7 +91,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient {
     virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long  identifier);
     virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long  identifier, const ResourceError&);
     virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length);
-    virtual void dispatchDidLoadResourceByXMLHttpRequest(unsigned long identifier, const WebCore::String& sourceString);
+    virtual void dispatchDidLoadResourceByXMLHttpRequest(unsigned long identifier, const String& sourceString);
 
     virtual void dispatchDidHandleOnloadEvents();
     virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();

-- 
WebKit Debian packaging