Attachment #185904 for bug #103923

View Details Raw Unified Return to Bug 103923

| Differences between



2013-01-31  Alec Flett  <alecflett@chromium.org>

        IndexedDB: remove old transaction backend bootstrap code
        https://bugs.webkit.org/show_bug.cgi?id=103923

        Reviewed by Dimitri Glazkov.

        Finally remove all leftover code from the IndexedDB "giant
        async refactor of 2012." This includes removal of all
        IDBTransaction* interfaces that were shared between
        the frontend and backend and a few straggling methods
        like onUpgradeNeeded and onSuccess that were left from
        the last stage of refactoring.

        * Modules/indexeddb/IDBCallbacks.h:
        * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
        * Modules/indexeddb/IDBDatabaseBackendImpl.h:
        (WebCore):
        (WebCore::IDBDatabaseBackendImpl::metadata):
        (IDBDatabaseBackendImpl):
        * Modules/indexeddb/IDBDatabaseBackendInterface.h:
        (WebCore):
        (IDBDatabaseBackendInterface):
        * Modules/indexeddb/IDBObjectStoreBackendImpl.h:
        (WebCore):
        * Modules/indexeddb/IDBTransaction.h:
        (WebCore):
        (IDBTransaction):
        * Modules/indexeddb/IDBTransactionBackendImpl.h:
        (WebCore):
        (IDBTransactionBackendImpl):
        * Modules/indexeddb/IDBTransactionBackendInterface.h: Removed.
        * Modules/indexeddb/IDBTransactionCallbacks.h: Removed.
        * Modules/indexeddb/IDBTransactionCoordinator.h:
        (WebCore):
        * Target.pri:
        * WebCore.gypi:
        * WebCore.xcodeproj/project.pbxproj:

2013-01-31  Dmitry Zvorygin  <zvorygin@chromium.org>

        Web Inspector: searching for <u> in elements panel finds all tags containing "u"



2013-01-31  Alec Flett  <alecflett@chromium.org>

        IndexedDB: remove old transaction backend bootstrap code
        https://bugs.webkit.org/show_bug.cgi?id=103923

        Reviewed by Dimitri Glazkov.

        Remove all deprecated WebKit APIs from
        the IDB backend.

        * WebKit.gyp:
        * public/WebIDBCallbacks.h:
        (WebKit):
        * public/WebIDBDatabase.h:
        (WebKit):
        * public/WebIDBTransaction.h: Removed.
        * public/WebIDBTransactionCallbacks.h: Removed.
        * src/AssertMatchingEnums.cpp:
        * src/IDBCallbacksProxy.cpp:
        * src/IDBDatabaseBackendProxy.cpp:
        * src/IDBDatabaseBackendProxy.h:
        (IDBDatabaseBackendProxy):
        * src/IDBTransactionBackendProxy.cpp: Removed.
        * src/IDBTransactionBackendProxy.h: Removed.
        * src/IDBTransactionCallbacksProxy.cpp: Removed.
        * src/IDBTransactionCallbacksProxy.h: Removed.
        * src/WebIDBCallbacksImpl.cpp:
        * src/WebIDBDatabaseImpl.cpp:
        (WebKit):
        * src/WebIDBDatabaseImpl.h:
        (WebKit):
        (WebIDBDatabaseImpl):
        * src/WebIDBTransactionCallbacksImpl.cpp: Removed.
        * src/WebIDBTransactionCallbacksImpl.h: Removed.
        * src/WebIDBTransactionImpl.cpp: Removed.
        * src/WebIDBTransactionImpl.h: Removed.
        * tests/IDBAbortOnCorruptTest.cpp:
        * tests/IDBDatabaseBackendTest.cpp:

2013-01-31  Alec Flett  <alecflett@chromium.org>

        IndexedDB: Remove WebKit API for old onSuccess/onUpgradeNeeded
        https://bugs.webkit.org/show_bug.cgi?id=108399


Lines 33-39 a/Source/WebCore/Modules/indexeddb/IDBCallbacks.h_sec1
- a/Source/WebCore/Modules/indexeddb/IDBCallbacks.h -1 lines
33	#include "IDBDatabaseError.h"	33	#include "IDBDatabaseError.h"
34	#include "IDBKey.h"	34	#include "IDBKey.h"
35	#include "IDBKeyPath.h"	35	#include "IDBKeyPath.h"
36	#include "IDBTransactionBackendInterface.h"
37	#include "SerializedScriptValue.h"	36	#include "SerializedScriptValue.h"
38	#include <wtf/RefCounted.h>	37	#include <wtf/RefCounted.h>
39		38



    return m_backingStore;
}

IDBDatabaseMetadata IDBDatabaseBackendImpl::metadata() const
{
    return m_metadata;
}

void IDBDatabaseBackendImpl::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
{
    IDB_TRACE("IDBDatabaseBackendImpl::createObjectStore");

    }
}

// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendImpl::createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode mode)
{
    ASSERT_NOT_REACHED();
    return 0;
}

void IDBDatabaseBackendImpl::createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode)
{
    RefPtr<IDBTransactionBackendImpl> transaction = IDBTransactionBackendImpl::create(transactionId, callbacks, objectStoreIds, static_cast<IDBTransaction::Mode>(mode), this);



class IDBDatabase;
class IDBFactoryBackendImpl;
class IDBTransactionBackendImpl;
class IDBTransactionBackendInterface;
class IDBTransactionCoordinator;

class IDBDatabaseBackendImpl : public IDBDatabaseBackendInterface {


    void openConnection(PassRefPtr<IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>, int64_t transactionId, int64_t version);
    void deleteDatabase(PassRefPtr<IDBCallbacks>);
    const IDBDatabaseMetadata& metadata() const { return m_metadata; }

    // IDBDatabaseBackendInterface
    virtual IDBDatabaseMetadata metadata() const;
    virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement);
    virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);
    // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode);
    virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode);
    virtual void close(PassRefPtr<IDBDatabaseCallbacks>);




class IDBKey;
class IDBKeyPath;
class IDBKeyRange;
class IDBTransactionBackendInterface;
struct IDBDatabaseMetadata;

typedef int ExceptionCode;

public:
    virtual ~IDBDatabaseBackendInterface() { }

    virtual IDBDatabaseMetadata metadata() const = 0;

    virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) = 0;
    virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) = 0;
    virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode) = 0;
    virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode) = 0;
    virtual void close(PassRefPtr<IDBDatabaseCallbacks>) = 0;


