[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
jorlow at chromium.org
jorlow at chromium.org
Wed Dec 22 17:57:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 526aaff577e93769592df0470ba6645574c95121
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 3 16:14:21 2010 +0000
2010-11-29 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Darin Fisher.
[Chromium] Clean up IndexedDB 2 sided roll bits
https://bugs.webkit.org/show_bug.cgi?id=50160
* public/WebIDBDatabase.h:
(WebKit::WebIDBDatabase::version):
(WebKit::WebIDBDatabase::objectStoreNames):
(WebKit::WebIDBDatabase::deleteObjectStore):
* public/WebIDBFactory.h:
(WebKit::WebIDBFactory::open):
* public/WebIDBKeyRange.h:
* public/WebIDBObjectStore.h:
(WebKit::WebIDBObjectStore::deleteFunction):
* src/IDBDatabaseProxy.cpp:
* src/IDBDatabaseProxy.h:
* src/WebIDBKeyRange.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73264 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 614b4c6..c93c262 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-29 Jeremy Orlow <jorlow at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [Chromium] Clean up IndexedDB 2 sided roll bits
+ https://bugs.webkit.org/show_bug.cgi?id=50160
+
+ * public/WebIDBDatabase.h:
+ (WebKit::WebIDBDatabase::version):
+ (WebKit::WebIDBDatabase::objectStoreNames):
+ (WebKit::WebIDBDatabase::deleteObjectStore):
+ * public/WebIDBFactory.h:
+ (WebKit::WebIDBFactory::open):
+ * public/WebIDBKeyRange.h:
+ * public/WebIDBObjectStore.h:
+ (WebKit::WebIDBObjectStore::deleteFunction):
+ * src/IDBDatabaseProxy.cpp:
+ * src/IDBDatabaseProxy.h:
+ * src/WebIDBKeyRange.cpp:
+
2010-12-02 Chris Rogers <crogers at google.com>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebIDBDatabase.h b/WebKit/chromium/public/WebIDBDatabase.h
index 1588e23..5ed8052 100644
--- a/WebKit/chromium/public/WebIDBDatabase.h
+++ b/WebKit/chromium/public/WebIDBDatabase.h
@@ -47,26 +47,22 @@ public:
WEBKIT_ASSERT_NOT_REACHED();
return WebString();
}
- // FIXME: remove after roll.
- virtual WebString description() const
+ virtual WebString version() const
{
+ WEBKIT_ASSERT_NOT_REACHED();
return WebString();
}
- virtual WebString version() const
+ virtual WebDOMStringList objectStoreNames() const
{
WEBKIT_ASSERT_NOT_REACHED();
- return WebString();
+ return WebDOMStringList();
}
- virtual WebDOMStringList objectStores() const { return objectStoreNames(); } // FIXME: Remove after roll.
- virtual WebDOMStringList objectStoreNames() const { return objectStores(); } // FIXME: Assert not reached after roll.
virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction&, WebExceptionCode&)
{
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
- virtual void deleteObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode& ec) { removeObjectStore(name, transaction, ec); }
- // FIXME: remove after roll.
- virtual void removeObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode& ec) { deleteObjectStore(name, transaction, ec); }
+ virtual void deleteObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
// Transfers ownership of the WebIDBTransaction to the caller.
virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout, WebExceptionCode&)
diff --git a/WebKit/chromium/public/WebIDBFactory.h b/WebKit/chromium/public/WebIDBFactory.h
index 5e3337e..10a134a 100755
--- a/WebKit/chromium/public/WebIDBFactory.h
+++ b/WebKit/chromium/public/WebIDBFactory.h
@@ -51,17 +51,10 @@ public:
virtual ~WebIDBFactory() { }
- // FIXME: Remove after roll.
- virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir, unsigned long long maximumSize)
- {
- open(name, callbacks, origin, webFrame, dataDir, maximumSize);
- }
-
// The WebKit implementation of open ignores the WebFrame* parameter.
virtual void open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir, unsigned long long maximumSize)
{
- // WEBKIT_ASSERT_NOT_REACHED();
- open(name, "", callbacks, origin, webFrame, dataDir, maximumSize);
+ WEBKIT_ASSERT_NOT_REACHED();
}
};
diff --git a/WebKit/chromium/public/WebIDBKeyRange.h b/WebKit/chromium/public/WebIDBKeyRange.h
index 6a9c6da..922d4ed 100644
--- a/WebKit/chromium/public/WebIDBKeyRange.h
+++ b/WebKit/chromium/public/WebIDBKeyRange.h
@@ -43,13 +43,6 @@ public:
WebIDBKeyRange(const WebIDBKeyRange& keyRange) { assign(keyRange); }
WebIDBKeyRange(const WebIDBKey& lower, const WebIDBKey& upper, bool lowerOpen, bool upperOpen) { assign(lower, upper, lowerOpen, upperOpen); }
- // FIXME: Remove next 3 methods after next roll.
- WebIDBKeyRange(const WebIDBKey& lower, const WebIDBKey& upper, unsigned short flags) { assign(lower, upper, flags); }
- WEBKIT_API void assign(const WebIDBKey& lower, const WebIDBKey& upper, unsigned short flags);
- WEBKIT_API unsigned short flags() const;
- WEBKIT_API WebIDBKey left() const;
- WEBKIT_API WebIDBKey right() const;
-
WEBKIT_API WebIDBKey lower() const;
WEBKIT_API WebIDBKey upper() const;
WEBKIT_API bool lowerOpen() const;
diff --git a/WebKit/chromium/public/WebIDBObjectStore.h b/WebKit/chromium/public/WebIDBObjectStore.h
index 17562ca..8f2247f 100755
--- a/WebKit/chromium/public/WebIDBObjectStore.h
+++ b/WebKit/chromium/public/WebIDBObjectStore.h
@@ -61,9 +61,7 @@ public:
virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, bool addOnly, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Remove after roll.
- virtual void remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec) { deleteFunction(key, callbacks, transaction, ec); }
- virtual void deleteFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec) { remove(key, callbacks, transaction, ec); }
+ virtual void deleteFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction&, WebExceptionCode&)
{
WEBKIT_ASSERT_NOT_REACHED();
diff --git a/WebKit/chromium/src/IDBDatabaseProxy.cpp b/WebKit/chromium/src/IDBDatabaseProxy.cpp
index 685f53c..f070d64 100644
--- a/WebKit/chromium/src/IDBDatabaseProxy.cpp
+++ b/WebKit/chromium/src/IDBDatabaseProxy.cpp
@@ -61,11 +61,6 @@ String IDBDatabaseProxy::name() const
return m_webIDBDatabase->name();
}
-String IDBDatabaseProxy::description() const
-{
- return m_webIDBDatabase->description();
-}
-
String IDBDatabaseProxy::version() const
{
return m_webIDBDatabase->version();
diff --git a/WebKit/chromium/src/IDBDatabaseProxy.h b/WebKit/chromium/src/IDBDatabaseProxy.h
index 84693f2..c51a604 100644
--- a/WebKit/chromium/src/IDBDatabaseProxy.h
+++ b/WebKit/chromium/src/IDBDatabaseProxy.h
@@ -43,7 +43,6 @@ public:
virtual ~IDBDatabaseProxy();
virtual String name() const;
- virtual String description() const;
virtual String version() const;
virtual PassRefPtr<DOMStringList> objectStoreNames() const;
diff --git a/WebKit/chromium/src/WebIDBKeyRange.cpp b/WebKit/chromium/src/WebIDBKeyRange.cpp
index ec5b7c2..517ff00 100644
--- a/WebKit/chromium/src/WebIDBKeyRange.cpp
+++ b/WebKit/chromium/src/WebIDBKeyRange.cpp
@@ -47,33 +47,11 @@ void WebIDBKeyRange::assign(const WebIDBKey& lower, const WebIDBKey& upper, bool
m_private = IDBKeyRange::create(lower, upper, lowerOpen, upperOpen);
}
-// FIXME: Remove this after next roll.
-void WebIDBKeyRange::assign(const WebIDBKey& lower, const WebIDBKey& upper, unsigned short flags)
-{
- bool lowerOpen = !!(flags & 1);
- bool upperOpen = !!(flags & 2);
-
- if (lower.type() == WebIDBKey::InvalidType && upper.type() == WebIDBKey::InvalidType)
- m_private = 0;
- else
- m_private = IDBKeyRange::create(lower, upper, lowerOpen, upperOpen);
-}
-
void WebIDBKeyRange::reset()
{
m_private.reset();
}
-WebIDBKey WebIDBKeyRange::left() const
-{
- return lower();
-}
-
-WebIDBKey WebIDBKeyRange::right() const
-{
- return upper();
-}
-
WebIDBKey WebIDBKeyRange::lower() const
{
if (!m_private.get())
@@ -98,20 +76,6 @@ bool WebIDBKeyRange::upperOpen() const
return m_private.get() && m_private->upperOpen();
}
-// FIXME: Remove this after next roll.
-unsigned short WebIDBKeyRange::flags() const
-{
- if (!m_private.get())
- return 0;
-
- unsigned short flags = 0;
- if (m_private->lowerOpen())
- flags |= 1;
- if (m_private->upperOpen())
- flags |= 2;
- return flags;
-}
-
WebIDBKeyRange::WebIDBKeyRange(const PassRefPtr<IDBKeyRange>& value)
: m_private(value)
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list