Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

1 files changed, 6 insertions, 13 deletions

diff --git a/WebKit/chromium/src/WebIDBCallbacksImpl.h b/WebKit/chromium/src/WebIDBCallbacksImpl.h
index 9b53117..8e5ada7 100644
--- a/WebKit/chromium/src/WebIDBCallbacksImpl.h
+++ b/WebKit/chromium/src/WebIDBCallbacksImpl.h
@@ -10,9 +10,6 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -35,24 +32,20 @@
 
 #if ENABLE(INDEXED_DATABASE)
 
-namespace WebKit {
-class WebIDBDatabase;
-class WebIDBDatabaseError;
-class WebSerializedScriptValue;
-}
-
 namespace WebCore {
 
 class IDBCallbacks;
 
 class WebIDBCallbacksImpl : public WebKit::WebIDBCallbacks {
 public:
-    WebIDBCallbacksImpl(PassRefPtr<IDBCallbacks> callbacks);
+    WebIDBCallbacksImpl(PassRefPtr<IDBCallbacks>);
     virtual ~WebIDBCallbacksImpl();
 
-    virtual void onError(const WebKit::WebIDBDatabaseError& error);
-    virtual void onSuccess(WebKit::WebIDBDatabase* webKitInstance);
-    virtual void onSuccess(const WebKit::WebSerializedScriptValue& serializedScriptValue);
+    virtual void onError(const WebKit::WebIDBDatabaseError&);
+    virtual void onSuccess(); // For "null".
+    virtual void onSuccess(WebKit::WebIDBDatabase*);
+    virtual void onSuccess(WebKit::WebIDBIndex*);
+    virtual void onSuccess(const WebKit::WebSerializedScriptValue&);
 
 private:
     RefPtr<IDBCallbacks> m_callbacks;