Lines 39-45 namespace WebCore { a/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h_sec1
- a/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h -1 lines
39		39
40	class IDBDatabaseBackendImpl;	40	class IDBDatabaseBackendImpl;
41	class IDBTransactionBackendImpl;	41	class IDBTransactionBackendImpl;
42	class IDBTransactionBackendInterface;
43	struct IDBObjectStoreMetadata;	42	struct IDBObjectStoreMetadata;
44		43
45	// FIXME: this namespace is temporary until we move its contents out to their own home.	44	// FIXME: this namespace is temporary until we move its contents out to their own home.



#include "EventNames.h"
#include "EventTarget.h"
#include "IDBMetadata.h"
#include "IDBTransactionCallbacks.h"
#include "ScriptWrappable.h"
#include <wtf/HashSet.h>
#include <wtf/RefCounted.h>


class IDBCursor;
class IDBDatabase;
class IDBDatabaseBackendInterface;
class IDBDatabaseError;
class IDBObjectStore;
class IDBOpenDBRequest;
class IDBDatabaseBackendInterface;
struct IDBObjectStoreMetadata;

class IDBTransaction : public ScriptWrappable, public RefCounted<IDBTransaction>, public EventTarget, public ActiveDOMObject {
public:
    enum Mode {
        READ_ONLY = 0,

    DEFINE_ATTRIBUTE_EVENT_LISTENER(complete);
    DEFINE_ATTRIBUTE_EVENT_LISTENER(error);

    // IDBTransactionCallbacks
    virtual void onAbort(PassRefPtr<IDBDatabaseError>);
    virtual void onComplete();


    virtual bool canSuspend() const OVERRIDE;
    virtual void stop() OVERRIDE;

    using RefCounted<IDBTransaction>::ref;
    using RefCounted<IDBTransaction>::deref;

private:
    IDBTransaction(ScriptExecutionContext*, int64_t, const Vector<String>&, Mode, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata&);



#if ENABLE(INDEXED_DATABASE)

#include "IDBBackingStore.h"
#include "IDBDatabaseBackendInterface.h"
#include "IDBDatabaseError.h"
#include "IDBTransaction.h"
#include "IDBTransactionBackendInterface.h"
#include "IDBTransactionCallbacks.h"
#include "Timer.h"
#include <wtf/Deque.h>
#include <wtf/HashSet.h>

namespace WebCore {

class IDBDatabaseBackendImpl;
class IDBCursorBackendImpl;
class IDBDatabaseCallbacks;

class IDBTransactionBackendImpl : public RefCounted<IDBTransactionBackendImpl> {
public:
    static PassRefPtr<IDBTransactionBackendImpl> create(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IDBTransaction::Mode, IDBDatabaseBackendImpl*);
    static IDBTransactionBackendImpl* from(IDBTransactionBackendInterface* interface)
    {
        return static_cast<IDBTransactionBackendImpl*>(interface);
    }
    virtual ~IDBTransactionBackendImpl();

    // IDBTransactionBackendInterface
    virtual void abort();
    void commit();
    virtual void setCallbacks(IDBTransactionCallbacks* callbacks) { }

    class Operation {
    public:



/*
 * Copyright (C) 2010 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef IDBTransactionBackendInterface_h
#define IDBTransactionBackendInterface_h

#include "IDBCallbacks.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>

#if ENABLE(INDEXED_DATABASE)

namespace WebCore {

class IDBCursorBackendImpl;
class IDBTransactionCallbacks;

typedef int ExceptionCode;

// This is implemented by IDBTransactionBackendImpl and optionally others (in order to proxy
// calls across process barriers). All calls to these classes should be non-blocking and
// trigger work on a background thread if necessary.
class IDBTransactionBackendInterface : public RefCounted<IDBTransactionBackendInterface> {
public:
    virtual ~IDBTransactionBackendInterface() { }
    virtual void commit() = 0;
    virtual void abort() = 0;
    virtual void setCallbacks(IDBTransactionCallbacks*) = 0;
};

} // namespace WebCore

#endif

#endif // IDBTransactionBackendInterface_h



/*
 * Copyright (C) 2010 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef IDBTransactionCallbacks_h
#define IDBTransactionCallbacks_h

#if ENABLE(INDEXED_DATABASE)

#include "IDBDatabaseError.h"
#include <wtf/RefCounted.h>

namespace WebCore {

class IDBTransactionCallbacks : public RefCounted<IDBTransactionCallbacks> {
public:
    virtual ~IDBTransactionCallbacks() { }

    virtual void onAbort(PassRefPtr<IDBDatabaseError>) = 0;
    virtual void onComplete() = 0;
};

} // namespace WebCore

#endif

#endif // IDBTransactionCallbacks_h

Lines 35-41 a/Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.h_sec1
- a/Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.h -1 lines
35	namespace WebCore {	35	namespace WebCore {
36		36
37	class IDBTransactionBackendImpl;	37	class IDBTransactionBackendImpl;
38	class IDBTransactionCallbacks;
39	class IDBDatabaseBackendImpl;	38	class IDBDatabaseBackendImpl;
40		39
41	// Transactions are executed in the order the were created.	40	// Transactions are executed in the order the were created.



        Modules/indexeddb/IDBObjectStore.h \
        Modules/indexeddb/IDBObjectStoreBackendImpl.h \
        Modules/indexeddb/IDBRequest.h \
        Modules/indexeddb/IDBTransaction.h
        Modules/indexeddb/IDBTransactionBackendInterface.h

    SOURCES += \
        bindings/js/IDBBindingUtilities.cpp \



            'Modules/indexeddb/IDBTransaction.h',
            'Modules/indexeddb/IDBTransactionBackendImpl.cpp',
            'Modules/indexeddb/IDBTransactionBackendImpl.h',
            'Modules/indexeddb/IDBTransactionBackendInterface.h',
            'Modules/indexeddb/IDBTransactionCallbacks.h',
            'Modules/indexeddb/IDBTransactionCoordinator.cpp',
            'Modules/indexeddb/IDBTransactionCoordinator.h',
            'Modules/indexeddb/IDBVersionChangeEvent.cpp',



		9712A5F615004EDA0048AF10 /* IDBTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A59D15004EDA0048AF10 /* IDBTransaction.h */; };
		9712A5F815004EDA0048AF10 /* IDBTransactionBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */; };
		9712A5F915004EDA0048AF10 /* IDBTransactionBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */; };
		9712A5FA15004EDA0048AF10 /* IDBTransactionBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5A115004EDA0048AF10 /* IDBTransactionBackendInterface.h */; };
		9712A5FB15004EDA0048AF10 /* IDBTransactionCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */; };
		9712A5FC15004EDA0048AF10 /* IDBTransactionCoordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */; };
		9712A5FD15004EDA0048AF10 /* IDBTransactionCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5A415004EDA0048AF10 /* IDBTransactionCoordinator.h */; };

		9712A59E15004EDA0048AF10 /* IDBTransaction.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDBTransaction.idl; path = Modules/indexeddb/IDBTransaction.idl; sourceTree = "<group>"; };
		9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBTransactionBackendImpl.cpp; path = Modules/indexeddb/IDBTransactionBackendImpl.cpp; sourceTree = "<group>"; };
		9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionBackendImpl.h; path = Modules/indexeddb/IDBTransactionBackendImpl.h; sourceTree = "<group>"; };
		9712A5A115004EDA0048AF10 /* IDBTransactionBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionBackendInterface.h; path = Modules/indexeddb/IDBTransactionBackendInterface.h; sourceTree = "<group>"; };
		9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionCallbacks.h; path = Modules/indexeddb/IDBTransactionCallbacks.h; sourceTree = "<group>"; };
		9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBTransactionCoordinator.cpp; path = Modules/indexeddb/IDBTransactionCoordinator.cpp; sourceTree = "<group>"; };
		9712A5A415004EDA0048AF10 /* IDBTransactionCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionCoordinator.h; path = Modules/indexeddb/IDBTransactionCoordinator.h; sourceTree = "<group>"; };

				9712A59E15004EDA0048AF10 /* IDBTransaction.idl */,
				9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */,
				9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */,
				9712A5A115004EDA0048AF10 /* IDBTransactionBackendInterface.h */,
				9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */,
				9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */,
				9712A5A415004EDA0048AF10 /* IDBTransactionCoordinator.h */,

				9712A5F415004EDA0048AF10 /* IDBTracing.h in Headers */,
				9712A5F615004EDA0048AF10 /* IDBTransaction.h in Headers */,
				9712A5F915004EDA0048AF10 /* IDBTransactionBackendImpl.h in Headers */,
				9712A5FA15004EDA0048AF10 /* IDBTransactionBackendInterface.h in Headers */,
				9712A5FB15004EDA0048AF10 /* IDBTransactionCallbacks.h in Headers */,
				9712A5FD15004EDA0048AF10 /* IDBTransactionCoordinator.h in Headers */,
				9712A5FF15004EDA0048AF10 /* IDBVersionChangeEvent.h in Headers */,



                'public/WebIDBKeyPath.h',
                'public/WebIDBKeyRange.h',
                'public/WebIDBMetadata.h',
                'public/WebIDBTransaction.h',
                'public/WebIDBTransactionCallbacks.h',
                'public/WebIconLoadingCompletion.h',
                'public/WebIconURL.h',
                'public/WebImageDecoder.h',

                'src/IDBFactoryBackendInterface.cpp',
                'src/IDBFactoryBackendProxy.cpp',
                'src/IDBFactoryBackendProxy.h',
                'src/IDBTransactionBackendProxy.cpp',
                'src/IDBTransactionBackendProxy.h',
                'src/IDBTransactionCallbacksProxy.cpp',
                'src/IDBTransactionCallbacksProxy.h',
                'src/InspectorClientImpl.cpp',
                'src/InspectorClientImpl.h',
                'src/InspectorFrontendClientImpl.cpp',

                'src/WebIDBKeyPath.cpp',
                'src/WebIDBKeyRange.cpp',
                'src/WebIDBMetadata.cpp',
                'src/WebIDBTransactionImpl.cpp',
                'src/WebIDBTransactionImpl.h',
                'src/WebIDBTransactionCallbacksImpl.cpp',
                'src/WebIDBTransactionCallbacksImpl.h',
                'src/WebImageDecoder.cpp',
                'src/WebImageSkia.cpp',
                'src/WebInputElement.cpp',



