[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[yong.li at torchmobile.com]

The following commit has been merged in the webkit-1.1 branch:
commit fb5b5dbe2560d370e6824c6f5e15e62ceafdc8fb
Author: yong.li at torchmobile.com <yong.li at torchmobile.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 16:24:40 2010 +0000

    2010-01-05  Yong Li  <yong.li at torchmobile.com>
    
            Reviewed by Darin Adler.
    
            Fix an obvious bug and build errors in previous commit (r52795)
            https://bugs.webkit.org/show_bug.cgi?id=33178
    
            * platform/SharedBuffer.h:
            (WebCore::SharedBuffer::isEmpty):
            * platform/cf/SharedBufferCF.cpp:
            (WebCore::SharedBuffer::maybeTransferPlatformData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe3fe19..bf709c6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-05  Yong Li  <yong.li at torchmobile.com>
+
+        Reviewed by Darin Adler.
+
+        Fix an obvious bug and build errors in previous commit (r52795)
+        https://bugs.webkit.org/show_bug.cgi?id=33178
+
+        * platform/SharedBuffer.h:
+        (WebCore::SharedBuffer::isEmpty):
+        * platform/cf/SharedBufferCF.cpp:
+        (WebCore::SharedBuffer::maybeTransferPlatformData):
+
 2010-01-04  Yong Li  <yoli at rim.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/SharedBuffer.cpp b/WebCore/platform/SharedBuffer.cpp
index 3179627..51a400f 100644
--- a/WebCore/platform/SharedBuffer.cpp
+++ b/WebCore/platform/SharedBuffer.cpp
@@ -137,7 +137,7 @@ void SharedBuffer::append(const char* data, int length)
         segment = m_segments.last() + positionInSegment;
 
     unsigned segmentFreeSpace = segmentSize - positionInSegment;
-    unsigned bytesToCopy = length < segmentFreeSpace ? length : segmentFreeSpace;
+    unsigned bytesToCopy = static_cast<unsigned>(length) < segmentFreeSpace ? static_cast<unsigned>(length) : segmentFreeSpace;
 
     for (;;) {
         memcpy(segment, data, bytesToCopy);
diff --git a/WebCore/platform/SharedBuffer.h b/WebCore/platform/SharedBuffer.h
index 750a59a..d81a2f7 100644
--- a/WebCore/platform/SharedBuffer.h
+++ b/WebCore/platform/SharedBuffer.h
@@ -86,7 +86,7 @@ public:
     // for better performance.
     const Vector<char>& buffer() const;
 
-    bool isEmpty() const { return size(); }
+    bool isEmpty() const { return !size(); }
 
     void append(const char*, int);
     void clear();
diff --git a/WebCore/platform/cf/SharedBufferCF.cpp b/WebCore/platform/cf/SharedBufferCF.cpp
index c96bfcc..da166c9 100644
--- a/WebCore/platform/cf/SharedBufferCF.cpp
+++ b/WebCore/platform/cf/SharedBufferCF.cpp
@@ -76,7 +76,7 @@ void SharedBuffer::maybeTransferPlatformData()
     if (!m_cfData)
         return;
     
-    ASSERT(m_size == 0);
+    ASSERT(!m_size);
         
     append((const char*)CFDataGetBytePtr(m_cfData.get()), CFDataGetLength(m_cfData.get()));
         

-- 
WebKit Debian packaging