Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 450331808bfe11b1472c213a8cb311190355c2de )

Changes in WebKit since the last update:

++ b/WebCore/ChangeLog
2009-02-04  Simon Hausmann  <simon.hausmann@nokia.com>

        Unreviewed Qt build fix.

        Changed ASSERT(image) to ASSERT(!image.isNull()).

        * platform/graphics/qt/ImageBufferQt.cpp:
        (WebCore::ImageBuffer::getImageData):

++ b/WebKit/qt/ChangeLog
2009-03-07  Adam Treat  <adam.treat@torchmobile.com>

        Reviewed by Cameron Zwarich.

        These methods are clearly returning the wrong values as the two were
        returning swapped information.

        * Api/qwebpage.cpp:
        (QWebPage::totalBytes):
        (QWebPage::bytesReceived):

1 files changed, 2 insertions, 2 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index de373836e1..e17306dd7b 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -2517,7 +2517,7 @@ void QWebPagePrivate::_q_onLoadProgressChanged(int) {
     \sa bytesReceived()
 */
 quint64 QWebPage::totalBytes() const {
-    return d->m_bytesReceived;
+    return d->m_totalBytes;
 }
 
 
@@ -2527,7 +2527,7 @@ quint64 QWebPage::totalBytes() const {
     \sa totalBytes()
 */
 quint64 QWebPage::bytesReceived() const {
-    return d->m_totalBytes;
+    return d->m_bytesReceived;
 }
 
 /*!