class WebIDBKey;
class WebIDBKeyPath;
class WebIDBIndex;
class WebIDBTransaction;
class WebSerializedScriptValue;
struct WebIDBMetadata;


    virtual void onBlocked() { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void onBlocked(long long oldVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void onSuccessWithPrefetch(const WebVector<WebIDBKey>& keys, const WebVector<WebIDBKey>& primaryKeys, const WebVector<WebSerializedScriptValue>& values) { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void onUpgradeNeeded(long long oldVersion, WebIDBTransaction*, WebIDBDatabase*) { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void onUpgradeNeeded(long long oldVersion, WebIDBDatabase*, const WebIDBMetadata&) { WEBKIT_ASSERT_NOT_REACHED(); }
};




#include "WebDOMStringList.h"
#include "WebExceptionCode.h"
#include "WebIDBMetadata.h"
#include "WebIDBTransaction.h"

namespace WebKit {


class WebIDBKey;
class WebIDBKeyPath;
class WebIDBKeyRange;
class WebIDBTransaction;

// See comment in WebIDBFactory for a high level overview of these classes.
class WebIDBDatabase {
public:
    virtual ~WebIDBDatabase() { }

    virtual WebIDBMetadata metadata() const
    {
        WEBKIT_ASSERT_NOT_REACHED();
        return WebIDBMetadata();
    }
    virtual void createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath&, bool autoIncrement) { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void deleteObjectStore(long long transactionId, long long objectStoreId) { WEBKIT_ASSERT_NOT_REACHED(); }
    // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); return 0; }
    virtual void createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void forceClose() { WEBKIT_ASSERT_NOT_REACHED(); }



/*
 * Copyright (C) 2010 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef WebIDBTransaction_h
#define WebIDBTransaction_h

#include "../../../Platform/chromium/public/WebString.h"
#include "WebExceptionCode.h"

namespace WebCore { class IDBTransactionBackendInterface; }

namespace WebKit {

class WebIDBTransactionCallbacks;

// See comment in WebIDBFactory for a high level overview of these classes.
class WebIDBTransaction {
public:
    virtual ~WebIDBTransaction() { }

    enum TaskType {
        NormalTask = 0,
        PreemptiveTask
    };

    virtual void commit() { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void abort() { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void setCallbacks(WebIDBTransactionCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }

    // FIXME: this is never called from WebCore. Find a cleaner solution.
    virtual WebCore::IDBTransactionBackendInterface* getIDBTransactionBackendInterface() const
    {
        return 0;
    }

    virtual void addPendingEvents(int) { WEBKIT_ASSERT_NOT_REACHED(); }

protected:
    WebIDBTransaction() {}
};

} // namespace WebKit

#endif // WebIDBTransaction_h



/*
 * Copyright (C) 2010 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef WebIDBTransactionCallbacks_h
#define WebIDBTransactionCallbacks_h

#include "../../../Platform/chromium/public/WebCommon.h"

namespace WebKit {

class WebIDBDatabaseError;

class WebIDBTransactionCallbacks {
public:
    virtual ~WebIDBTransactionCallbacks() { }

    virtual void onAbort(const WebIDBDatabaseError&) { WEBKIT_ASSERT_NOT_REACHED(); }
    virtual void onComplete() { WEBKIT_ASSERT_NOT_REACHED(); }
};

} // namespace WebKit

#endif // WebIDBTransactionCallbacks_h



#endif
#include "HTMLInputElement.h"
#include "IDBCursor.h"
#include "IDBDatabaseBackendInterface.h"
#include "IDBDatabaseException.h"
#include "IDBFactoryBackendInterface.h"
#include "IDBKey.h"
#include "IDBKeyPath.h"
#include "IDBMetadata.h"
#include "IDBTransactionBackendInterface.h"
#include "IconURL.h"
#include "MediaPlayer.h"
#include "MediaStreamSource.h"

#include "WebGeolocationError.h"
#include "WebGeolocationPosition.h"
#include "WebIDBCursor.h"
#include "WebIDBDatabase.h"
#include "WebIDBDatabaseException.h"
#include "WebIDBFactory.h"
#include "WebIDBKey.h"
#include "WebIDBKeyPath.h"
#include "WebIDBMetadata.h"
#include "WebIDBTransaction.h"
#include "WebIconURL.h"
#include "WebInputElement.h"
#include "WebMediaPlayer.h"

COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::Prev, IDBCursor::PREV);
COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::PrevNoDuplicate, IDBCursor::PREV_NO_DUPLICATE);

COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabase::PreemptiveTask, IDBDatabaseBackendInterface::PreemptiveTask);
COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabase::NormalTask, IDBDatabaseBackendInterface::NormalTask);
#endif

#if ENABLE(FILE_SYSTEM)



#include "IDBDatabaseCallbacksProxy.h"
#include "IDBDatabaseError.h"
#include "IDBMetadata.h"
#include "IDBTransactionBackendInterface.h"
#include "WebIDBCallbacks.h"
#include "WebIDBCursorImpl.h"
#include "WebIDBDatabaseCallbacks.h"

#include "WebIDBDatabaseException.h"
#include "WebIDBDatabaseImpl.h"
#include "WebIDBKey.h"
#include "WebIDBMetadata.h"
#include "WebSerializedScriptValue.h"

using namespace WebCore;



#include "IDBDatabaseCallbacks.h"
#include "IDBKeyRange.h"
#include "IDBMetadata.h"
#include "IDBTransactionBackendProxy.h"
#include "WebDOMStringList.h"
#include "WebFrameImpl.h"
#include "WebIDBCallbacksImpl.h"

#include "WebIDBDatabaseCallbacksImpl.h"
#include "WebIDBDatabaseError.h"
#include "WebIDBKeyRange.h"
#include "WebIDBTransaction.h"

using namespace WebCore;


{
}

IDBDatabaseMetadata IDBDatabaseBackendProxy::metadata() const
{
    return m_webIDBDatabase->metadata();
}

void IDBDatabaseBackendProxy::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
{
    if (m_webIDBDatabase)

        m_webIDBDatabase->deleteObjectStore(transactionId, objectStoreId);
}

PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendProxy::createTransaction(int64_t id, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode mode)
{
    OwnPtr<WebIDBTransaction> transaction = adoptPtr(m_webIDBDatabase->createTransaction(id, objectStoreIds, mode));
    if (!transaction)
        return 0;

    return IDBTransactionBackendProxy::create(transaction.release());
}

void IDBDatabaseBackendProxy::createTransaction(int64_t id, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode)
{
    m_webIDBDatabase->createTransaction(id, new WebIDBDatabaseCallbacksImpl(callbacks), objectStoreIds, mode);



    static PassRefPtr<WebCore::IDBDatabaseBackendInterface> create(PassOwnPtr<WebIDBDatabase>);
    virtual ~IDBDatabaseBackendProxy();

    virtual WebCore::IDBDatabaseMetadata metadata() const;

    virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const WebCore::IDBKeyPath&, bool autoIncrement);
    virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);
    // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, WebCore::IDBTransaction::Mode);
    virtual void createTransaction(int64_t, PassRefPtr<WebCore::IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode);
    virtual void close(PassRefPtr<WebCore::IDBDatabaseCallbacks>);




/*
 * Copyright (C) 2011 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "IDBTransactionBackendProxy.h"

#if ENABLE(INDEXED_DATABASE)

#include "IDBTransactionCallbacks.h"
#include "WebIDBDatabaseError.h"
#include "WebIDBTransaction.h"
#include "WebIDBTransactionCallbacksImpl.h"

using namespace WebCore;

namespace WebKit {

PassRefPtr<IDBTransactionBackendInterface> IDBTransactionBackendProxy::create(PassOwnPtr<WebIDBTransaction> transaction)
{
    return adoptRef(new IDBTransactionBackendProxy(transaction));
}

IDBTransactionBackendProxy::IDBTransactionBackendProxy(PassOwnPtr<WebIDBTransaction> transaction)
    : m_webIDBTransaction(transaction)
{
    ASSERT(m_webIDBTransaction);
}

IDBTransactionBackendProxy::~IDBTransactionBackendProxy()
{
}

void IDBTransactionBackendProxy::commit()
{
    m_webIDBTransaction->commit();
}

void IDBTransactionBackendProxy::abort()
{
    m_webIDBTransaction->abort();
}

void IDBTransactionBackendProxy::setCallbacks(IDBTransactionCallbacks* callbacks)
{
    m_webIDBTransaction->setCallbacks(new WebIDBTransactionCallbacksImpl(callbacks));
}

} // namespace WebKit

#endif // ENABLE(INDEXED_DATABASE)



/*
 * Copyright (C) 2011 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef IDBTransactionBackendProxy_h
#define IDBTransactionBackendProxy_h

#if ENABLE(INDEXED_DATABASE)

#include "IDBTransactionBackendInterface.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>

namespace WebKit {

class WebIDBTransaction;

class IDBTransactionBackendProxy : public WebCore::IDBTransactionBackendInterface {
public:
    static PassRefPtr<IDBTransactionBackendInterface> create(PassOwnPtr<WebIDBTransaction>);
    virtual ~IDBTransactionBackendProxy();

    virtual void commit();
    virtual void abort();
    virtual void setCallbacks(WebCore::IDBTransactionCallbacks*);

    WebIDBTransaction* getWebIDBTransaction() const { return m_webIDBTransaction.get(); }

private:
    IDBTransactionBackendProxy(PassOwnPtr<WebIDBTransaction>);

    OwnPtr<WebIDBTransaction> m_webIDBTransaction;
};

} // namespace WebKit

#endif

#endif // IDBTransactionBackendProxy_h



/*
 * Copyright (C) 2011 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "IDBTransactionCallbacksProxy.h"

#if ENABLE(INDEXED_DATABASE)

#include "IDBDatabaseError.h"
#include "WebIDBDatabaseError.h"
#include "WebIDBTransactionCallbacks.h"

using namespace WebCore;

namespace WebKit {

PassRefPtr<IDBTransactionCallbacksProxy> IDBTransactionCallbacksProxy::create(PassOwnPtr<WebIDBTransactionCallbacks> callbacks)
{
    return adoptRef(new IDBTransactionCallbacksProxy(callbacks));
}

IDBTransactionCallbacksProxy::IDBTransactionCallbacksProxy(PassOwnPtr<WebIDBTransactionCallbacks> callbacks)
    : m_callbacks(callbacks)
{
}

IDBTransactionCallbacksProxy::~IDBTransactionCallbacksProxy()
{
}

void IDBTransactionCallbacksProxy::onAbort(PassRefPtr<IDBDatabaseError> idbDatabaseError)
{
    m_callbacks->onAbort(WebIDBDatabaseError(idbDatabaseError));
}

void IDBTransactionCallbacksProxy::onComplete()
{
    m_callbacks->onComplete();
}

} // namespace WebKit

#endif // ENABLE(INDEXED_DATABASE)



/*
 * Copyright (C) 2011 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef IDBTransactionCallbacksProxy_h
#define IDBTransactionCallbacksProxy_h

#if ENABLE(INDEXED_DATABASE)

#include "IDBTransactionCallbacks.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/PassRefPtr.h>

namespace WebKit {

class WebIDBTransactionCallbacks;

class IDBTransactionCallbacksProxy : public WebCore::IDBTransactionCallbacks {
public:
    static PassRefPtr<IDBTransactionCallbacksProxy> create(PassOwnPtr<WebIDBTransactionCallbacks>);
    virtual ~IDBTransactionCallbacksProxy();

    virtual void onAbort(PassRefPtr<WebCore::IDBDatabaseError>);
    virtual void onComplete();

private:
    IDBTransactionCallbacksProxy(PassOwnPtr<WebIDBTransactionCallbacks>);

    OwnPtr<WebIDBTransactionCallbacks> m_callbacks;
};


} // namespace WebKit

#endif

#endif // IDBTransactionCallbacksProxy_h



#include "IDBDatabaseBackendProxy.h"
#include "IDBDatabaseError.h"
#include "IDBKey.h"
#include "IDBTransactionBackendProxy.h"
#include "WebDOMStringList.h"
#include "WebIDBCallbacks.h"
#include "WebIDBDatabase.h"
#include "WebIDBDatabaseError.h"
#include "WebIDBKey.h"
#include "WebIDBTransaction.h"
#include "WebSerializedScriptValue.h"

using namespace WebCore;



#include "IDBDatabaseCallbacksProxy.h"
#include "IDBKeyRange.h"
#include "IDBMetadata.h"
#include "IDBTransactionBackendInterface.h"
#include "WebIDBCallbacks.h"
#include "WebIDBDatabaseCallbacks.h"
#include "WebIDBDatabaseError.h"
#include "WebIDBKey.h"
#include "WebIDBKeyRange.h"
#include "WebIDBMetadata.h"
#include "WebIDBTransactionImpl.h"

using namespace WebCore;


{
}

WebIDBMetadata WebIDBDatabaseImpl::metadata() const
{
    return m_databaseBackend->metadata();
}

void WebIDBDatabaseImpl::createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath& keyPath, bool autoIncrement)
{
    m_databaseBackend->createObjectStore(transactionId, objectStoreId, name, keyPath, autoIncrement);

}


// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
WebIDBTransaction* WebIDBDatabaseImpl::createTransaction(long long id, const WebVector<long long>& objectStoreIds, unsigned short mode)
{
    Vector<int64_t> objectStoreIdList(objectStoreIds.size());
    for (size_t i = 0; i < objectStoreIds.size(); ++i)
        objectStoreIdList[i] = objectStoreIds[i];
    RefPtr<IDBTransactionBackendInterface> transaction = m_databaseBackend->createTransaction(id, objectStoreIdList, static_cast<IDBTransaction::Mode>(mode));
    if (!transaction)
        return 0;
    return new WebIDBTransactionImpl(transaction);
}

void WebIDBDatabaseImpl::createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>& objectStoreIds, unsigned short mode)
{
    Vector<int64_t> objectStoreIdList(objectStoreIds.size());



#include "IDBDatabaseCallbacksProxy.h"
#include "WebExceptionCode.h"
#include "WebIDBDatabase.h"
#include "WebIDBTransaction.h"
#include <public/WebCommon.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>

class WebIDBDatabaseCallbacks;
class WebIDBDatabaseError;
class WebIDBDatabaseMetadata;
class WebIDBTransaction;

// See comment in WebIDBFactory for a high level overview these classes.
class WebIDBDatabaseImpl : public WebIDBDatabase {

    WebIDBDatabaseImpl(WTF::PassRefPtr<WebCore::IDBDatabaseBackendInterface>, WTF::PassRefPtr<IDBDatabaseCallbacksProxy>);
    virtual ~WebIDBDatabaseImpl();

    virtual WebIDBMetadata metadata() const;

    virtual void createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath&, bool autoIncrement);
    virtual void deleteObjectStore(long long objectStoreId, long long transactionId);
    // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode);
    virtual void createTransaction(long long id, WebIDBDatabaseCallbacks*, const WebVector<long long>&, unsigned short mode);
    virtual void forceClose();
    virtual void close();



/*
 * Copyright (C) 2011 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "WebIDBTransactionCallbacksImpl.h"

#if ENABLE(INDEXED_DATABASE)

#include "IDBDatabaseError.h"
#include "IDBTransactionCallbacks.h"
#include "WebIDBDatabaseError.h"

using namespace WebCore;

namespace WebKit {

WebIDBTransactionCallbacksImpl::WebIDBTransactionCallbacksImpl(PassRefPtr<IDBTransactionCallbacks> callbacks)
    : m_callbacks(callbacks)
{
}

WebIDBTransactionCallbacksImpl::~WebIDBTransactionCallbacksImpl()
{
}

void WebIDBTransactionCallbacksImpl::onAbort(const WebIDBDatabaseError& error)
{
    m_callbacks->onAbort(error);
}

void WebIDBTransactionCallbacksImpl::onComplete()
{
    m_callbacks->onComplete();
}

} // namespace WebKit

#endif // ENABLE(INDEXED_DATABASE)



/*
 * Copyright (C) 2011 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef WebIDBTransactionCallbacksImpl_h
#define WebIDBTransactionCallbacksImpl_h

#if ENABLE(INDEXED_DATABASE)

#include "WebIDBTransactionCallbacks.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>

namespace WebCore { class IDBTransactionCallbacks; }

namespace WebKit {

class WebIDBTransactionCallbacksImpl : public WebIDBTransactionCallbacks {
public:
    WebIDBTransactionCallbacksImpl(PassRefPtr<WebCore::IDBTransactionCallbacks>);
    virtual ~WebIDBTransactionCallbacksImpl();

    virtual void onAbort(const WebIDBDatabaseError&);
    virtual void onComplete();

private:
    RefPtr<WebCore::IDBTransactionCallbacks> m_callbacks;
};

} // namespace WebKit

#endif // ENABLE(INDEXED_DATABASE)

#endif // WebIDBTransactionCallbacksImpl_h



/*
 * Copyright (C) 2010 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "WebIDBTransactionImpl.h"

#if ENABLE(INDEXED_DATABASE)

#include "IDBTransaction.h"
#include "IDBTransactionBackendInterface.h"
#include "IDBTransactionCallbacksProxy.h"
#include "WebIDBTransactionCallbacks.h"

using namespace WebCore;

namespace WebKit {

WebIDBTransactionImpl::WebIDBTransactionImpl(PassRefPtr<IDBTransactionBackendInterface> backend)
    : m_backend(backend)
{
}

WebIDBTransactionImpl::~WebIDBTransactionImpl()
{
}

void WebIDBTransactionImpl::commit()
{
    m_backend->commit();
}

void WebIDBTransactionImpl::abort()
{
    m_backend->abort();
}

void WebIDBTransactionImpl::setCallbacks(WebIDBTransactionCallbacks* callbacks)
{
    RefPtr<IDBTransactionCallbacks> idbCallbacks = IDBTransactionCallbacksProxy::create(adoptPtr(callbacks));
    m_backend->setCallbacks(idbCallbacks.get());
}

IDBTransactionBackendInterface* WebIDBTransactionImpl::getIDBTransactionBackendInterface() const
{
    return m_backend.get();
}

} // namespace WebKit

#endif // ENABLE(INDEXED_DATABASE)



/*
 * Copyright (C) 2010 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef WebIDBTransactionImpl_h
#define WebIDBTransactionImpl_h

#if ENABLE(INDEXED_DATABASE)

#include "WebIDBTransaction.h"
#include <public/WebCommon.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>

namespace WebKit {

// See comment in WebIndexedDatabase for a high level overview these classes.
class WebIDBTransactionImpl: public WebIDBTransaction {
public:
    WebIDBTransactionImpl(WTF::PassRefPtr<WebCore::IDBTransactionBackendInterface>);
    virtual ~WebIDBTransactionImpl();

    virtual void commit();
    virtual void abort();
    virtual void setCallbacks(WebIDBTransactionCallbacks*);

    virtual WebCore::IDBTransactionBackendInterface* getIDBTransactionBackendInterface() const;

private:
    WTF::RefPtr<WebCore::IDBTransactionBackendInterface> m_backend;
};

} // namespace WebKit

#endif // ENABLE(INDEXED_DATABASE)

#endif // WebIDBTransactionImpl_h

Lines 62-68 public: a/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp_sec1
- a/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp -1 lines
62	EXPECT_TRUE(false);	62	EXPECT_TRUE(false);
63	}	63	}
64	virtual void onSuccess(PassRefPtr<IDBKey>) { }	64	virtual void onSuccess(PassRefPtr<IDBKey>) { }
65	virtual void onSuccess(PassRefPtr<IDBTransactionBackendInterface>) { }
66	virtual void onSuccess(PassRefPtr<SerializedScriptValue>) { }	65	virtual void onSuccess(PassRefPtr<SerializedScriptValue>) { }
67	virtual void onSuccess(PassRefPtr<SerializedScriptValue>, PassRefPtr<IDBKey>, const IDBKeyPath&) { }	66	virtual void onSuccess(PassRefPtr<SerializedScriptValue>, PassRefPtr<IDBKey>, const IDBKeyPath&) { }
68	virtual void onSuccess(int64_t) OVERRIDE { }	67	virtual void onSuccess(int64_t) OVERRIDE { }



    virtual IDBDatabaseMetadata metadata() const { return IDBDatabaseMetadata(); }
    virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) OVERRIDE { };
    virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) OVERRIDE { }
    // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, IDBTransaction::Mode) OVERRIDE { return 0; }
    virtual void createTransaction(int64_t, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode) OVERRIDE { }

    virtual void close(PassRefPtr<IDBDatabaseCallbacks>) OVERRIDE

Return to Bug 103923

Lines 548-558 PassRefPtr<IDBBackingStore> IDBDatabaseBackendImpl::backingStore() const a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp_sec1
- a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp -12 lines
548	return m_backingStore;	548	return m_backingStore;
549	}	549	}
550		550
551	IDBDatabaseMetadata IDBDatabaseBackendImpl::metadata() const
552	{
553	return m_metadata;
554	}
555
556	void IDBDatabaseBackendImpl::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)	551	void IDBDatabaseBackendImpl::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
557	{	552	{
558	IDB_TRACE("IDBDatabaseBackendImpl::createObjectStore");	553	IDB_TRACE("IDBDatabaseBackendImpl::createObjectStore");
Lines 1167-1179 void IDBDatabaseBackendImpl::processPendingCalls() a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp_sec2
1167	}	1162	}
1168	}	1163	}
1169		1164
1170	// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
1171	PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendImpl::createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode mode)
1172	{
1173	ASSERT_NOT_REACHED();
1174	return 0;
1175	}
1176
1177	void IDBDatabaseBackendImpl::createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode)	1165	void IDBDatabaseBackendImpl::createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode)
1178	{	1166	{
1179	RefPtr<IDBTransactionBackendImpl> transaction = IDBTransactionBackendImpl::create(transactionId, callbacks, objectStoreIds, static_cast<IDBTransaction::Mode>(mode), this);	1167	RefPtr<IDBTransactionBackendImpl> transaction = IDBTransactionBackendImpl::create(transactionId, callbacks, objectStoreIds, static_cast<IDBTransaction::Mode>(mode), this);

Lines 3063-3070 enable?(INDEXED_DATABASE) { a/Source/WebCore/Target.pri_sec1
- a/Source/WebCore/Target.pri -2 / +1 lines
3063	Modules/indexeddb/IDBObjectStore.h \	3063	Modules/indexeddb/IDBObjectStore.h \
3064	Modules/indexeddb/IDBObjectStoreBackendImpl.h \	3064	Modules/indexeddb/IDBObjectStoreBackendImpl.h \
3065	Modules/indexeddb/IDBRequest.h \	3065	Modules/indexeddb/IDBRequest.h \
3066	Modules/indexeddb/IDBTransaction.h \	3066	Modules/indexeddb/IDBTransaction.h
3067	Modules/indexeddb/IDBTransactionBackendInterface.h
3068		3067
3069	SOURCES += \	3068	SOURCES += \
3070	bindings/js/IDBBindingUtilities.cpp \	3069	bindings/js/IDBBindingUtilities.cpp \

Lines 769-776 a/Source/WebCore/WebCore.gypi_sec1
- a/Source/WebCore/WebCore.gypi -2 lines
769	'Modules/indexeddb/IDBTransaction.h',	769	'Modules/indexeddb/IDBTransaction.h',
770	'Modules/indexeddb/IDBTransactionBackendImpl.cpp',	770	'Modules/indexeddb/IDBTransactionBackendImpl.cpp',
771	'Modules/indexeddb/IDBTransactionBackendImpl.h',	771	'Modules/indexeddb/IDBTransactionBackendImpl.h',
772	'Modules/indexeddb/IDBTransactionBackendInterface.h',
773	'Modules/indexeddb/IDBTransactionCallbacks.h',
774	'Modules/indexeddb/IDBTransactionCoordinator.cpp',	772	'Modules/indexeddb/IDBTransactionCoordinator.cpp',
775	'Modules/indexeddb/IDBTransactionCoordinator.h',	773	'Modules/indexeddb/IDBTransactionCoordinator.h',
776	'Modules/indexeddb/IDBVersionChangeEvent.cpp',	774	'Modules/indexeddb/IDBVersionChangeEvent.cpp',

Lines 188-195 a/Source/WebKit/chromium/WebKit.gyp_sec1
- a/Source/WebKit/chromium/WebKit.gyp -10 lines
188	'public/WebIDBKeyPath.h',	188	'public/WebIDBKeyPath.h',
189	'public/WebIDBKeyRange.h',	189	'public/WebIDBKeyRange.h',
190	'public/WebIDBMetadata.h',	190	'public/WebIDBMetadata.h',
191	'public/WebIDBTransaction.h',
192	'public/WebIDBTransactionCallbacks.h',
193	'public/WebIconLoadingCompletion.h',	191	'public/WebIconLoadingCompletion.h',
194	'public/WebIconURL.h',	192	'public/WebIconURL.h',
195	'public/WebImageDecoder.h',	193	'public/WebImageDecoder.h',
Lines 375-384 a/Source/WebKit/chromium/WebKit.gyp_sec2
375	'src/IDBFactoryBackendInterface.cpp',	373	'src/IDBFactoryBackendInterface.cpp',
376	'src/IDBFactoryBackendProxy.cpp',	374	'src/IDBFactoryBackendProxy.cpp',
377	'src/IDBFactoryBackendProxy.h',	375	'src/IDBFactoryBackendProxy.h',
378	'src/IDBTransactionBackendProxy.cpp',
379	'src/IDBTransactionBackendProxy.h',
380	'src/IDBTransactionCallbacksProxy.cpp',
381	'src/IDBTransactionCallbacksProxy.h',
382	'src/InspectorClientImpl.cpp',	376	'src/InspectorClientImpl.cpp',
383	'src/InspectorClientImpl.h',	377	'src/InspectorClientImpl.h',
384	'src/InspectorFrontendClientImpl.cpp',	378	'src/InspectorFrontendClientImpl.cpp',
Lines 516-525 a/Source/WebKit/chromium/WebKit.gyp_sec3
516	'src/WebIDBKeyPath.cpp',	510	'src/WebIDBKeyPath.cpp',
517	'src/WebIDBKeyRange.cpp',	511	'src/WebIDBKeyRange.cpp',
518	'src/WebIDBMetadata.cpp',	512	'src/WebIDBMetadata.cpp',
519	'src/WebIDBTransactionImpl.cpp',
520	'src/WebIDBTransactionImpl.h',
521	'src/WebIDBTransactionCallbacksImpl.cpp',
522	'src/WebIDBTransactionCallbacksImpl.h',
523	'src/WebImageDecoder.cpp',	513	'src/WebImageDecoder.cpp',
524	'src/WebImageSkia.cpp',	514	'src/WebImageSkia.cpp',
525	'src/WebInputElement.cpp',	515	'src/WebInputElement.cpp',

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +39 lines
		1	2013-01-31 Alec Flett <alecflett@chromium.org>
		2
		3	IndexedDB: remove old transaction backend bootstrap code
		4	https://bugs.webkit.org/show_bug.cgi?id=103923
		5
		6	Reviewed by Dimitri Glazkov.
		7
		8	Finally remove all leftover code from the IndexedDB "giant
		9	async refactor of 2012." This includes removal of all
		10	IDBTransaction* interfaces that were shared between
		11	the frontend and backend and a few straggling methods
		12	like onUpgradeNeeded and onSuccess that were left from
		13	the last stage of refactoring.
		14
		15	* Modules/indexeddb/IDBCallbacks.h:
		16	* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
		17	* Modules/indexeddb/IDBDatabaseBackendImpl.h:
		18	(WebCore):
		19	(WebCore::IDBDatabaseBackendImpl::metadata):
		20	(IDBDatabaseBackendImpl):
		21	* Modules/indexeddb/IDBDatabaseBackendInterface.h:
		22	(WebCore):
		23	(IDBDatabaseBackendInterface):
		24	* Modules/indexeddb/IDBObjectStoreBackendImpl.h:
		25	(WebCore):
		26	* Modules/indexeddb/IDBTransaction.h:
		27	(WebCore):
		28	(IDBTransaction):
		29	* Modules/indexeddb/IDBTransactionBackendImpl.h:
		30	(WebCore):
		31	(IDBTransactionBackendImpl):
		32	* Modules/indexeddb/IDBTransactionBackendInterface.h: Removed.
		33	* Modules/indexeddb/IDBTransactionCallbacks.h: Removed.
		34	* Modules/indexeddb/IDBTransactionCoordinator.h:
		35	(WebCore):
		36	* Target.pri:
		37	* WebCore.gypi:
		38	* WebCore.xcodeproj/project.pbxproj:
		39
1	2013-01-31 Dmitry Zvorygin <zvorygin@chromium.org>	40	2013-01-31 Dmitry Zvorygin <zvorygin@chromium.org>
2		41
3	Web Inspector: searching for <u> in elements panel finds all tags containing "u"	42	Web Inspector: searching for <u> in elements panel finds all tags containing "u"

Lines 1-5 a/Source/WebKit/chromium/ChangeLog_sec1
- a/Source/WebKit/chromium/ChangeLog +39 lines
1	2013-01-31 Alec Flett <alecflett@chromium.org>	1	2013-01-31 Alec Flett <alecflett@chromium.org>
2		2
		3	IndexedDB: remove old transaction backend bootstrap code
		4	https://bugs.webkit.org/show_bug.cgi?id=103923
		5
		6	Reviewed by Dimitri Glazkov.
		7
		8	Remove all deprecated WebKit APIs from
		9	the IDB backend.
		10
		11	* WebKit.gyp:
		12	* public/WebIDBCallbacks.h:
		13	(WebKit):
		14	* public/WebIDBDatabase.h:
		15	(WebKit):
		16	* public/WebIDBTransaction.h: Removed.
		17	* public/WebIDBTransactionCallbacks.h: Removed.
		18	* src/AssertMatchingEnums.cpp:
		19	* src/IDBCallbacksProxy.cpp:
		20	* src/IDBDatabaseBackendProxy.cpp:
		21	* src/IDBDatabaseBackendProxy.h:
		22	(IDBDatabaseBackendProxy):
		23	* src/IDBTransactionBackendProxy.cpp: Removed.
		24	* src/IDBTransactionBackendProxy.h: Removed.
		25	* src/IDBTransactionCallbacksProxy.cpp: Removed.
		26	* src/IDBTransactionCallbacksProxy.h: Removed.
		27	* src/WebIDBCallbacksImpl.cpp:
		28	* src/WebIDBDatabaseImpl.cpp:
		29	(WebKit):
		30	* src/WebIDBDatabaseImpl.h:
		31	(WebKit):
		32	(WebIDBDatabaseImpl):
		33	* src/WebIDBTransactionCallbacksImpl.cpp: Removed.
		34	* src/WebIDBTransactionCallbacksImpl.h: Removed.
		35	* src/WebIDBTransactionImpl.cpp: Removed.
		36	* src/WebIDBTransactionImpl.h: Removed.
		37	* tests/IDBAbortOnCorruptTest.cpp:
		38	* tests/IDBDatabaseBackendTest.cpp:
		39
		40	2013-01-31 Alec Flett <alecflett@chromium.org>
		41
3	IndexedDB: Remove WebKit API for old onSuccess/onUpgradeNeeded	42	IndexedDB: Remove WebKit API for old onSuccess/onUpgradeNeeded
4	https://bugs.webkit.org/show_bug.cgi?id=108399	43	https://bugs.webkit.org/show_bug.cgi?id=108399
5		44

Lines 41-47 class IDBBackingStore; a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h_sec1
- a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h -4 / +1 lines
41	class IDBDatabase;	41	class IDBDatabase;
42	class IDBFactoryBackendImpl;	42	class IDBFactoryBackendImpl;
43	class IDBTransactionBackendImpl;	43	class IDBTransactionBackendImpl;
44	class IDBTransactionBackendInterface;
45	class IDBTransactionCoordinator;	44	class IDBTransactionCoordinator;
46		45
47	class IDBDatabaseBackendImpl : public IDBDatabaseBackendInterface {	46	class IDBDatabaseBackendImpl : public IDBDatabaseBackendInterface {
Lines 60-72 public: a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h_sec2
60		59
61	void openConnection(PassRefPtr<IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>, int64_t transactionId, int64_t version);	60	void openConnection(PassRefPtr<IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>, int64_t transactionId, int64_t version);
62	void deleteDatabase(PassRefPtr<IDBCallbacks>);	61	void deleteDatabase(PassRefPtr<IDBCallbacks>);
		62	const IDBDatabaseMetadata& metadata() const { return m_metadata; }
63		63
64	// IDBDatabaseBackendInterface	64	// IDBDatabaseBackendInterface
65	virtual IDBDatabaseMetadata metadata() const;
66	virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement);	65	virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement);
67	virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);	66	virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);
68	// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
69	virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode);
70	virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode);	67	virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode);
71	virtual void close(PassRefPtr<IDBDatabaseCallbacks>);	68	virtual void close(PassRefPtr<IDBDatabaseCallbacks>);
72		69

Lines 40-46 class IDBDatabaseCallbacks; a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h_sec1
- a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h -4 lines
40	class IDBKey;	40	class IDBKey;
41	class IDBKeyPath;	41	class IDBKeyPath;
42	class IDBKeyRange;	42	class IDBKeyRange;
43	class IDBTransactionBackendInterface;
44	struct IDBDatabaseMetadata;	43	struct IDBDatabaseMetadata;
45		44
46	typedef int ExceptionCode;	45	typedef int ExceptionCode;
Lines 52-62 class IDBDatabaseBackendInterface : public RefCounted<IDBDatabaseBackendInterfac a/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h_sec2
52	public:	51	public:
53	virtual ~IDBDatabaseBackendInterface() { }	52	virtual ~IDBDatabaseBackendInterface() { }
54		53
55	virtual IDBDatabaseMetadata metadata() const = 0;
56
57	virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) = 0;	54	virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) = 0;
58	virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) = 0;	55	virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) = 0;
59	virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode) = 0;
60	virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode) = 0;	56	virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode) = 0;
61	virtual void close(PassRefPtr<IDBDatabaseCallbacks>) = 0;	57	virtual void close(PassRefPtr<IDBDatabaseCallbacks>) = 0;
62		58

Lines 35-41 a/Source/WebCore/Modules/indexeddb/IDBTransaction.h_sec1
- a/Source/WebCore/Modules/indexeddb/IDBTransaction.h -6 / +5 lines
35	#include "EventNames.h"	35	#include "EventNames.h"
36	#include "EventTarget.h"	36	#include "EventTarget.h"
37	#include "IDBMetadata.h"	37	#include "IDBMetadata.h"
38	#include "IDBTransactionCallbacks.h"
39	#include "ScriptWrappable.h"	38	#include "ScriptWrappable.h"
40	#include <wtf/HashSet.h>	39	#include <wtf/HashSet.h>
41	#include <wtf/RefCounted.h>	40	#include <wtf/RefCounted.h>
Lines 44-55 namespace WebCore { a/Source/WebCore/Modules/indexeddb/IDBTransaction.h_sec2
44		43
45	class IDBCursor;	44	class IDBCursor;
46	class IDBDatabase;	45	class IDBDatabase;
		46	class IDBDatabaseBackendInterface;
		47	class IDBDatabaseError;
47	class IDBObjectStore;	48	class IDBObjectStore;
48	class IDBOpenDBRequest;	49	class IDBOpenDBRequest;
49	class IDBDatabaseBackendInterface;
50	struct IDBObjectStoreMetadata;	50	struct IDBObjectStoreMetadata;
51		51
52	class IDBTransaction : public ScriptWrappable, public IDBTransactionCallbacks, public EventTarget, public ActiveDOMObject {	52	class IDBTransaction : public ScriptWrappable, public RefCounted<IDBTransaction>, public EventTarget, public ActiveDOMObject {
53	public:	53	public:
54	enum Mode {	54	enum Mode {
55	READ_ONLY = 0,	55	READ_ONLY = 0,
Lines 107-113 public: a/Source/WebCore/Modules/indexeddb/IDBTransaction.h_sec3
107	DEFINE_ATTRIBUTE_EVENT_LISTENER(complete);	107	DEFINE_ATTRIBUTE_EVENT_LISTENER(complete);
108	DEFINE_ATTRIBUTE_EVENT_LISTENER(error);	108	DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
109		109
110	// IDBTransactionCallbacks
111	virtual void onAbort(PassRefPtr<IDBDatabaseError>);	110	virtual void onAbort(PassRefPtr<IDBDatabaseError>);
112	virtual void onComplete();	111	virtual void onComplete();
113		112
Lines 123-130 public: a/Source/WebCore/Modules/indexeddb/IDBTransaction.h_sec4
123	virtual bool canSuspend() const OVERRIDE;	122	virtual bool canSuspend() const OVERRIDE;
124	virtual void stop() OVERRIDE;	123	virtual void stop() OVERRIDE;
125		124
126	using RefCounted<IDBTransactionCallbacks>::ref;	125	using RefCounted<IDBTransaction>::ref;
127	using RefCounted<IDBTransactionCallbacks>::deref;	126	using RefCounted<IDBTransaction>::deref;
128		127
129	private:	128	private:
130	IDBTransaction(ScriptExecutionContext, int64_t, const Vector<String>&, Mode, IDBDatabase, IDBOpenDBRequest*, const IDBDatabaseMetadata&);	129	IDBTransaction(ScriptExecutionContext, int64_t, const Vector<String>&, Mode, IDBDatabase, IDBOpenDBRequest*, const IDBDatabaseMetadata&);

Lines 29-38 a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h_sec1
- a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h -9 / +4 lines
29	#if ENABLE(INDEXED_DATABASE)	29	#if ENABLE(INDEXED_DATABASE)
30		30
31	#include "IDBBackingStore.h"	31	#include "IDBBackingStore.h"
		32	#include "IDBDatabaseBackendInterface.h"
32	#include "IDBDatabaseError.h"	33	#include "IDBDatabaseError.h"
33	#include "IDBTransaction.h"	34	#include "IDBTransaction.h"
34	#include "IDBTransactionBackendInterface.h"
35	#include "IDBTransactionCallbacks.h"
36	#include "Timer.h"	35	#include "Timer.h"
37	#include <wtf/Deque.h>	36	#include <wtf/Deque.h>
38	#include <wtf/HashSet.h>	37	#include <wtf/HashSet.h>
Lines 41-60 a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h_sec2
41	namespace WebCore {	40	namespace WebCore {
42		41
43	class IDBDatabaseBackendImpl;	42	class IDBDatabaseBackendImpl;
		43	class IDBCursorBackendImpl;
		44	class IDBDatabaseCallbacks;
44		45
45	class IDBTransactionBackendImpl : public IDBTransactionBackendInterface {	46	class IDBTransactionBackendImpl : public RefCounted<IDBTransactionBackendImpl> {
46	public:	47	public:
47	static PassRefPtr<IDBTransactionBackendImpl> create(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IDBTransaction::Mode, IDBDatabaseBackendImpl*);	48	static PassRefPtr<IDBTransactionBackendImpl> create(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IDBTransaction::Mode, IDBDatabaseBackendImpl*);
48	static IDBTransactionBackendImpl* from(IDBTransactionBackendInterface* interface)
49	{
50	return static_cast<IDBTransactionBackendImpl*>(interface);
51	}
52	virtual ~IDBTransactionBackendImpl();	49	virtual ~IDBTransactionBackendImpl();
53		50
54	// IDBTransactionBackendInterface
55	virtual void abort();	51	virtual void abort();
56	void commit();	52	void commit();
57	virtual void setCallbacks(IDBTransactionCallbacks* callbacks) { }
58		53
59	class Operation {	54	class Operation {
60	public:	55	public:

Lines 1-58 a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h_sec1
- a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h -58 lines
1	/*
2	* Copyright (C) 2010 Google Inc. All rights reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions
6	* are met:
7	*
8	* 1. Redistributions of source code must retain the above copyright
9	* notice, this list of conditions and the following disclaimer.
10	* 2. Redistributions in binary form must reproduce the above copyright
11	* notice, this list of conditions and the following disclaimer in the
12	* documentation and/or other materials provided with the distribution.
13	*
14	* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17	* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*/
25
26	#ifndef IDBTransactionBackendInterface_h
27	#define IDBTransactionBackendInterface_h
28
29	#include "IDBCallbacks.h"
30	#include <wtf/PassRefPtr.h>
31	#include <wtf/RefCounted.h>
32	#include <wtf/text/WTFString.h>
33
34	#if ENABLE(INDEXED_DATABASE)
35
36	namespace WebCore {
37
38	class IDBCursorBackendImpl;
39	class IDBTransactionCallbacks;
40
41	typedef int ExceptionCode;
42
43	// This is implemented by IDBTransactionBackendImpl and optionally others (in order to proxy
44	// calls across process barriers). All calls to these classes should be non-blocking and
45	// trigger work on a background thread if necessary.
46	class IDBTransactionBackendInterface : public RefCounted<IDBTransactionBackendInterface> {
47	public:
48	virtual ~IDBTransactionBackendInterface() { }
49	virtual void commit() = 0;
50	virtual void abort() = 0;
51	virtual void setCallbacks(IDBTransactionCallbacks*) = 0;
52	};
53
54	} // namespace WebCore
55
56	#endif
57
58	#endif // IDBTransactionBackendInterface_h

Lines 3517-3523 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj -4 lines
3517	9712A5F615004EDA0048AF10 /* IDBTransaction.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A59D15004EDA0048AF10 / IDBTransaction.h */; };	3517	9712A5F615004EDA0048AF10 /* IDBTransaction.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A59D15004EDA0048AF10 / IDBTransaction.h */; };
3518	9712A5F815004EDA0048AF10 /* IDBTransactionBackendImpl.cpp in Sources / = {isa = PBXBuildFile; fileRef = 9712A59F15004EDA0048AF10 / IDBTransactionBackendImpl.cpp */; };	3518	9712A5F815004EDA0048AF10 /* IDBTransactionBackendImpl.cpp in Sources / = {isa = PBXBuildFile; fileRef = 9712A59F15004EDA0048AF10 / IDBTransactionBackendImpl.cpp */; };
3519	9712A5F915004EDA0048AF10 /* IDBTransactionBackendImpl.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A5A015004EDA0048AF10 / IDBTransactionBackendImpl.h */; };	3519	9712A5F915004EDA0048AF10 /* IDBTransactionBackendImpl.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A5A015004EDA0048AF10 / IDBTransactionBackendImpl.h */; };
3520	9712A5FA15004EDA0048AF10 /* IDBTransactionBackendInterface.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A5A115004EDA0048AF10 / IDBTransactionBackendInterface.h */; };
3521	9712A5FB15004EDA0048AF10 /* IDBTransactionCallbacks.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A5A215004EDA0048AF10 / IDBTransactionCallbacks.h */; };	3520	9712A5FB15004EDA0048AF10 /* IDBTransactionCallbacks.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A5A215004EDA0048AF10 / IDBTransactionCallbacks.h */; };
3522	9712A5FC15004EDA0048AF10 /* IDBTransactionCoordinator.cpp in Sources / = {isa = PBXBuildFile; fileRef = 9712A5A315004EDA0048AF10 / IDBTransactionCoordinator.cpp */; };	3521	9712A5FC15004EDA0048AF10 /* IDBTransactionCoordinator.cpp in Sources / = {isa = PBXBuildFile; fileRef = 9712A5A315004EDA0048AF10 / IDBTransactionCoordinator.cpp */; };
3523	9712A5FD15004EDA0048AF10 /* IDBTransactionCoordinator.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A5A415004EDA0048AF10 / IDBTransactionCoordinator.h */; };	3522	9712A5FD15004EDA0048AF10 /* IDBTransactionCoordinator.h in Headers / = {isa = PBXBuildFile; fileRef = 9712A5A415004EDA0048AF10 / IDBTransactionCoordinator.h */; };
Lines 10905-10911 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
10905	9712A59E15004EDA0048AF10 /* IDBTransaction.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDBTransaction.idl; path = Modules/indexeddb/IDBTransaction.idl; sourceTree = "<group>"; };	10904	9712A59E15004EDA0048AF10 /* IDBTransaction.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDBTransaction.idl; path = Modules/indexeddb/IDBTransaction.idl; sourceTree = "<group>"; };
10906	9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBTransactionBackendImpl.cpp; path = Modules/indexeddb/IDBTransactionBackendImpl.cpp; sourceTree = "<group>"; };	10905	9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBTransactionBackendImpl.cpp; path = Modules/indexeddb/IDBTransactionBackendImpl.cpp; sourceTree = "<group>"; };
10907	9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionBackendImpl.h; path = Modules/indexeddb/IDBTransactionBackendImpl.h; sourceTree = "<group>"; };	10906	9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionBackendImpl.h; path = Modules/indexeddb/IDBTransactionBackendImpl.h; sourceTree = "<group>"; };
10908	9712A5A115004EDA0048AF10 /* IDBTransactionBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionBackendInterface.h; path = Modules/indexeddb/IDBTransactionBackendInterface.h; sourceTree = "<group>"; };
10909	9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionCallbacks.h; path = Modules/indexeddb/IDBTransactionCallbacks.h; sourceTree = "<group>"; };	10907	9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionCallbacks.h; path = Modules/indexeddb/IDBTransactionCallbacks.h; sourceTree = "<group>"; };
10910	9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBTransactionCoordinator.cpp; path = Modules/indexeddb/IDBTransactionCoordinator.cpp; sourceTree = "<group>"; };	10908	9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBTransactionCoordinator.cpp; path = Modules/indexeddb/IDBTransactionCoordinator.cpp; sourceTree = "<group>"; };
10911	9712A5A415004EDA0048AF10 /* IDBTransactionCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionCoordinator.h; path = Modules/indexeddb/IDBTransactionCoordinator.h; sourceTree = "<group>"; };	10909	9712A5A415004EDA0048AF10 /* IDBTransactionCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionCoordinator.h; path = Modules/indexeddb/IDBTransactionCoordinator.h; sourceTree = "<group>"; };
Lines 18319-18325 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec3
18319	9712A59E15004EDA0048AF10 /* IDBTransaction.idl */,	18317	9712A59E15004EDA0048AF10 /* IDBTransaction.idl */,
18320	9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */,	18318	9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */,
18321	9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */,	18319	9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */,
18322	9712A5A115004EDA0048AF10 /* IDBTransactionBackendInterface.h */,
18323	9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */,	18320	9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */,
18324	9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */,	18321	9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */,
18325	9712A5A415004EDA0048AF10 /* IDBTransactionCoordinator.h */,	18322	9712A5A415004EDA0048AF10 /* IDBTransactionCoordinator.h */,
Lines 24416-24422 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec4
24416	9712A5F415004EDA0048AF10 /* IDBTracing.h in Headers */,	24413	9712A5F415004EDA0048AF10 /* IDBTracing.h in Headers */,
24417	9712A5F615004EDA0048AF10 /* IDBTransaction.h in Headers */,	24414	9712A5F615004EDA0048AF10 /* IDBTransaction.h in Headers */,
24418	9712A5F915004EDA0048AF10 /* IDBTransactionBackendImpl.h in Headers */,	24415	9712A5F915004EDA0048AF10 /* IDBTransactionBackendImpl.h in Headers */,
24419	9712A5FA15004EDA0048AF10 /* IDBTransactionBackendInterface.h in Headers */,
24420	9712A5FB15004EDA0048AF10 /* IDBTransactionCallbacks.h in Headers */,	24416	9712A5FB15004EDA0048AF10 /* IDBTransactionCallbacks.h in Headers */,
24421	9712A5FD15004EDA0048AF10 /* IDBTransactionCoordinator.h in Headers */,	24417	9712A5FD15004EDA0048AF10 /* IDBTransactionCoordinator.h in Headers */,
24422	9712A5FF15004EDA0048AF10 /* IDBVersionChangeEvent.h in Headers */,	24418	9712A5FF15004EDA0048AF10 /* IDBVersionChangeEvent.h in Headers */,

