Title: [128773] trunk/Source/WebKit/chromium
- Revision
- 128773
- Author
- [email protected]
- Date
- 2012-09-17 10:13:44 -0700 (Mon, 17 Sep 2012)
Log Message
[Chromium] IndexedDB: Remove legacy two-phase open() API members
https://bugs.webkit.org/show_bug.cgi?id=96802
Reviewed by Tony Chang.
Following http://webkit.org/b/90411 and subsequent cleanup on the Chromium side,
these entry points are no longer needed.
* public/WebIDBDatabase.h: Delete old second-phase open(db-callbacks)
* public/WebIDBFactory.h: Delete old first-phase open() w/o db-callbacks
* src/WebIDBDatabaseImpl.cpp: No longer need to account for a close between phases.
(WebKit::WebIDBDatabaseImpl::WebIDBDatabaseImpl):
(WebKit::WebIDBDatabaseImpl::close):
(WebKit::WebIDBDatabaseImpl::forceClose):
* src/WebIDBDatabaseImpl.h:
(WebIDBDatabaseImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (128772 => 128773)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-17 17:03:45 UTC (rev 128772)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-17 17:13:44 UTC (rev 128773)
@@ -1,3 +1,22 @@
+2012-09-17 Joshua Bell <[email protected]>
+
+ [Chromium] IndexedDB: Remove legacy two-phase open() API members
+ https://bugs.webkit.org/show_bug.cgi?id=96802
+
+ Reviewed by Tony Chang.
+
+ Following http://webkit.org/b/90411 and subsequent cleanup on the Chromium side,
+ these entry points are no longer needed.
+
+ * public/WebIDBDatabase.h: Delete old second-phase open(db-callbacks)
+ * public/WebIDBFactory.h: Delete old first-phase open() w/o db-callbacks
+ * src/WebIDBDatabaseImpl.cpp: No longer need to account for a close between phases.
+ (WebKit::WebIDBDatabaseImpl::WebIDBDatabaseImpl):
+ (WebKit::WebIDBDatabaseImpl::close):
+ (WebKit::WebIDBDatabaseImpl::forceClose):
+ * src/WebIDBDatabaseImpl.h:
+ (WebIDBDatabaseImpl):
+
2012-09-17 Ilya Tikhonovsky <[email protected]>
Unreviewed. Temporary disable visited set counter check.
Modified: trunk/Source/WebKit/chromium/public/WebIDBDatabase.h (128772 => 128773)
--- trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2012-09-17 17:03:45 UTC (rev 128772)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2012-09-17 17:13:44 UTC (rev 128773)
@@ -66,9 +66,6 @@
virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void forceClose() { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Remove this method after WK90411 cleanup is complete on the Chromium side.
- virtual void open(WebIDBDatabaseCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
-
protected:
WebIDBDatabase() { }
};
Modified: trunk/Source/WebKit/chromium/public/WebIDBFactory.h (128772 => 128773)
--- trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2012-09-17 17:03:45 UTC (rev 128772)
+++ trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2012-09-17 17:13:44 UTC (rev 128773)
@@ -55,11 +55,7 @@
virtual void getDatabaseNames(WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Remove this overload after WK90411 cleanup is complete on the Chromium side.
// The WebKit implementation of open ignores the WebFrame* parameter.
- virtual void open(const WebString& name, long long version, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
-
- // The WebKit implementation of open ignores the WebFrame* parameter.
virtual void open(const WebString& name, long long version, WebIDBCallbacks* callbacks, WebIDBDatabaseCallbacks* databaseCallbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void deleteDatabase(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp (128772 => 128773)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp 2012-09-17 17:03:45 UTC (rev 128772)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp 2012-09-17 17:13:44 UTC (rev 128773)
@@ -48,7 +48,6 @@
WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabaseBackendInterface> databaseBackend, WTF::PassRefPtr<IDBDatabaseCallbacksProxy> databaseCallbacks)
: m_databaseBackend(databaseBackend)
, m_databaseCallbacks(databaseCallbacks)
- , m_closePending(false)
{
}
@@ -96,19 +95,15 @@
{
// Use the callbacks passed in to the constructor so that the backend in
// multi-process chromium knows which database connection is closing.
- if (!m_databaseCallbacks) {
- m_closePending = true;
+ if (!m_databaseCallbacks)
return;
- }
m_databaseBackend->close(m_databaseCallbacks.release());
}
void WebIDBDatabaseImpl::forceClose()
{
- if (!m_databaseCallbacks) {
- m_closePending = true;
+ if (!m_databaseCallbacks)
return;
- }
RefPtr<IDBDatabaseCallbacksProxy> callbacks = m_databaseCallbacks.release();
m_databaseBackend->close(callbacks);
callbacks->onForcedClose();
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h (128772 => 128773)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h 2012-09-17 17:03:45 UTC (rev 128772)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h 2012-09-17 17:13:44 UTC (rev 128773)
@@ -62,9 +62,6 @@
private:
WTF::RefPtr<WebCore::IDBDatabaseBackendInterface> m_databaseBackend;
WTF::RefPtr<IDBDatabaseCallbacksProxy> m_databaseCallbacks;
- // FIXME: Remove this flag when we consolidate two-phase open.
- // http://wkb.ug/90411
- bool m_closePending;
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
