[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 c8187ffde2ef60c65929112cc87ad813192b1142
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 18:23:04 2010 +0000

    2010-11-18  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] IndexedDB API cleanup
            https://bugs.webkit.org/show_bug.cgi?id=49733
    
            Make it so that you can't directly instantiate our "interface"
            classes.  Remove some code for 2 sided merges.
    
            * public/WebIDBCursor.h:
            (WebKit::WebIDBCursor::WebIDBCursor):
            * public/WebIDBDatabase.h:
            (WebKit::WebIDBDatabase::WebIDBDatabase):
            * public/WebIDBIndex.h:
            (WebKit::WebIDBIndex::WebIDBIndex):
            * public/WebIDBObjectStore.h:
            (WebKit::WebIDBObjectStore::WebIDBObjectStore):
            * public/WebIDBTransaction.h:
            (WebKit::WebIDBTransaction::WebIDBTransaction):
            * src/IDBTransactionBackendProxy.cpp:
            (WebCore::IDBTransactionBackendProxy::IDBTransactionBackendProxy):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index fe57b2e..6821891 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,26 @@
+2010-11-18  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] IndexedDB API cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=49733
+
+        Make it so that you can't directly instantiate our "interface"
+        classes.  Remove some code for 2 sided merges.
+
+        * public/WebIDBCursor.h:
+        (WebKit::WebIDBCursor::WebIDBCursor):
+        * public/WebIDBDatabase.h:
+        (WebKit::WebIDBDatabase::WebIDBDatabase):
+        * public/WebIDBIndex.h:
+        (WebKit::WebIDBIndex::WebIDBIndex):
+        * public/WebIDBObjectStore.h:
+        (WebKit::WebIDBObjectStore::WebIDBObjectStore):
+        * public/WebIDBTransaction.h:
+        (WebKit::WebIDBTransaction::WebIDBTransaction):
+        * src/IDBTransactionBackendProxy.cpp:
+        (WebCore::IDBTransactionBackendProxy::IDBTransactionBackendProxy):
+
 2010-11-18  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/public/WebIDBCursor.h b/WebKit/chromium/public/WebIDBCursor.h
index 98f7a6b..88b8b22 100644
--- a/WebKit/chromium/public/WebIDBCursor.h
+++ b/WebKit/chromium/public/WebIDBCursor.h
@@ -56,6 +56,9 @@ public:
     virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void remove(WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+
+protected:
+    WebIDBCursor() { }
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBDatabase.h b/WebKit/chromium/public/WebIDBDatabase.h
index 19096cc..a556515 100644
--- a/WebKit/chromium/public/WebIDBDatabase.h
+++ b/WebKit/chromium/public/WebIDBDatabase.h
@@ -77,6 +77,9 @@ public:
         return 0;
     }
     virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }
+
+protected:
+    WebIDBDatabase() { }
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBIndex.h b/WebKit/chromium/public/WebIDBIndex.h
index 0c0d79a..3c07a50 100644
--- a/WebKit/chromium/public/WebIDBIndex.h
+++ b/WebKit/chromium/public/WebIDBIndex.h
@@ -62,49 +62,13 @@ public:
         return false;
     }
 
-    virtual void openObjectCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
-    {
-        WebExceptionCode ec = 0;
-        openObjectCursor(range, direction, callbacks, transaction, ec);
-    }
-    virtual void openObjectCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
-    {
-        openObjectCursor(range, direction, callbacks, transaction);
-    }
-    virtual void openKeyCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
-    {
-        WebExceptionCode ec = 0;
-        openKeyCursor(range, direction, callbacks, transaction, ec);
-    }
-    virtual void openKeyCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
-    {
-        openKeyCursor(range, direction, callbacks, transaction);
-    }
-    virtual void getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
-    {
-        WebExceptionCode ec = 0;
-        getObject(key, callbacks, transaction, ec);
-    }
-    virtual void getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
-    {
-        getObject(key, callbacks, transaction);
-    }
-    virtual void getKey(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
-    {
-        WebExceptionCode ec = 0;
-        getKey(key, callbacks, transaction, ec);
-    }
-    virtual void getKey(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
-    {
-        getKey(key, callbacks, transaction);
-    }
-
-    /*
     virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void openKeyCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void getKey(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
-    */
+
+protected:
+    WebIDBIndex() {}
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBObjectStore.h b/WebKit/chromium/public/WebIDBObjectStore.h
index 89dae02..f31b658 100755
--- a/WebKit/chromium/public/WebIDBObjectStore.h
+++ b/WebKit/chromium/public/WebIDBObjectStore.h
@@ -75,6 +75,9 @@ public:
     }
     virtual void removeIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+
+protected:
+    WebIDBObjectStore() {}
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBTransaction.h b/WebKit/chromium/public/WebIDBTransaction.h
index cff7c67..e75de3c 100644
--- a/WebKit/chromium/public/WebIDBTransaction.h
+++ b/WebKit/chromium/public/WebIDBTransaction.h
@@ -60,6 +60,8 @@ public:
         return 0;
     }
 
+protected:
+    WebIDBTransaction() {}
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/src/IDBTransactionBackendProxy.cpp b/WebKit/chromium/src/IDBTransactionBackendProxy.cpp
index 7a88b13..b95e22f 100644
--- a/WebKit/chromium/src/IDBTransactionBackendProxy.cpp
+++ b/WebKit/chromium/src/IDBTransactionBackendProxy.cpp
@@ -45,8 +45,7 @@ PassRefPtr<IDBTransactionBackendInterface> IDBTransactionBackendProxy::create(Pa
 IDBTransactionBackendProxy::IDBTransactionBackendProxy(PassOwnPtr<WebKit::WebIDBTransaction> transaction)
     : m_webIDBTransaction(transaction)
 {
-    if (!m_webIDBTransaction)
-        m_webIDBTransaction = adoptPtr(new WebKit::WebIDBTransaction());
+    ASSERT(m_webIDBTransaction);
 }
 
 IDBTransactionBackendProxy::~IDBTransactionBackendProxy()

-- 
WebKit Debian packaging