Lines 38-44 class WebIDBDatabaseError; a/Source/WebKit/chromium/public/WebIDBCallbacks.h_sec1
- a/Source/WebKit/chromium/public/WebIDBCallbacks.h -2 lines
38	class WebIDBKey;	38	class WebIDBKey;
39	class WebIDBKeyPath;	39	class WebIDBKeyPath;
40	class WebIDBIndex;	40	class WebIDBIndex;
41	class WebIDBTransaction;
42	class WebSerializedScriptValue;	41	class WebSerializedScriptValue;
43	struct WebIDBMetadata;	42	struct WebIDBMetadata;
44		43
Lines 63-69 public: a/Source/WebKit/chromium/public/WebIDBCallbacks.h_sec2
63	virtual void onBlocked() { WEBKIT_ASSERT_NOT_REACHED(); }	62	virtual void onBlocked() { WEBKIT_ASSERT_NOT_REACHED(); }
64	virtual void onBlocked(long long oldVersion) { WEBKIT_ASSERT_NOT_REACHED(); }	63	virtual void onBlocked(long long oldVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
65	virtual void onSuccessWithPrefetch(const WebVector<WebIDBKey>& keys, const WebVector<WebIDBKey>& primaryKeys, const WebVector<WebSerializedScriptValue>& values) { WEBKIT_ASSERT_NOT_REACHED(); }	64	virtual void onSuccessWithPrefetch(const WebVector<WebIDBKey>& keys, const WebVector<WebIDBKey>& primaryKeys, const WebVector<WebSerializedScriptValue>& values) { WEBKIT_ASSERT_NOT_REACHED(); }
66	virtual void onUpgradeNeeded(long long oldVersion, WebIDBTransaction, WebIDBDatabase) { WEBKIT_ASSERT_NOT_REACHED(); }
67	virtual void onUpgradeNeeded(long long oldVersion, WebIDBDatabase*, const WebIDBMetadata&) { WEBKIT_ASSERT_NOT_REACHED(); }	65	virtual void onUpgradeNeeded(long long oldVersion, WebIDBDatabase*, const WebIDBMetadata&) { WEBKIT_ASSERT_NOT_REACHED(); }
68	};	66	};
69		67

