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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 7a2e6807937f05d7c1b47db4e6728c0d26ea9c99
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 21:27:37 2010 +0000

    2010-10-12  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Nate Chapin (in person).
    
            Fix chromium compile.
    
            * src/WebPageSerializerImpl.cpp:
            (WebKit::WebPageSerializerImpl::WebPageSerializerImpl):
            (WebKit::WebPageSerializerImpl::serialize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 8b2deef..3f1b4a8 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-12  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Nate Chapin (in person).
+
+        Fix chromium compile.
+
+        * src/WebPageSerializerImpl.cpp:
+        (WebKit::WebPageSerializerImpl::WebPageSerializerImpl):
+        (WebKit::WebPageSerializerImpl::serialize):
+
 2010-10-12  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/WebKit/chromium/src/WebPageSerializerImpl.cpp b/WebKit/chromium/src/WebPageSerializerImpl.cpp
index dd6f858..4b09f0c 100644
--- a/WebKit/chromium/src/WebPageSerializerImpl.cpp
+++ b/WebKit/chromium/src/WebPageSerializerImpl.cpp
@@ -454,7 +454,7 @@ WebPageSerializerImpl::WebPageSerializerImpl(WebFrame* frame,
         m_localLinks.set(url.string(), localPaths[i]);
     }
 
-    ASSERT(!m_dataBuffer.length());
+    ASSERT(m_dataBuffer.isEmpty());
 }
 
 void WebPageSerializerImpl::collectTargetFrames()
@@ -534,7 +534,7 @@ bool WebPageSerializerImpl::serialize()
 
     // We have done call frames, so we send message to embedder to tell it that
     // frames are finished serializing.
-    ASSERT(!m_dataBuffer.length());
+    ASSERT(m_dataBuffer.isEmpty());
     m_client->didSerializeDataForFrame(KURL(),
                                        WebCString("", 0),
                                        WebPageSerializerClient::AllFramesAreFinished);

-- 
WebKit Debian packaging