Modified: trunk/Source/WebKit/chromium/ChangeLog (103024 => 103025)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-16 05:56:23 UTC (rev 103024)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-16 06:00:00 UTC (rev 103025)
@@ -1,3 +1,16 @@
+2011-12-15 Joshua Bell <[email protected]>
+
+ IndexedDB: Clean up WebIDBObjectStore createIndex temp code
+ https://bugs.webkit.org/show_bug.cgi?id=74205
+
+ Reviewed by Darin Fisher.
+
+ Remove a method and an implementation that only needed for
+ older Chromium revisions.
+
+ * public/WebIDBObjectStore.h:
+ (WebKit::WebIDBObjectStore::createIndex):
+
2011-12-15 Tony Chang <[email protected]>
Chromium Windows (Tests) is failing to build
Modified: trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h (103024 => 103025)
--- trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2011-12-16 05:56:23 UTC (rev 103024)
+++ trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2011-12-16 06:00:00 UTC (rev 103025)
@@ -70,15 +70,10 @@
virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void deleteFunction(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void clear(WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Remove once callers are updated.
- virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction& transaction, WebExceptionCode& ec)
- {
- return createIndex(name, keyPath, unique, false, transaction, ec);
- }
virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, bool multiEntry, const WebIDBTransaction& transaction, WebExceptionCode& ec)
{
- // FIXME: Assert not reached once implementing classes are updated.
- return createIndex(name, keyPath, unique, transaction, ec);
+ WEBKIT_ASSERT_NOT_REACHED();
+ return 0;
}
// Transfers ownership of the WebIDBIndex to the caller.
virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&)