Lines 30-36 a/Source/WebKit/chromium/public/WebIDBDatabase.h_sec1
- a/Source/WebKit/chromium/public/WebIDBDatabase.h -9 lines
30	#include "WebDOMStringList.h"	30	#include "WebDOMStringList.h"
31	#include "WebExceptionCode.h"	31	#include "WebExceptionCode.h"
32	#include "WebIDBMetadata.h"	32	#include "WebIDBMetadata.h"
33	#include "WebIDBTransaction.h"
34		33
35	namespace WebKit {	34	namespace WebKit {
36		35
Lines 41-62 class WebIDBDatabaseError; a/Source/WebKit/chromium/public/WebIDBDatabase.h_sec2
41	class WebIDBKey;	40	class WebIDBKey;
42	class WebIDBKeyPath;	41	class WebIDBKeyPath;
43	class WebIDBKeyRange;	42	class WebIDBKeyRange;
44	class WebIDBTransaction;
45		43
46	// See comment in WebIDBFactory for a high level overview of these classes.	44	// See comment in WebIDBFactory for a high level overview of these classes.
47	class WebIDBDatabase {	45	class WebIDBDatabase {
48	public:	46	public:
49	virtual ~WebIDBDatabase() { }	47	virtual ~WebIDBDatabase() { }
50		48
51	virtual WebIDBMetadata metadata() const
52	{
53	WEBKIT_ASSERT_NOT_REACHED();
54	return WebIDBMetadata();
55	}
56	virtual void createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath&, bool autoIncrement) { WEBKIT_ASSERT_NOT_REACHED(); }	49	virtual void createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath&, bool autoIncrement) { WEBKIT_ASSERT_NOT_REACHED(); }
57	virtual void deleteObjectStore(long long transactionId, long long objectStoreId) { WEBKIT_ASSERT_NOT_REACHED(); }	50	virtual void deleteObjectStore(long long transactionId, long long objectStoreId) { WEBKIT_ASSERT_NOT_REACHED(); }
58	// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
59	virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); return 0; }
60	virtual void createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); }	51	virtual void createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); }
61	virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }	52	virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }
62	virtual void forceClose() { WEBKIT_ASSERT_NOT_REACHED(); }	53	virtual void forceClose() { WEBKIT_ASSERT_NOT_REACHED(); }

