Title: [114708] trunk/Source/WebKit/chromium
- Revision
- 114708
- Author
- [email protected]
- Date
- 2012-04-19 17:58:09 -0700 (Thu, 19 Apr 2012)
Log Message
[Chromium] IndexedDB: Prep for changing keyPath return type
https://bugs.webkit.org/show_bug.cgi?id=84208
To introduce Array-type key paths (see http://webkit.org/b/84207) the keyPath() accessors
on WebIDBObjectStore and WebIDBIndex need to change return type. To do so requires temporarily
changing the method names to keyPathString with compatibility shims (on the WebKit side)
then switching the implementation in the Chromium port in a follow-up patch.
Reviewed by Kent Tamura.
* public/WebIDBIndex.h:
(WebKit::WebIDBIndex::keyPath):
(WebKit::WebIDBIndex::keyPathString):
* public/WebIDBObjectStore.h:
(WebKit::WebIDBObjectStore::keyPath):
(WebKit::WebIDBObjectStore::keyPathString):
* src/WebIDBIndexImpl.cpp:
(WebKit::WebIDBIndexImpl::keyPathString):
* src/WebIDBIndexImpl.h:
(WebIDBIndexImpl):
* src/WebIDBObjectStoreImpl.cpp:
(WebKit::WebIDBObjectStoreImpl::keyPathString):
* src/WebIDBObjectStoreImpl.h:
(WebIDBObjectStoreImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (114707 => 114708)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-20 00:50:19 UTC (rev 114707)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-20 00:58:09 UTC (rev 114708)
@@ -1,3 +1,30 @@
+2012-04-19 Joshua Bell <[email protected]>
+
+ [Chromium] IndexedDB: Prep for changing keyPath return type
+ https://bugs.webkit.org/show_bug.cgi?id=84208
+
+ To introduce Array-type key paths (see http://webkit.org/b/84207) the keyPath() accessors
+ on WebIDBObjectStore and WebIDBIndex need to change return type. To do so requires temporarily
+ changing the method names to keyPathString with compatibility shims (on the WebKit side)
+ then switching the implementation in the Chromium port in a follow-up patch.
+
+ Reviewed by Kent Tamura.
+
+ * public/WebIDBIndex.h:
+ (WebKit::WebIDBIndex::keyPath):
+ (WebKit::WebIDBIndex::keyPathString):
+ * public/WebIDBObjectStore.h:
+ (WebKit::WebIDBObjectStore::keyPath):
+ (WebKit::WebIDBObjectStore::keyPathString):
+ * src/WebIDBIndexImpl.cpp:
+ (WebKit::WebIDBIndexImpl::keyPathString):
+ * src/WebIDBIndexImpl.h:
+ (WebIDBIndexImpl):
+ * src/WebIDBObjectStoreImpl.cpp:
+ (WebKit::WebIDBObjectStoreImpl::keyPathString):
+ * src/WebIDBObjectStoreImpl.h:
+ (WebIDBObjectStoreImpl):
+
2012-04-19 Andreas Kling <[email protected]>
[chromium] Add simplified API for iterating over a WebElement's attributes.
Modified: trunk/Source/WebKit/chromium/public/WebIDBIndex.h (114707 => 114708)
--- trunk/Source/WebKit/chromium/public/WebIDBIndex.h 2012-04-20 00:50:19 UTC (rev 114707)
+++ trunk/Source/WebKit/chromium/public/WebIDBIndex.h 2012-04-20 00:58:09 UTC (rev 114708)
@@ -53,6 +53,12 @@
}
virtual WebString keyPath() const
{
+ return keyPathString();
+ }
+ virtual WebString keyPathString() const
+ {
+ // FIXME: Temporary to allow keyPath()'s return type to change.
+ // http://webkit.org/b/84207
WEBKIT_ASSERT_NOT_REACHED();
return WebString();
}
Modified: trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h (114707 => 114708)
--- trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-04-20 00:50:19 UTC (rev 114707)
+++ trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-04-20 00:58:09 UTC (rev 114708)
@@ -50,6 +50,12 @@
}
virtual WebString keyPath() const
{
+ return keyPathString();
+ }
+ virtual WebString keyPathString() const
+ {
+ // FIXME: Temporary to allow keyPath()'s return type to change.
+ // http://webkit.org/b/84207
WEBKIT_ASSERT_NOT_REACHED();
return WebString();
}
Modified: trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp (114707 => 114708)
--- trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp 2012-04-20 00:50:19 UTC (rev 114707)
+++ trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp 2012-04-20 00:58:09 UTC (rev 114708)
@@ -58,7 +58,7 @@
return m_backend->storeName();
}
-WebString WebIDBIndexImpl::keyPath() const
+WebString WebIDBIndexImpl::keyPathString() const
{
return m_backend->keyPath();
}
Modified: trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h (114707 => 114708)
--- trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h 2012-04-20 00:50:19 UTC (rev 114707)
+++ trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h 2012-04-20 00:58:09 UTC (rev 114708)
@@ -45,7 +45,7 @@
virtual WebString name() const;
virtual WebString storeName() const;
- virtual WebString keyPath() const;
+ virtual WebString keyPathString() const;
virtual bool unique() const;
virtual bool multiEntry() const;
Modified: trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp (114707 => 114708)
--- trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp 2012-04-20 00:50:19 UTC (rev 114707)
+++ trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp 2012-04-20 00:58:09 UTC (rev 114708)
@@ -57,7 +57,7 @@
return m_objectStore->name();
}
-WebString WebIDBObjectStoreImpl::keyPath() const
+WebString WebIDBObjectStoreImpl::keyPathString() const
{
return m_objectStore->keyPath();
}
Modified: trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h (114707 => 114708)
--- trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h 2012-04-20 00:50:19 UTC (rev 114707)
+++ trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h 2012-04-20 00:58:09 UTC (rev 114708)
@@ -46,7 +46,7 @@
~WebIDBObjectStoreImpl();
WebString name() const;
- WebString keyPath() const;
+ WebString keyPathString() const;
WebDOMStringList indexNames() const;
void get(const WebIDBKey& key, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
