Commit a815bc8c authored by jorlow@chromium.org's avatar jorlow@chromium.org

2010-06-27 Jeremy Orlow <jorlow@chromium.org>

        Reviewed by Dumitru Daniliuc.

        Implement IDBObjectStore.get/set/remove
        https://bugs.webkit.org/show_bug.cgi?id=41250

        Modify existing test to provide basic coverage for get/put/remove functions.

        * storage/indexeddb/script-tests/idb-objectstore-request.js:
        (test):
        (openSuccess):
        (createSuccess):
        (addSuccess):
        (getSuccess):
        (removeSuccess):
2010-06-27  Jeremy Orlow  <jorlow@chromium.org>

        Reviewed by Dumitru Daniliuc.

        Implement IDBObjectStore.get/set/remove
        https://bugs.webkit.org/show_bug.cgi?id=41250

        Implement these functions in IDBObjectStore,
        add plumbing, teach IDBAny/Callbacks how to deal
        with IDBKey, and a few small bits of cleanup.

        Test: Modified existing test to provide basic coverage.
              Will add much more extensive layout test coverage
              in future patches.

        * Android.derived.jscbindings.mk:
        * Android.derived.v8bindings.mk:
        * Android.jscbindings.mk:
        * Android.mk:
        * Android.v8bindings.mk:
        * CMakeLists.txt:
        * WebCore.gypi:
        * WebCore.pri:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/JSIDBAnyCustom.cpp:
        (WebCore::toJS):
        * bindings/v8/custom/V8IDBAnyCustom.cpp:
        (WebCore::toV8):
        * storage/IDBAny.cpp:
        (WebCore::IDBAny::idbKey):
        (WebCore::IDBAny::set):
        * storage/IDBAny.h:
        (WebCore::IDBAny::):
        * storage/IDBAny.idl:
        * storage/IDBCallbacks.h:
        * storage/IDBDatabaseRequest.h:
        * storage/IDBDatabaseRequest.idl:
        * storage/IDBKeyRange.h:
        * storage/IDBObjectStore.h:
        (WebCore::IDBObjectStore::):
        * storage/IDBObjectStoreImpl.cpp:
        (WebCore::IDBObjectStoreImpl::IDBObjectStoreImpl):
        (WebCore::IDBObjectStoreImpl::get):
        (WebCore::IDBObjectStoreImpl::set):
        (WebCore::IDBObjectStoreImpl::remove):
        * storage/IDBObjectStoreImpl.h:
        * storage/IDBObjectStoreRequest.cpp:
        (WebCore::IDBObjectStoreRequest::get):
        (WebCore::IDBObjectStoreRequest::add):
        (WebCore::IDBObjectStoreRequest::modify):
        (WebCore::IDBObjectStoreRequest::addOrModify):
        (WebCore::IDBObjectStoreRequest::remove):
        * storage/IDBObjectStoreRequest.h:
        * storage/IDBObjectStoreRequest.idl:
        * storage/IDBRequest.cpp:
        (WebCore::IDBRequest::onSuccess):
        * storage/IDBRequest.h:
2010-06-27  Jeremy Orlow  <jorlow@chromium.org>

        Reviewed by Dumitru Daniliuc.

        Implement IDBObjectStore.get/set/remove
        https://bugs.webkit.org/show_bug.cgi?id=41250

        Plumbing for new features, IDBKey, and added support
        for both invalid (i.e. not serializable) and null
        (i.e. the RefPtr was 0) to SerializedScriptValue.

        * WebKit.gyp:
        * public/WebIDBCallbacks.h:
        (WebKit::WebIDBCallbacks::onSuccess):
        * public/WebIDBKey.h: Added.
        (WebKit::WebIDBKey::WebIDBKey):
        (WebKit::WebIDBKey::operator=):
        (WebKit::WebIDBKey::):
        * public/WebIDBObjectStore.h:
        (WebKit::WebIDBObjectStore::get):
        (WebKit::WebIDBObjectStore::set):
        (WebKit::WebIDBObjectStore::remove):
        (WebKit::WebIDBObjectStore::createIndex):
        (WebKit::WebIDBObjectStore::index):
        (WebKit::WebIDBObjectStore::removeIndex):
        * public/WebSerializedScriptValue.h:
        * src/IDBCallbacksProxy.cpp:
        (WebCore::IDBCallbacksProxy::onSuccess):
        * src/IDBCallbacksProxy.h:
        * src/IDBObjectStoreProxy.cpp:
        (WebCore::IDBObjectStoreProxy::get):
        (WebCore::IDBObjectStoreProxy::set):
        (WebCore::IDBObjectStoreProxy::remove):
        * src/IDBObjectStoreProxy.h:
        * src/WebIDBCallbacksImpl.cpp:
        (WebCore::WebIDBCallbacksImpl::onSuccess):
        * src/WebIDBCallbacksImpl.h:
        * src/WebIDBKey.cpp: Added.
        (WebKit::WebIDBKey::~WebIDBKey):
        (WebKit::WebIDBKey::createNull):
        (WebKit::WebIDBKey::createInvalid):
        (WebKit::WebIDBKey::assign):
        (WebKit::WebIDBKey::assignNull):
        (WebKit::WebIDBKey::assignInvalid):
        (WebKit::WebIDBKey::type):
        (WebKit::WebIDBKey::string):
        (WebKit::WebIDBKey::number):
        (WebKit::WebIDBKey::WebIDBKey):
        (WebKit::WebIDBKey::operator=):
        (WebKit::WebIDBKey::operator PassRefPtr<IDBKey>):
        * src/WebIDBObjectStoreImpl.cpp:
        (WebKit::WebIDBObjectStoreImpl::get):
        (WebKit::WebIDBObjectStoreImpl::set):
        (WebKit::WebIDBObjectStoreImpl::remove):
        * src/WebIDBObjectStoreImpl.h:
        * src/WebSerializedScriptValue.cpp:
        (WebKit::WebSerializedScriptValue::createInvalid):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63064 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5c2308c3