Lines 54-65 a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp_sec1
- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp -4 / +4 lines
54	#endif	54	#endif
55	#include "HTMLInputElement.h"	55	#include "HTMLInputElement.h"
56	#include "IDBCursor.h"	56	#include "IDBCursor.h"
		57	#include "IDBDatabaseBackendInterface.h"
57	#include "IDBDatabaseException.h"	58	#include "IDBDatabaseException.h"
58	#include "IDBFactoryBackendInterface.h"	59	#include "IDBFactoryBackendInterface.h"
59	#include "IDBKey.h"	60	#include "IDBKey.h"
60	#include "IDBKeyPath.h"	61	#include "IDBKeyPath.h"
61	#include "IDBMetadata.h"	62	#include "IDBMetadata.h"
62	#include "IDBTransactionBackendInterface.h"
63	#include "IconURL.h"	63	#include "IconURL.h"
64	#include "MediaPlayer.h"	64	#include "MediaPlayer.h"
65	#include "MediaStreamSource.h"	65	#include "MediaStreamSource.h"
Lines 95-106 a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp_sec2
95	#include "WebGeolocationError.h"	95	#include "WebGeolocationError.h"
96	#include "WebGeolocationPosition.h"	96	#include "WebGeolocationPosition.h"
97	#include "WebIDBCursor.h"	97	#include "WebIDBCursor.h"
		98	#include "WebIDBDatabase.h"
