Title: [101643] trunk/Source/WebKit/chromium
Revision
101643
Author
[email protected]
Date
2011-12-01 02:36:58 -0800 (Thu, 01 Dec 2011)

Log Message

IndexedDB: Fix WebIDBObjectStore::createIndex() after r101602
https://bugs.webkit.org/show_bug.cgi?id=73543

Reviewed by Tony Gentilcore.

r101602 introduces a new signature for createIndex(). Until Chromium
has been updated to override that function, the default implementation
must call the old version.

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

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (101642 => 101643)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-12-01 10:35:12 UTC (rev 101642)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-12-01 10:36:58 UTC (rev 101643)
@@ -1,3 +1,17 @@
+2011-12-01  Hans Wennborg  <[email protected]>
+
+        IndexedDB: Fix WebIDBObjectStore::createIndex() after r101602
+        https://bugs.webkit.org/show_bug.cgi?id=73543
+
+        Reviewed by Tony Gentilcore.
+
+        r101602 introduces a new signature for createIndex(). Until Chromium
+        has been updated to override that function, the default implementation
+        must call the old version.
+
+        * public/WebIDBObjectStore.h:
+        (WebKit::WebIDBObjectStore::createIndex):
+
 2011-11-30  David Reveman  <[email protected]>
 
         [Chromium] Improve tile invalidation.

Modified: trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h (101642 => 101643)


--- trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h	2011-12-01 10:35:12 UTC (rev 101642)
+++ trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h	2011-12-01 10:36:58 UTC (rev 101643)
@@ -75,10 +75,10 @@
     {
         return createIndex(name, keyPath, unique, false, transaction, ec);
     }
-    virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, bool multientry, const WebIDBTransaction&, WebExceptionCode&)
+    virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, bool multientry, const WebIDBTransaction& transaction, WebExceptionCode& ec)
     {
-        WEBKIT_ASSERT_NOT_REACHED();
-        return 0;
+        // FIXME: Assert not reached once implementing classes are updated.
+        return createIndex(name, keyPath, unique, transaction, ec);
     }
     // Transfers ownership of the WebIDBIndex to the caller.
     virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to