Title: [98900] trunk/Source/WebKit/chromium
- Revision
- 98900
- Author
- commit-qu...@webkit.org
- Date
- 2011-10-31 16:09:39 -0700 (Mon, 31 Oct 2011)
Log Message
IndexedDB: Remove null key support (part 2)
https://bugs.webkit.org/show_bug.cgi?id=71132
Patch by Joshua Bell <jsb...@chromium.org> on 2011-10-31
Reviewed by Darin Fisher.
* public/WebIDBKey.h:
* src/AssertMatchingEnums.cpp:
* src/WebIDBKey.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (98899 => 98900)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-31 23:09:12 UTC (rev 98899)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-31 23:09:39 UTC (rev 98900)
@@ -1,3 +1,14 @@
+2011-10-31 Joshua Bell <jsb...@chromium.org>
+
+ IndexedDB: Remove null key support (part 2)
+ https://bugs.webkit.org/show_bug.cgi?id=71132
+
+ Reviewed by Darin Fisher.
+
+ * public/WebIDBKey.h:
+ * src/AssertMatchingEnums.cpp:
+ * src/WebIDBKey.cpp:
+
2011-10-31 Pavel Feldman <pfeld...@google.com>
Web Inspector: move localization support into UIUtil.js, reduce externs.
Modified: trunk/Source/WebKit/chromium/public/WebIDBKey.h (98899 => 98900)
--- trunk/Source/WebKit/chromium/public/WebIDBKey.h 2011-10-31 23:09:12 UTC (rev 98899)
+++ trunk/Source/WebKit/chromium/public/WebIDBKey.h 2011-10-31 23:09:39 UTC (rev 98900)
@@ -43,7 +43,6 @@
WebIDBKey() { }
~WebIDBKey() { reset(); }
- WEBKIT_EXPORT static WebIDBKey createNull();
WEBKIT_EXPORT static WebIDBKey createString(const WebString&);
WEBKIT_EXPORT static WebIDBKey createDate(double);
WEBKIT_EXPORT static WebIDBKey createNumber(double);
@@ -59,7 +58,6 @@
}
WEBKIT_EXPORT void assign(const WebIDBKey&);
- WEBKIT_EXPORT void assignNull();
WEBKIT_EXPORT void assignString(const WebString&);
WEBKIT_EXPORT void assignDate(double);
WEBKIT_EXPORT void assignNumber(double);
@@ -67,12 +65,10 @@
WEBKIT_EXPORT void reset();
enum Type {
- NullType = 0,
+ InvalidType = 0,
StringType,
DateType,
- NumberType,
- // Types not in WebCore::IDBKey:
- InvalidType
+ NumberType
};
WEBKIT_EXPORT Type type() const;
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (98899 => 98900)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2011-10-31 23:09:12 UTC (rev 98899)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2011-10-31 23:09:39 UTC (rev 98900)
@@ -396,9 +396,7 @@
COMPILE_ASSERT_MATCHING_ENUM(WebView::UserStyleInjectInExistingDocuments, InjectInExistingDocuments);
COMPILE_ASSERT_MATCHING_ENUM(WebView::UserStyleInjectInSubsequentDocuments, InjectInSubsequentDocuments);
-// FIXME: Temporary; WebIDBKey::NullType will be removed in a subsequent patch.
-// https://bugs.webkit.org/show_bug.cgi?id=70065
-COMPILE_ASSERT_MATCHING_ENUM(WebIDBKey::NullType, IDBKey::InvalidType);
+COMPILE_ASSERT_MATCHING_ENUM(WebIDBKey::InvalidType, IDBKey::InvalidType);
COMPILE_ASSERT_MATCHING_ENUM(WebIDBKey::StringType, IDBKey::StringType);
COMPILE_ASSERT_MATCHING_ENUM(WebIDBKey::DateType, IDBKey::DateType);
COMPILE_ASSERT_MATCHING_ENUM(WebIDBKey::NumberType, IDBKey::NumberType);
Modified: trunk/Source/WebKit/chromium/src/WebIDBKey.cpp (98899 => 98900)
--- trunk/Source/WebKit/chromium/src/WebIDBKey.cpp 2011-10-31 23:09:12 UTC (rev 98899)
+++ trunk/Source/WebKit/chromium/src/WebIDBKey.cpp 2011-10-31 23:09:39 UTC (rev 98900)
@@ -41,13 +41,6 @@
namespace WebKit {
-WebIDBKey WebIDBKey::createNull()
-{
- WebIDBKey key;
- key.assignNull();
- return key;
-}
-
WebIDBKey WebIDBKey::createString(const WebString& string)
{
WebIDBKey key;
@@ -93,11 +86,6 @@
m_private = value.m_private;
}
-void WebIDBKey::assignNull()
-{
- m_private = 0;
-}
-
void WebIDBKey::assignString(const WebString& string)
{
m_private = IDBKey::createString(string);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