98	#include "WebIDBDatabaseException.h"	99	#include "WebIDBDatabaseException.h"
99	#include "WebIDBFactory.h"	100	#include "WebIDBFactory.h"
100	#include "WebIDBKey.h"	101	#include "WebIDBKey.h"
101	#include "WebIDBKeyPath.h"	102	#include "WebIDBKeyPath.h"
102	#include "WebIDBMetadata.h"	103	#include "WebIDBMetadata.h"
103	#include "WebIDBTransaction.h"
104	#include "WebIconURL.h"	104	#include "WebIconURL.h"
105	#include "WebInputElement.h"	105	#include "WebInputElement.h"
106	#include "WebMediaPlayer.h"	106	#include "WebMediaPlayer.h"
Lines 505-512 COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::NextNoDuplicate, IDBCursor::NEXT_NO_D a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp_sec3
505	COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::Prev, IDBCursor::PREV);	505	COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::Prev, IDBCursor::PREV);
506	COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::PrevNoDuplicate, IDBCursor::PREV_NO_DUPLICATE);	506	COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::PrevNoDuplicate, IDBCursor::PREV_NO_DUPLICATE);
507		507
508	COMPILE_ASSERT_MATCHING_ENUM(WebIDBTransaction::PreemptiveTask, IDBDatabaseBackendInterface::PreemptiveTask);	508	COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabase::PreemptiveTask, IDBDatabaseBackendInterface::PreemptiveTask);
509	COMPILE_ASSERT_MATCHING_ENUM(WebIDBTransaction::NormalTask, IDBDatabaseBackendInterface::NormalTask);	509	COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabase::NormalTask, IDBDatabaseBackendInterface::NormalTask);
510	#endif	510	#endif
511		511
512	#if ENABLE(FILE_SYSTEM)	512	#if ENABLE(FILE_SYSTEM)

Lines 38-44 a/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp_sec1
- a/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp -2 / +1 lines
38	#include "IDBDatabaseCallbacksProxy.h"	38	#include "IDBDatabaseCallbacksProxy.h"
39	#include "IDBDatabaseError.h"	39	#include "IDBDatabaseError.h"
40	#include "IDBMetadata.h"	40	#include "IDBMetadata.h"
41	#include "IDBTransactionBackendInterface.h"
42	#include "WebIDBCallbacks.h"	41	#include "WebIDBCallbacks.h"
43	#include "WebIDBCursorImpl.h"	42	#include "WebIDBCursorImpl.h"
44	#include "WebIDBDatabaseCallbacks.h"	43	#include "WebIDBDatabaseCallbacks.h"
Lines 46-52 a/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp_sec2
46	#include "WebIDBDatabaseException.h"	45	#include "WebIDBDatabaseException.h"
47	#include "WebIDBDatabaseImpl.h"	46	#include "WebIDBDatabaseImpl.h"
48	#include "WebIDBKey.h"	47	#include "WebIDBKey.h"
49	#include "WebIDBTransactionImpl.h"	48	#include "WebIDBMetadata.h"
50	#include "WebSerializedScriptValue.h"	49	#include "WebSerializedScriptValue.h"
51		50
52	using namespace WebCore;	51	using namespace WebCore;

