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

[hans at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8ed9dfbab7730844e9e1b29d119359bc5e8c3586
Author: hans at chromium.org <hans at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 14:55:26 2010 +0000

    2010-12-16  Hans Wennborg  <hans at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            IndexedDB: Fix IDBDatabaseError code offset bug
            https://bugs.webkit.org/show_bug.cgi?id=51177
    
            IDBDatabaseError::code() needs to return the error code without
            offset. But when the IDBDatabaseError is created, the code comes with
            an offset (it gets passed a IDBDatabaseException::IDBDatabaseExceptionCode).
    
            However, in Chromium, IDBDatabaseErrors are sometimes also created via
            WebIDBDatabaseError when they are sent across IPC, and then the error
            code comes *without* offset. Provide a second create() function for
            this case.
    
            * storage/IDBDatabaseError.h:
            (WebCore::IDBDatabaseError::create):
            (WebCore::IDBDatabaseError::createWithoutOffset):
            (WebCore::IDBDatabaseError::code):
    2010-12-16  Hans Wennborg  <hans at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            IndexedDB: Fix IDBDatabaseError code offset bug
            https://bugs.webkit.org/show_bug.cgi?id=51177
    
            WebIDBDatabaseError must use the
            IDBDatabaseError::createWithoutOffset() function.
    
            * src/WebIDBDatabaseError.cpp:
            (WebKit::WebIDBDatabaseError::assign):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f40c85..99fc395 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-12-16  Hans Wennborg  <hans at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        IndexedDB: Fix IDBDatabaseError code offset bug
+        https://bugs.webkit.org/show_bug.cgi?id=51177
+
+        IDBDatabaseError::code() needs to return the error code without
+        offset. But when the IDBDatabaseError is created, the code comes with
+        an offset (it gets passed a IDBDatabaseException::IDBDatabaseExceptionCode).
+
+        However, in Chromium, IDBDatabaseErrors are sometimes also created via
+        WebIDBDatabaseError when they are sent across IPC, and then the error
+        code comes *without* offset. Provide a second create() function for
+        this case.
+
+        * storage/IDBDatabaseError.h:
+        (WebCore::IDBDatabaseError::create):
+        (WebCore::IDBDatabaseError::createWithoutOffset):
+        (WebCore::IDBDatabaseError::code):
+
 2010-12-16  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r74162.
diff --git a/WebCore/storage/IDBDatabaseError.h b/WebCore/storage/IDBDatabaseError.h
index 68e8231..8b42f17 100644
--- a/WebCore/storage/IDBDatabaseError.h
+++ b/WebCore/storage/IDBDatabaseError.h
@@ -39,11 +39,20 @@ class IDBDatabaseError : public RefCounted<IDBDatabaseError> {
 public:
     static PassRefPtr<IDBDatabaseError> create(unsigned short code, const String& message)
     {
+        ASSERT(code >= IDBDatabaseException::IDBDatabaseExceptionOffset);
+        ASSERT(code < IDBDatabaseException::IDBDatabaseExceptionMax);
+        return adoptRef(new IDBDatabaseError(code - IDBDatabaseException::IDBDatabaseExceptionOffset, message));
+    }
+
+    static PassRefPtr<IDBDatabaseError> createWithoutOffset(unsigned short code, const String& message)
+    {
+        ASSERT(code < IDBDatabaseException::IDBDatabaseExceptionOffset);
         return adoptRef(new IDBDatabaseError(code, message));
     }
+
     ~IDBDatabaseError() { }
 
-    unsigned short code() const { return m_code - IDBDatabaseException::IDBDatabaseExceptionOffset; }
+    unsigned short code() const { return m_code; }
     void setCode(unsigned short value) { m_code = value; }
     const String& message() const { return m_message; }
     void setMessage(const String& value) { m_message = value; }
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 95e377a..25262d0 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-16  Hans Wennborg  <hans at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        IndexedDB: Fix IDBDatabaseError code offset bug
+        https://bugs.webkit.org/show_bug.cgi?id=51177
+
+        WebIDBDatabaseError must use the
+        IDBDatabaseError::createWithoutOffset() function.
+
+        * src/WebIDBDatabaseError.cpp:
+        (WebKit::WebIDBDatabaseError::assign):
+
 2010-12-15  Chris Guillory  <chris.guillory at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebIDBDatabaseError.cpp b/WebKit/chromium/src/WebIDBDatabaseError.cpp
index cbbe14a..7413ae6 100644
--- a/WebKit/chromium/src/WebIDBDatabaseError.cpp
+++ b/WebKit/chromium/src/WebIDBDatabaseError.cpp
@@ -47,7 +47,7 @@ void WebIDBDatabaseError::assign(const WebIDBDatabaseError& value)
 
 void WebIDBDatabaseError::assign(unsigned short code, const WebString& message)
 {
-    m_private = IDBDatabaseError::create(code, message);
+    m_private = IDBDatabaseError::createWithoutOffset(code, message);
 }
 
 void WebIDBDatabaseError::reset()

-- 
WebKit Debian packaging