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

[jorlow at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 34153a0a1ea497e3597b2e527bdaa6c5a0d8360d
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 26 16:51:31 2010 +0000

    2010-11-26  Jeremy Orlow  <jorlow at chromium.org>
    
            Unreviewed build fix.
    
            * storage/IDBIndex.cpp:
            (WebCore::IDBIndex::openCursor):
            (WebCore::IDBIndex::openKeyCursor):
            * storage/IDBObjectStore.cpp:
            (WebCore::IDBObjectStore::openCursor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72769 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cd1bd9e..5a6a8a9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-26  Jeremy Orlow  <jorlow at chromium.org>
+
+        Unreviewed build fix.
+
+        * storage/IDBIndex.cpp:
+        (WebCore::IDBIndex::openCursor):
+        (WebCore::IDBIndex::openKeyCursor):
+        * storage/IDBObjectStore.cpp:
+        (WebCore::IDBObjectStore::openCursor):
+
 2010-11-26  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/storage/IDBIndex.cpp b/WebCore/storage/IDBIndex.cpp
index aecba16..8a38a27 100644
--- a/WebCore/storage/IDBIndex.cpp
+++ b/WebCore/storage/IDBIndex.cpp
@@ -57,8 +57,8 @@ PassRefPtr<IDBRequest> IDBIndex::openCursor(ScriptExecutionContext* context, con
     RefPtr<IDBKeyRange> keyRange = options.getKeyKeyRange("range");
 
     // Converted to an unsigned short.
-    int64_t direction = defaultDirection;
-    options.getKeyInteger("direction", direction);
+    int32_t direction = defaultDirection;
+    options.getKeyInt32("direction", direction);
     if (direction != IDBCursor::NEXT && direction != IDBCursor::NEXT_NO_DUPLICATE && direction != IDBCursor::PREV && direction != IDBCursor::PREV_NO_DUPLICATE) {
         // FIXME: May need to change when specced: http://www.w3.org/Bugs/Public/show_bug.cgi?id=11406
         ec = IDBDatabaseException::CONSTRAINT_ERR;
@@ -77,8 +77,8 @@ PassRefPtr<IDBRequest> IDBIndex::openKeyCursor(ScriptExecutionContext* context,
     RefPtr<IDBKeyRange> keyRange = options.getKeyKeyRange("range");
 
     // Converted to an unsigned short.
-    int64_t direction = defaultDirection;
-    options.getKeyInteger("direction", direction);
+    int32_t direction = defaultDirection;
+    options.getKeyInt32("direction", direction);
     if (direction != IDBCursor::NEXT && direction != IDBCursor::NEXT_NO_DUPLICATE && direction != IDBCursor::PREV && direction != IDBCursor::PREV_NO_DUPLICATE) {
         // FIXME: May need to change when specced: http://www.w3.org/Bugs/Public/show_bug.cgi?id=11406
         ec = IDBDatabaseException::CONSTRAINT_ERR;
diff --git a/WebCore/storage/IDBObjectStore.cpp b/WebCore/storage/IDBObjectStore.cpp
index e3d673e..85eebd2 100644
--- a/WebCore/storage/IDBObjectStore.cpp
+++ b/WebCore/storage/IDBObjectStore.cpp
@@ -134,8 +134,8 @@ PassRefPtr<IDBRequest> IDBObjectStore::openCursor(ScriptExecutionContext* contex
     RefPtr<IDBKeyRange> range = options.getKeyKeyRange("range");
 
     // Converted to an unsigned short.
-    int64_t direction = defaultDirection;
-    options.getKeyInteger("direction", direction);
+    int32_t direction = defaultDirection;
+    options.getKeyInt32("direction", direction);
     if (direction != IDBCursor::NEXT && direction != IDBCursor::NEXT_NO_DUPLICATE && direction != IDBCursor::PREV && direction != IDBCursor::PREV_NO_DUPLICATE) {
         // FIXME: May need to change when specced: http://www.w3.org/Bugs/Public/show_bug.cgi?id=11406
         ec = IDBDatabaseException::CONSTRAINT_ERR;

-- 
WebKit Debian packaging