2010-06-27 Jeremy Orlow <jorlow@chromium.org>
Reviewed by Dumitru Daniliuc.
Implement IDBObjectStore.get/set/remove
https://bugs.webkit.org/show_bug.cgi?id=41250
Modify existing test to provide basic coverage for get/put/remove functions.
* storage/indexeddb/script-tests/idb-objectstore-request.js:
(test):
(openSuccess):
(createSuccess):
(addSuccess):
(getSuccess):
(removeSuccess):
2010-07-10 Darin Adler <darin@apple.com>
Reviewed by Anders Carlsson.
......@@ -4,7 +4,7 @@ if (window.layoutTestController)
function test()
{
result = indexedDB.open('name', 'description');
result = evalAndLog("indexedDB.open('name', 'description')");
verifyResult(result);
result.onsuccess = openSuccess;
result.onerror = unexpectedErrorCallback;
......@@ -12,17 +12,14 @@ function test()
function openSuccess()
{
debug("openSuccess():");
verifySuccessEvent(event);
var db = evalAndLog("db = event.result");
createObjectStore(db);
}
function createObjectStore(db)
{
// FIXME: remove any previously created object stores.
// This requires IDBDatabaseRequest::removeObjectStore to be implemented.
result = db.createObjectStore('storeName', 'keyPath');
result = evalAndLog("db.createObjectStore('storeName', null)");
verifyResult(result);
result.onsuccess = createSuccess;
result.onerror = unexpectedErrorCallback;
......@@ -30,12 +27,51 @@ function createObjectStore(db)
function createSuccess()
{
debug("createSuccess():");
verifySuccessEvent(event);
var store = evalAndLog("store = event.result");
shouldBeEqualToString("store.name", "storeName");
shouldBeEqualToString("store.keyPath", "keyPath");
shouldBeNull("store.keyPath");
// FIXME: test store.indexNames, as well as all object store's methods.
result = evalAndLog("store.add('value', 'key')");
verifyResult(result);
result.onsuccess = addSuccess;
result.onerror = unexpectedErrorCallback;
}
function addSuccess()
{
debug("addSuccess():");
verifySuccessEvent(event);
shouldBeEqualToString("event.result", "key");
var store = evalAndLog("store = event.source");
result = evalAndLog("store.get('key')");
verifyResult(result);
result.onsuccess = getSuccess;
result.onerror = unexpectedErrorCallback;
}
function getSuccess()
{
debug("getSuccess():");
verifySuccessEvent(event);
shouldBeEqualToString("event.result", "value");
var store = evalAndLog("store = event.source");
result = evalAndLog("store.remove('key')");
verifyResult(result);
result.onsuccess = removeSuccess;
result.onerror = unexpectedErrorCallback;
}
function removeSuccess()
{
debug("removeSuccess():");
verifySuccessEvent(event);
shouldBeNull("event.result");
done();
}
......
......@@ -367,6 +367,7 @@ GEN := \
$(intermediates)/storage/JSIDBErrorEvent.h \
$(intermediates)/storage/JSIDBEvent.h \
$(intermediates)/storage/JSIDBIndexRequest.h \
$(intermediates)/storage/JSIDBKey.h \
$(intermediates)/storage/JSIDBKeyRange.h \
$(intermediates)/storage/JSIDBRequest.h \
$(intermediates)/storage/JSIDBSuccessEvent.h \
......
......@@ -348,6 +348,7 @@ GEN := \
$(intermediates)/bindings/V8IDBErrorEvent.h \
$(intermediates)/bindings/V8IDBEvent.h \
$(intermediates)/bindings/V8IDBIndexRequest.h \
$(intermediates)/bindings/V8IDBKey.h \
$(intermediates)/bindings/V8IDBKeyRange.h \
$(intermediates)/bindings/V8IDBRequest.h \
$(intermediates)/bindings/V8IDBSuccessEvent.h \
......
......@@ -58,6 +58,7 @@ BINDING_C_INCLUDES := \
LOCAL_SRC_FILES += \
bindings/js/GCController.cpp \
bindings/js/IDBBindingUtilities.cpp \
bindings/js/JSAttrCustom.cpp \
bindings/js/JSAudioConstructor.cpp \
bindings/js/JSCDATASectionCustom.cpp \
......@@ -115,6 +116,8 @@ LOCAL_SRC_FILES += \
bindings/js/JSHTMLOptionsCollectionCustom.cpp \
bindings/js/JSHTMLSelectElementCustom.cpp \
bindings/js/JSHistoryCustom.cpp \
bindings/js/JSIDBAnyCustom.cpp \
bindings/js/JSIDBKeyCustom.cpp \
bindings/js/JSImageConstructor.cpp \
bindings/js/JSImageDataCustom.cpp \
bindings/js/JSLazyEventListener.cpp \
......
......@@ -739,6 +739,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
storage/IDBEvent.cpp \
storage/IDBIndexImpl.cpp \
storage/IDBIndexRequest.cpp \
storage/IDBKey.cpp \
storage/IDBKeyRange.cpp \
storage/IDBObjectStoreImpl.cpp \
storage/IDBObjectStoreRequest.cpp \
......
......@@ -42,6 +42,7 @@ LOCAL_SRC_FILES += \
bindings/v8/DateExtension.cpp \
bindings/v8/DOMData.cpp \
bindings/v8/DOMDataStore.cpp \
bindings/v8/IDBBindingUtilities.cpp \
bindings/v8/MainThreadDOMData.cpp \
bindings/v8/NPV8Object.cpp \
bindings/v8/RuntimeEnabledFeatures.cpp \
......@@ -101,7 +102,7 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8CustomSQLTransactionCallback.cpp \
bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp \
bindings/v8/custom/V8CustomVoidCallback.cpp \
bindings/v8/custom/V8DOMFormDataCustom.cpp \
bindings/v8/custom/V8DOMFormDataCustom.cpp \
bindings/v8/custom/V8DOMWindowCustom.cpp \
bindings/v8/custom/V8DataGridColumnListCustom.cpp \
bindings/v8/custom/V8DatabaseCallback.cpp \
......@@ -114,6 +115,8 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8EventSourceConstructor.cpp \
bindings/v8/custom/V8FileListCustom.cpp \
bindings/v8/custom/V8GeolocationCustom.cpp \
bindings/v8/custom/V8IDBAny.cpp \
bindings/v8/custom/V8IDBKey.cpp \
bindings/v8/custom/V8HTMLAllCollectionCustom.cpp \
bindings/v8/custom/V8HTMLAudioElementConstructor.cpp \
bindings/v8/custom/V8HTMLCanvasElementCustom.cpp \
......
......@@ -335,6 +335,7 @@ SET(WebCore_IDL_FILES
storage/IDBErrorEvent.idl
storage/IDBEvent.idl
storage/IDBIndexRequest.idl
storage/IDBKey.idl
storage/IDBKeyRange.idl
storage/IDBObjectStoreRequest.idl
storage/IDBRequest.idl
......@@ -556,6 +557,7 @@ SET(WebCore_SOURCES
bindings/js/DOMObjectHashTableMap.cpp
bindings/js/DOMWrapperWorld.cpp
bindings/js/GCController.cpp
bindings/js/IDBBindingUtilities.cpp
bindings/js/JavaScriptCallFrame.cpp
bindings/js/JSAttrCustom.cpp
bindings/js/JSCallbackData.cpp
......@@ -599,6 +601,8 @@ SET(WebCore_SOURCES
bindings/js/JSExceptionBase.cpp
bindings/js/JSGeolocationCustom.cpp
bindings/js/JSHistoryCustom.cpp
bindings/js/JSIDBAnyCustom.cpp
bindings/js/JSIDBKeyCustom.cpp
bindings/js/JSHTMLAllCollectionCustom.cpp
bindings/js/JSHTMLAppletElementCustom.cpp
bindings/js/JSHTMLCanvasElementCustom.cpp
......@@ -1406,6 +1410,7 @@ SET(WebCore_SOURCES
storage/IDBDatabaseRequest.cpp
storage/IDBErrorEvent.cpp
storage/IDBEvent.cpp
storage/IDBKey.cpp
storage/IDBKeyRange.cpp
storage/IDBRequest.cpp
storage/IDBObjectStoreImpl.cpp
......
2010-06-27 Jeremy Orlow <jorlow@chromium.org>
Reviewed by Dumitru Daniliuc.
Implement IDBObjectStore.get/set/remove
https://bugs.webkit.org/show_bug.cgi?id=41250
Implement these functions in IDBObjectStore,
add plumbing, teach IDBAny/Callbacks how to deal
with IDBKey, and a few small bits of cleanup.
Test: Modified existing test to provide basic coverage.
Will add much more extensive layout test coverage
in future patches.
* Android.derived.jscbindings.mk:
* Android.derived.v8bindings.mk:
* Android.jscbindings.mk:
* Android.mk:
* Android.v8bindings.mk:
* CMakeLists.txt:
* WebCore.gypi:
* WebCore.pri:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSIDBAnyCustom.cpp:
(WebCore::toJS):
* bindings/v8/custom/V8IDBAnyCustom.cpp:
(WebCore::toV8):
* storage/IDBAny.cpp:
(WebCore::IDBAny::idbKey):
(WebCore::IDBAny::set):
* storage/IDBAny.h:
(WebCore::IDBAny::):
* storage/IDBAny.idl:
* storage/IDBCallbacks.h:
* storage/IDBDatabaseRequest.h:
* storage/IDBDatabaseRequest.idl:
* storage/IDBKeyRange.h:
* storage/IDBObjectStore.h:
(WebCore::IDBObjectStore::):
* storage/IDBObjectStoreImpl.cpp:
(WebCore::IDBObjectStoreImpl::IDBObjectStoreImpl):
(WebCore::IDBObjectStoreImpl::get):
(WebCore::IDBObjectStoreImpl::set):
(WebCore::IDBObjectStoreImpl::remove):
* storage/IDBObjectStoreImpl.h:
* storage/IDBObjectStoreRequest.cpp:
(WebCore::IDBObjectStoreRequest::get):
(WebCore::IDBObjectStoreRequest::add):
(WebCore::IDBObjectStoreRequest::modify):
(WebCore::IDBObjectStoreRequest::addOrModify):
(WebCore::IDBObjectStoreRequest::remove):
* storage/IDBObjectStoreRequest.h:
* storage/IDBObjectStoreRequest.idl:
* storage/IDBRequest.cpp:
(WebCore::IDBRequest::onSuccess):
* storage/IDBRequest.h:
2010-07-11 Maciej Stachowiak <mjs@apple.com>
Reviewed by Dan Bernstein.
......@@ -182,6 +182,7 @@
#include "JSIDBErrorEvent.cpp"
#include "JSIDBEvent.cpp"
#include "JSIDBIndexRequest.cpp"
#include "JSIDBKey.cpp"
#include "JSIDBKeyRange.cpp"
#include "JSIDBObjectStoreRequest.cpp"
#include "JSIDBRequest.cpp"
......
......@@ -225,6 +225,7 @@ DOM_CLASSES = \
IDBErrorEvent \
IDBEvent \
IDBIndexRequest \
IDBKey \
IDBKeyRange \
IDBObjectStoreRequest \
IDBRequest \
......
......@@ -238,6 +238,7 @@
'storage/IDBErrorEvent.idl',
'storage/IDBEvent.idl',
'storage/IDBIndexRequest.idl',
'storage/IDBKey.idl',
'storage/IDBKeyRange.idl',
'storage/IDBObjectStoreRequest.idl',
'storage/IDBRequest.idl',
......@@ -698,6 +699,8 @@
'bindings/ScriptControllerBase.h',
'bindings/v8/ChildThreadDOMData.cpp',
'bindings/v8/ChildThreadDOMData.h',
'bindings/v8/IDBBindingUtilities.cpp',
'bindings/v8/IDBBindingUtilities.h',
'bindings/v8/custom/V8CanvasPixelArrayCustom.cpp',
'bindings/v8/custom/V8ArrayBufferViewCustom.h',
'bindings/v8/custom/V8ArrayBufferViewCustom.cpp',
......@@ -764,6 +767,7 @@
'bindings/v8/custom/V8HTMLSelectElementCustom.cpp',
'bindings/v8/custom/V8HTMLSelectElementCustom.h',
'bindings/v8/custom/V8IDBAnyCustom.cpp',
'bindings/v8/custom/V8IDBKeyCustom.cpp',
'bindings/v8/custom/V8InjectedScriptHostCustom.cpp',
'bindings/v8/custom/V8InspectorFrontendHostCustom.cpp',
'bindings/v8/custom/V8JavaScriptCallFrameCustom.cpp',
......@@ -3458,8 +3462,11 @@
'storage/IDBIndexImpl.h',
'storage/IDBIndexRequest.cpp',
'storage/IDBIndexRequest.h',
'storage/IDBKey.cpp',
'storage/IDBKey.h',
'storage/IDBKeyRange.cpp',
'storage/IDBKeyRange.h',
'storage/IDBKeyTree.h',
'storage/IDBObjectStore.h',
'storage/IDBObjectStoreImpl.cpp',
'storage/IDBObjectStoreImpl.h',
......
......@@ -489,6 +489,7 @@ IDL_BINDINGS += \
storage/IDBErrorEvent.idl \
storage/IDBEvent.idl \
storage/IDBIndexRequest.idl \
storage/IDBKey.idl \
storage/IDBKeyRange.idl \
storage/IDBObjectStoreRequest.idl \
storage/IDBRequest.idl \
......
......@@ -2382,6 +2382,7 @@ contains(DEFINES, ENABLE_DATABASE=1) {
contains(DEFINES, ENABLE_INDEXED_DATABASE=1) {
HEADERS += \
bindings/js/IDBBindingUtilities.h \
storage/IDBAny.h \
storage/IDBCallbacks.h \
storage/IDBDatabase.h \
......@@ -2394,6 +2395,7 @@ contains(DEFINES, ENABLE_INDEXED_DATABASE=1) {
storage/IDBIndex.h \
storage/IDBIndexImpl.h \
storage/IDBIndexRequest.h \
storage/IDBKey.h \
storage/IDBKeyRange.h \
storage/IDBObjectStore.h \
storage/IDBObjectStoreImpl.h \
......@@ -2405,7 +2407,9 @@ contains(DEFINES, ENABLE_INDEXED_DATABASE=1) {
storage/IndexedDatabaseRequest.h
SOURCES += \
bindings/js/IDBBindingUtilities.cpp \
bindings/js/JSIDBAnyCustom.cpp \
bindings/js/JSIDBKeyCustom.cpp \
storage/IDBAny.cpp \
storage/IDBDatabaseImpl.cpp \
storage/IDBDatabaseRequest.cpp \
......@@ -2413,6 +2417,7 @@ contains(DEFINES, ENABLE_INDEXED_DATABASE=1) {
storage/IDBEvent.cpp \
storage/IDBIndexImpl.cpp \
storage/IDBIndexRequest.cpp \
storage/IDBKey.cpp \
storage/IDBKeyRange.cpp \
storage/IDBObjectStoreImpl.cpp \
storage/IDBObjectStoreRequest.cpp \
......
......@@ -43944,6 +43944,170 @@
</FileConfiguration>
</File>
<File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKey.cpp"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Internal|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Cairo|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Cairo|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKey.h"
>
</File>
<File
RelativePath="..\bindings\js\JSIDBKeyCustom.cpp"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Internal|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Cairo|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Cairo|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\bindings\js\IDBBindingUtilities.cpp"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Internal|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Cairo|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Cairo|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\bindings\js\IDBBindingUtilities.h"
>
</File>
<File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.cpp"
>
<FileConfiguration
......@@ -49668,6 +49832,14 @@
RelativePath="..\storage\IDBIndexRequest.h"
>
</File>
<File
RelativePath="..\storage\IDBKey.cpp"
>
</File>
<File
RelativePath="..\storage\IDBKey.h"
>
</File>
<File
RelativePath="..\storage\IDBKeyRange.cpp"
>
This diff is collapsed.
......@@ -26,10 +26,10 @@
#include "config.h"
#include "IDBBindingUtilities.h"
#include "IDBKey.h"
#if ENABLE(INDEXED_DATABASE)
#include "IDBKey.h"
namespace WebCore {
PassRefPtr<IDBKey> createIDBKeyFromValue(JSC::ExecState* exec, JSC::JSValue value)
......
......@@ -26,11 +26,11 @@
#ifndef IDBBindingUtilities_h
#define IDBBindingUtilities_h
#include "ScriptValue.h"
#include <wtf/PassRefPtr.h>
#if ENABLE(INDEXED_DATABASE)
#include "ScriptValue.h"
#include <wtf/Forward.h>
namespace WebCore {
class IDBKey;
......
......@@ -11,9 +11,6 @@
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
......@@ -37,10 +34,12 @@
#include "IDBAny.h"
#include "IDBDatabaseRequest.h"
#include "IDBIndexRequest.h"
#include "IDBKey.h"
#include "IDBObjectStoreRequest.h"
#include "IndexedDatabaseRequest.h"
#include "JSIDBDatabaseRequest.h"
#include "JSIDBIndexRequest.h"
#include "JSIDBKey.h"
#include "JSIDBObjectStoreRequest.h"
#include "JSIndexedDatabaseRequest.h"
#include "SerializedScriptValue.h"
......@@ -63,6 +62,8 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, IDBAny* idbAny)
return toJS(exec, globalObject, idbAny->idbDatabaseRequest());
case IDBAny::IDBIndexRequestType:
return toJS(exec, globalObject, idbAny->idbIndexRequest());
case IDBAny::IDBKeyType:
return toJS(exec, globalObject, idbAny->idbKey());
case IDBAny::IDBObjectStoreRequestType:
return toJS(exec, globalObject, idbAny->idbObjectStoreRequest());
case IDBAny::IndexedDatabaseRequestType:
......
......@@ -26,11 +26,11 @@
#include "config.h"
#include "IDBBindingUtilities.h"
#if ENABLE(INDEXED_DATABASE)
#include "IDBKey.h"
#include "V8Binding.h"
#if ENABLE(INDEXED_DATABASE)
namespace WebCore {
PassRefPtr<IDBKey> createIDBKeyFromValue(v8::Handle<v8::Value> value)
......
......@@ -26,11 +26,11 @@
#ifndef IDBBindingUtilities_h
#define IDBBindingUtilities_h
#include <v8.h>
#include <wtf/PassRefPtr.h>
#if ENABLE(INDEXED_DATABASE)