2011-02-03 Hans Wennborg <hans@chromium.org>

        Reviewed by Jeremy Orlow.

        Chromium: Remove deprecated WebIDBObjectStore::put() function
        https://bugs.webkit.org/show_bug.cgi?id=53669

        Remove deprecated put() function. Chromium side code now overrides
        the new version.

        * public/WebIDBObjectStore.h:
        (WebKit::WebIDBObjectStore::put):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77566 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index ef51e16cf115925af916266ce0fee5c2c0204bdf..8c5ed98cffe2b3132bcf26ab59e1a1aba0566d86 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2011-02-03  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Chromium: Remove deprecated WebIDBObjectStore::put() function
+        https://bugs.webkit.org/show_bug.cgi?id=53669
+
+        Remove deprecated put() function. Chromium side code now overrides
+        the new version.
+
+        * public/WebIDBObjectStore.h:
+        (WebKit::WebIDBObjectStore::put):
+
 2011-02-01  Pavel Podivilov  <podivilov@chromium.org>
 
         Reviewed by Pavel Feldman.

diff --git a/Source/WebKit/chromium/public/WebIDBObjectStore.h b/Source/WebKit/chromium/public/WebIDBObjectStore.h
index 5b7fa9961196d6e7b2e0180115e962b5868b551c..ab0f253e9336611056914ec6bcf2d4d00825eed7 100755 (executable)
--- a/Source/WebKit/chromium/public/WebIDBObjectStore.h
+++ b/Source/WebKit/chromium/public/WebIDBObjectStore.h
@@ -67,18 +67,7 @@ public:
         CursorUpdate
     };
 
-    // FIXME: Remove once Chromium side is updated to call the new put function.
-    virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
-    {
-        put(value, key, addOnly ? AddOnly : AddOrUpdate, callbacks, transaction, ec);
-    }
-
-    // FIXME: Assert not reached once Chromium side overrides this properly.
-    virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, PutMode putMode, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
-    {
-        put(value, key, putMode == AddOnly, callbacks, transaction, ec);
-    }
-
+    virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, PutMode putMode, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void deleteFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction&, WebExceptionCode&)
     {