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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9c14a1d77b700bbad5612997ef49bf22df583831
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 2 14:48:07 2010 +0000

    2010-08-02  Markus Goetz  <Markus.Goetz at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Do not link to SharedBufferCF.cpp
            The Qt port does not need this file.
            We plan to implement the platformData()
            for SharedBuffer at some point soon.
            https://bugs.webkit.org/show_bug.cgi?id=43242
    
            * WebCore.pro:
            * platform/SharedBuffer.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3924892..a80d2ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-02  Markus Goetz  <Markus.Goetz at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Do not link to SharedBufferCF.cpp
+        The Qt port does not need this file.
+        We plan to implement the platformData()
+        for SharedBuffer at some point soon.
+        https://bugs.webkit.org/show_bug.cgi?id=43242
+
+        * WebCore.pro:
+        * platform/SharedBuffer.cpp:
+
 2010-08-02  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 25b194f..03af4df 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2274,8 +2274,7 @@ maemo5 {
     mac {
         SOURCES += \
             platform/text/cf/StringCF.cpp \
-            platform/text/cf/StringImplCF.cpp \
-            platform/cf/SharedBufferCF.cpp
+            platform/text/cf/StringImplCF.cpp
         LIBS_PRIVATE += -framework Carbon -framework AppKit
     }
 
diff --git a/WebCore/platform/SharedBuffer.cpp b/WebCore/platform/SharedBuffer.cpp
index 6cf1131..35a7b7c 100644
--- a/WebCore/platform/SharedBuffer.cpp
+++ b/WebCore/platform/SharedBuffer.cpp
@@ -239,7 +239,7 @@ unsigned SharedBuffer::getSomeData(const char*& someData, unsigned position) con
     return segment == segments - 1 ? segmentedSize - position : segmentSize - positionInSegment;
 }
 
-#if !PLATFORM(CF)
+#if !PLATFORM(CF) || PLATFORM(QT)
 
 inline void SharedBuffer::clearPlatformData()
 {

-- 
WebKit Debian packaging