Title: [93553] trunk/Source/WebKit/chromium
Revision
93553
Author
ad...@chromium.org
Date
2011-08-22 15:44:31 -0700 (Mon, 22 Aug 2011)

Log Message

[chromium] Remove deprecated and unused bits of WebIDB* headers
https://bugs.webkit.org/show_bug.cgi?id=66711

Reviewed by Tony Chang.

The Chromium side of this patch was submitted as
http://crrev.com/97687.

* public/WebIDBCallbacks.h:
* public/WebIDBCursor.h:
(WebKit::WebIDBCursor::primaryKey):
(WebKit::WebIDBCursor::value):
(WebKit::WebIDBCursor::deleteFunction):
* public/WebIDBDatabase.h:
(WebKit::WebIDBDatabase::transaction):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (93552 => 93553)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-08-22 22:35:53 UTC (rev 93552)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-08-22 22:44:31 UTC (rev 93553)
@@ -1,3 +1,21 @@
+2011-08-22  Adam Klein  <ad...@chromium.org>
+
+        [chromium] Remove deprecated and unused bits of WebIDB* headers
+        https://bugs.webkit.org/show_bug.cgi?id=66711
+
+        Reviewed by Tony Chang.
+
+        The Chromium side of this patch was submitted as
+        http://crrev.com/97687.
+
+        * public/WebIDBCallbacks.h:
+        * public/WebIDBCursor.h:
+        (WebKit::WebIDBCursor::primaryKey):
+        (WebKit::WebIDBCursor::value):
+        (WebKit::WebIDBCursor::deleteFunction):
+        * public/WebIDBDatabase.h:
+        (WebKit::WebIDBDatabase::transaction):
+
 2011-08-22  Dimitri Glazkov  <dglaz...@chromium.org>
 
         Remove third_party/leveldb, because it's no longer used and doesn't exist downstream.

Modified: trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h (93552 => 93553)


--- trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h	2011-08-22 22:35:53 UTC (rev 93552)
+++ trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h	2011-08-22 22:44:31 UTC (rev 93553)
@@ -49,8 +49,6 @@
     virtual void onSuccess(WebIDBCursor*) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(WebIDBDatabase*) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(const WebIDBKey&) { WEBKIT_ASSERT_NOT_REACHED(); }
-    // FIXME: remove after Webkit roll.
-    virtual void onSuccess(WebIDBIndex*) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(WebIDBTransaction*) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(const WebSerializedScriptValue&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onBlocked() { WEBKIT_ASSERT_NOT_REACHED(); }

Modified: trunk/Source/WebKit/chromium/public/WebIDBCursor.h (93552 => 93553)


--- trunk/Source/WebKit/chromium/public/WebIDBCursor.h	2011-08-22 22:35:53 UTC (rev 93552)
+++ trunk/Source/WebKit/chromium/public/WebIDBCursor.h	2011-08-22 22:44:31 UTC (rev 93553)
@@ -55,29 +55,15 @@
         WEBKIT_ASSERT_NOT_REACHED();
         return WebIDBKey::createInvalid();
     }
-    // FIXME: Remove the following 2 methods and uncomment third after roll.
     virtual WebSerializedScriptValue value() const
     {
-        WebSerializedScriptValue serializedScriptValue;
-        WebIDBKey key;
-        value(serializedScriptValue, key);
-        return serializedScriptValue;        
+        WEBKIT_ASSERT_NOT_REACHED();
+        return WebSerializedScriptValue();
     }
-    virtual void value(WebSerializedScriptValue& serializedScriptValue, WebIDBKey& key) const
-    {
-        serializedScriptValue = value();
-    }
-    // virtual WebSerializedScriptValue value() const
-    // {
-    //     WEBKIT_ASSERT_NOT_REACHED();
-    //     return WebSerializedScriptValue();
-    // }
 
     virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
-    // FIXME: Remove after WK roll.
-    virtual void remove(WebIDBCallbacks* callbacks, WebExceptionCode& ec) { deleteFunction(callbacks, ec); }
-    virtual void deleteFunction(WebIDBCallbacks* callbacks, WebExceptionCode& ec) { remove(callbacks, ec); }
+    virtual void deleteFunction(WebIDBCallbacks* callbacks, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
 
 protected:
     WebIDBCursor() { }

Modified: trunk/Source/WebKit/chromium/public/WebIDBDatabase.h (93552 => 93553)


--- trunk/Source/WebKit/chromium/public/WebIDBDatabase.h	2011-08-22 22:35:53 UTC (rev 93552)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabase.h	2011-08-22 22:44:31 UTC (rev 93553)
@@ -68,13 +68,9 @@
     // Transfers ownership of the WebIDBTransaction to the caller.
     virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, WebExceptionCode& ec)
     {
-        return transaction(names, mode, 0, ec);
+        WEBKIT_ASSERT_NOT_REACHED();
+        return 0;
     }
-    // FIXME: Remove.
-    virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long, WebExceptionCode& ec)
-    {
-        return transaction(names, mode, ec);
-    }
     virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }
 
     virtual void open(WebIDBDatabaseCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to