Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 11 insertions, 7 deletions

diff --git a/WebKit/chromium/src/WebIDBObjectStoreImpl.h b/WebKit/chromium/src/WebIDBObjectStoreImpl.h
index f59840f..4064b7f 100755
--- a/WebKit/chromium/src/WebIDBObjectStoreImpl.h
+++ b/WebKit/chromium/src/WebIDBObjectStoreImpl.h
@@ -41,15 +41,19 @@ class WebIDBIndex;
 class WebIDBObjectStoreImpl : public WebIDBObjectStore {
 public:
     WebIDBObjectStoreImpl(WTF::PassRefPtr<WebCore::IDBObjectStore> objectStore);
-    virtual ~WebIDBObjectStoreImpl();
+    ~WebIDBObjectStoreImpl();
 
-    virtual WebString name() const;
-    virtual WebString keyPath() const;
-    virtual WebDOMStringList indexNames() const;
+    WebString name() const;
+    WebString keyPath() const;
+    WebDOMStringList indexNames() const;
 
-    virtual void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks* callbacks);
-    virtual WebIDBIndex* index(const WebString& name);
-    virtual void removeIndex(const WebString& name, WebIDBCallbacks* callbacks);
+    void get(const WebIDBKey& key, WebIDBCallbacks*);
+    void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks*);
+    void remove(const WebIDBKey& key, WebIDBCallbacks*);
+
+    void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks* callbacks);
+    WebIDBIndex* index(const WebString& name);
+    void removeIndex(const WebString& name, WebIDBCallbacks* callbacks);
 
  private:
     WTF::RefPtr<WebCore::IDBObjectStore> m_objectStore;