Lines 33-39 a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp_sec1
- a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp -16 lines
33	#include "IDBDatabaseCallbacks.h"	33	#include "IDBDatabaseCallbacks.h"
34	#include "IDBKeyRange.h"	34	#include "IDBKeyRange.h"
35	#include "IDBMetadata.h"	35	#include "IDBMetadata.h"
36	#include "IDBTransactionBackendProxy.h"
37	#include "WebDOMStringList.h"	36	#include "WebDOMStringList.h"
38	#include "WebFrameImpl.h"	37	#include "WebFrameImpl.h"
39	#include "WebIDBCallbacksImpl.h"	38	#include "WebIDBCallbacksImpl.h"
Lines 42-48 a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp_sec2
42	#include "WebIDBDatabaseCallbacksImpl.h"	41	#include "WebIDBDatabaseCallbacksImpl.h"
43	#include "WebIDBDatabaseError.h"	42	#include "WebIDBDatabaseError.h"
44	#include "WebIDBKeyRange.h"	43	#include "WebIDBKeyRange.h"
45	#include "WebIDBTransaction.h"
46		44
47	using namespace WebCore;	45	using namespace WebCore;
48		46
Lines 62-72 IDBDatabaseBackendProxy::~IDBDatabaseBackendProxy() a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp_sec3
62	{	60	{
63	}	61	}
64		62
65	IDBDatabaseMetadata IDBDatabaseBackendProxy::metadata() const
66	{
67	return m_webIDBDatabase->metadata();
68	}
69
70	void IDBDatabaseBackendProxy::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)	63	void IDBDatabaseBackendProxy::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
71	{	64	{
72	if (m_webIDBDatabase)	65	if (m_webIDBDatabase)
Lines 79-93 void IDBDatabaseBackendProxy::deleteObjectStore(int64_t transactionId, int64_t o a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp_sec4
79	m_webIDBDatabase->deleteObjectStore(transactionId, objectStoreId);	72	m_webIDBDatabase->deleteObjectStore(transactionId, objectStoreId);
80	}	73	}
81		74
82	PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendProxy::createTransaction(int64_t id, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode mode)
83	{
84	OwnPtr<WebIDBTransaction> transaction = adoptPtr(m_webIDBDatabase->createTransaction(id, objectStoreIds, mode));
85	if (!transaction)
86	return 0;
87
88	return IDBTransactionBackendProxy::create(transaction.release());
89	}
90
91	void IDBDatabaseBackendProxy::createTransaction(int64_t id, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode)	75	void IDBDatabaseBackendProxy::createTransaction(int64_t id, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode)
92	{	76	{
93	m_webIDBDatabase->createTransaction(id, new WebIDBDatabaseCallbacksImpl(callbacks), objectStoreIds, mode);	77	m_webIDBDatabase->createTransaction(id, new WebIDBDatabaseCallbacksImpl(callbacks), objectStoreIds, mode);

Lines 42-53 public: a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h_sec1
- a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h -4 lines
42	static PassRefPtr<WebCore::IDBDatabaseBackendInterface> create(PassOwnPtr<WebIDBDatabase>);	42	static PassRefPtr<WebCore::IDBDatabaseBackendInterface> create(PassOwnPtr<WebIDBDatabase>);
43	virtual ~IDBDatabaseBackendProxy();	43	virtual ~IDBDatabaseBackendProxy();
44		44
45	virtual WebCore::IDBDatabaseMetadata metadata() const;
46
47	virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const WebCore::IDBKeyPath&, bool autoIncrement);	45	virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const WebCore::IDBKeyPath&, bool autoIncrement);
48	virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);	46	virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);
49	// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
50	virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, WebCore::IDBTransaction::Mode);
51	virtual void createTransaction(int64_t, PassRefPtr<WebCore::IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode);	47	virtual void createTransaction(int64_t, PassRefPtr<WebCore::IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode);
52	virtual void close(PassRefPtr<WebCore::IDBDatabaseCallbacks>);	48	virtual void close(PassRefPtr<WebCore::IDBDatabaseCallbacks>);
53		49

Lines 1-72 a/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp_sec1
- a/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp -72 lines
1	/*
2	* Copyright (C) 2011 Google Inc. All rights reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions
6	* are met:
7	*
8	* 1. Redistributions of source code must retain the above copyright
9	* notice, this list of conditions and the following disclaimer.
10	* 2. Redistributions in binary form must reproduce the above copyright
11	* notice, this list of conditions and the following disclaimer in the
12	* documentation and/or other materials provided with the distribution.
13	*
14	* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17	* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*/
25
26	#include "config.h"
27	#include "IDBTransactionBackendProxy.h"
28
29	#if ENABLE(INDEXED_DATABASE)
30
31	#include "IDBTransactionCallbacks.h"
32	#include "WebIDBDatabaseError.h"
33	#include "WebIDBTransaction.h"
34	#include "WebIDBTransactionCallbacksImpl.h"
35
36	using namespace WebCore;
37
38	namespace WebKit {
39
40	PassRefPtr<IDBTransactionBackendInterface> IDBTransactionBackendProxy::create(PassOwnPtr<WebIDBTransaction> transaction)
41	{
42	return adoptRef(new IDBTransactionBackendProxy(transaction));
43	}
44
45	IDBTransactionBackendProxy::IDBTransactionBackendProxy(PassOwnPtr<WebIDBTransaction> transaction)
46	: m_webIDBTransaction(transaction)
47	{
48	ASSERT(m_webIDBTransaction);
49	}
50
51	IDBTransactionBackendProxy::~IDBTransactionBackendProxy()
52	{
53	}
54
55	void IDBTransactionBackendProxy::commit()
56	{
57	m_webIDBTransaction->commit();
58	}
59
60	void IDBTransactionBackendProxy::abort()
61	{
62	m_webIDBTransaction->abort();
63	}
64
65	void IDBTransactionBackendProxy::setCallbacks(IDBTransactionCallbacks* callbacks)
66	{
67	m_webIDBTransaction->setCallbacks(new WebIDBTransactionCallbacksImpl(callbacks));
68	}
69
70	} // namespace WebKit
71
72	#endif // ENABLE(INDEXED_DATABASE)

Lines 34-46 a/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp_sec1
- a/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp -2 lines
34	#include "IDBDatabaseBackendProxy.h"	34	#include "IDBDatabaseBackendProxy.h"
35	#include "IDBDatabaseError.h"	35	#include "IDBDatabaseError.h"
36	#include "IDBKey.h"	36	#include "IDBKey.h"
37	#include "IDBTransactionBackendProxy.h"
38	#include "WebDOMStringList.h"	37	#include "WebDOMStringList.h"
39	#include "WebIDBCallbacks.h"	38	#include "WebIDBCallbacks.h"
40	#include "WebIDBDatabase.h"	39	#include "WebIDBDatabase.h"
41	#include "WebIDBDatabaseError.h"	40	#include "WebIDBDatabaseError.h"
42	#include "WebIDBKey.h"	41	#include "WebIDBKey.h"
43	#include "WebIDBTransaction.h"
44	#include "WebSerializedScriptValue.h"	42	#include "WebSerializedScriptValue.h"
45		43
46	using namespace WebCore;	44	using namespace WebCore;

Lines 35-48 a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp_sec1
- a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp -19 lines
35	#include "IDBDatabaseCallbacksProxy.h"	35	#include "IDBDatabaseCallbacksProxy.h"
36	#include "IDBKeyRange.h"	36	#include "IDBKeyRange.h"
37	#include "IDBMetadata.h"	37	#include "IDBMetadata.h"
38	#include "IDBTransactionBackendInterface.h"
39	#include "WebIDBCallbacks.h"	38	#include "WebIDBCallbacks.h"
40	#include "WebIDBDatabaseCallbacks.h"	39	#include "WebIDBDatabaseCallbacks.h"
41	#include "WebIDBDatabaseError.h"	40	#include "WebIDBDatabaseError.h"
42	#include "WebIDBKey.h"	41	#include "WebIDBKey.h"
43	#include "WebIDBKeyRange.h"	42	#include "WebIDBKeyRange.h"
44	#include "WebIDBMetadata.h"	43	#include "WebIDBMetadata.h"
45	#include "WebIDBTransactionImpl.h"
46		44
47	using namespace WebCore;	45	using namespace WebCore;
48		46
Lines 58-68 WebIDBDatabaseImpl::~WebIDBDatabaseImpl() a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp_sec2
58	{	56	{
59	}	57	}
60		58
61	WebIDBMetadata WebIDBDatabaseImpl::metadata() const
62	{
63	return m_databaseBackend->metadata();
64	}
65
66	void WebIDBDatabaseImpl::createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath& keyPath, bool autoIncrement)	59	void WebIDBDatabaseImpl::createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath& keyPath, bool autoIncrement)
67	{	60	{
68	m_databaseBackend->createObjectStore(transactionId, objectStoreId, name, keyPath, autoIncrement);	61	m_databaseBackend->createObjectStore(transactionId, objectStoreId, name, keyPath, autoIncrement);
Lines 74-91 void WebIDBDatabaseImpl::deleteObjectStore(long long transactionId, long long ob a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp_sec3
74	}	67	}
75		68
76		69
77	// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
78	WebIDBTransaction* WebIDBDatabaseImpl::createTransaction(long long id, const WebVector<long long>& objectStoreIds, unsigned short mode)
79	{
80	Vector<int64_t> objectStoreIdList(objectStoreIds.size());
81	for (size_t i = 0; i < objectStoreIds.size(); ++i)
82	objectStoreIdList[i] = objectStoreIds[i];
83	RefPtr<IDBTransactionBackendInterface> transaction = m_databaseBackend->createTransaction(id, objectStoreIdList, static_cast<IDBTransaction::Mode>(mode));
84	if (!transaction)
85	return 0;
86	return new WebIDBTransactionImpl(transaction);
87	}
88
89	void WebIDBDatabaseImpl::createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>& objectStoreIds, unsigned short mode)	70	void WebIDBDatabaseImpl::createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>& objectStoreIds, unsigned short mode)
90	{	71	{
91	Vector<int64_t> objectStoreIdList(objectStoreIds.size());	72	Vector<int64_t> objectStoreIdList(objectStoreIds.size());

Lines 1-60 a/Source/WebKit/chromium/src/WebIDBTransactionCallbacksImpl.cpp_sec1
- a/Source/WebKit/chromium/src/WebIDBTransactionCallbacksImpl.cpp -60 lines
1	/*
2	* Copyright (C) 2011 Google Inc. All rights reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions
6	* are met:
7	*
8	* 1. Redistributions of source code must retain the above copyright
9	* notice, this list of conditions and the following disclaimer.
10	* 2. Redistributions in binary form must reproduce the above copyright
11	* notice, this list of conditions and the following disclaimer in the
12	* documentation and/or other materials provided with the distribution.
13	*
14	* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17	* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*/
25
26	#include "config.h"
27	#include "WebIDBTransactionCallbacksImpl.h"
28
29	#if ENABLE(INDEXED_DATABASE)
30
31	#include "IDBDatabaseError.h"
32	#include "IDBTransactionCallbacks.h"
33	#include "WebIDBDatabaseError.h"
34
35	using namespace WebCore;
36
37	namespace WebKit {
38
39	WebIDBTransactionCallbacksImpl::WebIDBTransactionCallbacksImpl(PassRefPtr<IDBTransactionCallbacks> callbacks)
40	: m_callbacks(callbacks)
41	{
42	}
43
44	WebIDBTransactionCallbacksImpl::~WebIDBTransactionCallbacksImpl()
45	{
46	}
47
48	void WebIDBTransactionCallbacksImpl::onAbort(const WebIDBDatabaseError& error)
49	{
50	m_callbacks->onAbort(error);
51	}
52
53	void WebIDBTransactionCallbacksImpl::onComplete()
54	{
55	m_callbacks->onComplete();
56	}
57
58	} // namespace WebKit
59
60	#endif // ENABLE(INDEXED_DATABASE)

Lines 138-145 public: a/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp_sec1
- a/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp -2 lines
138	virtual IDBDatabaseMetadata metadata() const { return IDBDatabaseMetadata(); }	138	virtual IDBDatabaseMetadata metadata() const { return IDBDatabaseMetadata(); }
139	virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) OVERRIDE { };	139	virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) OVERRIDE { };
140	virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) OVERRIDE { }	140	virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) OVERRIDE { }
141	// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
142	virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, IDBTransaction::Mode) OVERRIDE { return 0; }
143	virtual void createTransaction(int64_t, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode) OVERRIDE { }	141	virtual void createTransaction(int64_t, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode) OVERRIDE { }
144		142
145	virtual void close(PassRefPtr<IDBDatabaseCallbacks>) OVERRIDE	143	virtual void close(PassRefPtr<IDBDatabaseCallbacks>) OVERRIDE