Changeset 82738 in webkit


Ignore:
Timestamp:
Apr 1, 2011 4:12:07 PM (13 years ago)
Author:
jorlow@chromium.org
Message:

2011-03-30 Jeremy Orlow <jorlow@chromium.org>

Reviewed by Nate Chapin.

Clean up IndexedDB WebKit API
https://bugs.webkit.org/show_bug.cgi?id=57507

Rename the backend proxy files that didn't have Backend in their name.
Everything in WebKit should be in the WebKit namespace.
Put everything behind the feature flag so we're consistient.
Put the feature flag #if above includes.

  • WebKit.gyp:
  • src/IDBCallbacksProxy.cpp: (WebKit::IDBCallbacksProxy::create): (WebKit::IDBCallbacksProxy::IDBCallbacksProxy): (WebKit::IDBCallbacksProxy::onError): (WebKit::IDBCallbacksProxy::onSuccess):
  • src/IDBCallbacksProxy.h:
  • src/IDBCursorBackendProxy.cpp: (WebKit::IDBCursorBackendProxy::create): (WebKit::IDBCursorBackendProxy::IDBCursorBackendProxy):
  • src/IDBCursorBackendProxy.h:
  • src/IDBDatabaseBackendProxy.cpp: (WebKit::IDBDatabaseBackendProxy::create): (WebKit::IDBDatabaseBackendProxy::IDBDatabaseBackendProxy): (WebKit::IDBDatabaseBackendProxy::~IDBDatabaseBackendProxy): (WebKit::IDBDatabaseBackendProxy::name): (WebKit::IDBDatabaseBackendProxy::version): (WebKit::IDBDatabaseBackendProxy::objectStoreNames): (WebKit::IDBDatabaseBackendProxy::createObjectStore): (WebKit::IDBDatabaseBackendProxy::deleteObjectStore): (WebKit::IDBDatabaseBackendProxy::setVersion): (WebKit::IDBDatabaseBackendProxy::transaction): (WebKit::IDBDatabaseBackendProxy::close): (WebKit::IDBDatabaseBackendProxy::open):
  • src/IDBDatabaseCallbacksProxy.cpp: (WebKit::IDBDatabaseCallbacksProxy::create): (WebKit::IDBDatabaseCallbacksProxy::IDBDatabaseCallbacksProxy):
  • src/IDBDatabaseCallbacksProxy.h:
  • src/IDBFactoryBackendProxy.cpp: (WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy): (WebKit::IDBFactoryBackendProxy::open):
  • src/IDBFactoryBackendProxy.h:
  • src/IDBIndexBackendProxy.cpp: (WebKit::IDBIndexBackendProxy::create): (WebKit::IDBIndexBackendProxy::IDBIndexBackendProxy):
  • src/IDBIndexBackendProxy.h:
  • src/IDBObjectStoreBackendProxy.cpp: (WebKit::IDBObjectStoreBackendProxy::create): (WebKit::IDBObjectStoreBackendProxy::IDBObjectStoreBackendProxy): (WebKit::IDBObjectStoreBackendProxy::~IDBObjectStoreBackendProxy): (WebKit::IDBObjectStoreBackendProxy::name): (WebKit::IDBObjectStoreBackendProxy::keyPath): (WebKit::IDBObjectStoreBackendProxy::indexNames): (WebKit::IDBObjectStoreBackendProxy::get): (WebKit::IDBObjectStoreBackendProxy::put): (WebKit::IDBObjectStoreBackendProxy::deleteFunction): (WebKit::IDBObjectStoreBackendProxy::clear): (WebKit::IDBObjectStoreBackendProxy::createIndex): (WebKit::IDBObjectStoreBackendProxy::index): (WebKit::IDBObjectStoreBackendProxy::deleteIndex): (WebKit::IDBObjectStoreBackendProxy::openCursor):
  • src/IDBObjectStoreBackendProxy.h: Added.
  • src/IDBObjectStoreProxy.h: Removed.
  • src/IDBTransactionBackendProxy.cpp: (WebKit::IDBTransactionBackendProxy::create): (WebKit::IDBTransactionBackendProxy::IDBTransactionBackendProxy): (WebKit::IDBTransactionBackendProxy::objectStore):
  • src/IDBTransactionBackendProxy.h: (WebKit::IDBTransactionBackendProxy::getWebIDBTransaction):
  • src/IDBTransactionCallbacksProxy.cpp: (WebKit::IDBTransactionCallbacksProxy::create): (WebKit::IDBTransactionCallbacksProxy::IDBTransactionCallbacksProxy):
  • src/IDBTransactionCallbacksProxy.h:
  • src/WebIDBCallbacksImpl.cpp: (WebKit::WebIDBCallbacksImpl::onError): (WebKit::WebIDBCallbacksImpl::onSuccess):
  • src/WebIDBCallbacksImpl.h:
  • src/WebIDBCursorImpl.cpp:
  • src/WebIDBCursorImpl.h:
  • src/WebIDBDatabaseCallbacksImpl.cpp: (WebKit::WebIDBDatabaseCallbacksImpl::onVersionChange):
  • src/WebIDBDatabaseCallbacksImpl.h:
  • src/WebIDBDatabaseError.cpp:
  • src/WebIDBDatabaseImpl.cpp:
  • src/WebIDBDatabaseImpl.h:
  • src/WebIDBFactoryImpl.cpp: (WebKit::WebIDBFactoryImpl::WebIDBFactoryImpl):
  • src/WebIDBFactoryImpl.h:
  • src/WebIDBIndexImpl.cpp:
  • src/WebIDBIndexImpl.h:
  • src/WebIDBKey.cpp: (WebKit::WebIDBKey::createFromValueAndKeyPath): (WebKit::WebIDBKey::injectIDBKeyIntoSerializedValue):
  • src/WebIDBKeyPath.cpp: (WebKit::WebIDBKeyPath::operator const WTF::Vector<IDBKeyPathElement, 0>&):
  • src/WebIDBKeyRange.cpp:
  • src/WebIDBObjectStoreImpl.cpp:
  • src/WebIDBObjectStoreImpl.h:
  • src/WebIDBTransactionCallbacksImpl.cpp:
  • src/WebIDBTransactionCallbacksImpl.h:
  • src/WebIDBTransactionImpl.cpp:
  • src/WebIDBTransactionImpl.h:
Location:
trunk/Source/WebKit/chromium
Files:
1 added
1 deleted
38 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r82666 r82738  
     12011-03-30  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by Nate Chapin.
     4
     5        Clean up IndexedDB WebKit API
     6        https://bugs.webkit.org/show_bug.cgi?id=57507
     7
     8        Rename the backend proxy files that didn't have Backend in their name.
     9        Everything in WebKit should be in the WebKit namespace.
     10        Put everything behind the feature flag so we're consistient.
     11        Put the feature flag #if above includes.
     12
     13        * WebKit.gyp:
     14        * src/IDBCallbacksProxy.cpp:
     15        (WebKit::IDBCallbacksProxy::create):
     16        (WebKit::IDBCallbacksProxy::IDBCallbacksProxy):
     17        (WebKit::IDBCallbacksProxy::onError):
     18        (WebKit::IDBCallbacksProxy::onSuccess):
     19        * src/IDBCallbacksProxy.h:
     20        * src/IDBCursorBackendProxy.cpp:
     21        (WebKit::IDBCursorBackendProxy::create):
     22        (WebKit::IDBCursorBackendProxy::IDBCursorBackendProxy):
     23        * src/IDBCursorBackendProxy.h:
     24        * src/IDBDatabaseBackendProxy.cpp:
     25        (WebKit::IDBDatabaseBackendProxy::create):
     26        (WebKit::IDBDatabaseBackendProxy::IDBDatabaseBackendProxy):
     27        (WebKit::IDBDatabaseBackendProxy::~IDBDatabaseBackendProxy):
     28        (WebKit::IDBDatabaseBackendProxy::name):
     29        (WebKit::IDBDatabaseBackendProxy::version):
     30        (WebKit::IDBDatabaseBackendProxy::objectStoreNames):
     31        (WebKit::IDBDatabaseBackendProxy::createObjectStore):
     32        (WebKit::IDBDatabaseBackendProxy::deleteObjectStore):
     33        (WebKit::IDBDatabaseBackendProxy::setVersion):
     34        (WebKit::IDBDatabaseBackendProxy::transaction):
     35        (WebKit::IDBDatabaseBackendProxy::close):
     36        (WebKit::IDBDatabaseBackendProxy::open):
     37        * src/IDBDatabaseCallbacksProxy.cpp:
     38        (WebKit::IDBDatabaseCallbacksProxy::create):
     39        (WebKit::IDBDatabaseCallbacksProxy::IDBDatabaseCallbacksProxy):
     40        * src/IDBDatabaseCallbacksProxy.h:
     41        * src/IDBFactoryBackendProxy.cpp:
     42        (WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy):
     43        (WebKit::IDBFactoryBackendProxy::open):
     44        * src/IDBFactoryBackendProxy.h:
     45        * src/IDBIndexBackendProxy.cpp:
     46        (WebKit::IDBIndexBackendProxy::create):
     47        (WebKit::IDBIndexBackendProxy::IDBIndexBackendProxy):
     48        * src/IDBIndexBackendProxy.h:
     49        * src/IDBObjectStoreBackendProxy.cpp:
     50        (WebKit::IDBObjectStoreBackendProxy::create):
     51        (WebKit::IDBObjectStoreBackendProxy::IDBObjectStoreBackendProxy):
     52        (WebKit::IDBObjectStoreBackendProxy::~IDBObjectStoreBackendProxy):
     53        (WebKit::IDBObjectStoreBackendProxy::name):
     54        (WebKit::IDBObjectStoreBackendProxy::keyPath):
     55        (WebKit::IDBObjectStoreBackendProxy::indexNames):
     56        (WebKit::IDBObjectStoreBackendProxy::get):
     57        (WebKit::IDBObjectStoreBackendProxy::put):
     58        (WebKit::IDBObjectStoreBackendProxy::deleteFunction):
     59        (WebKit::IDBObjectStoreBackendProxy::clear):
     60        (WebKit::IDBObjectStoreBackendProxy::createIndex):
     61        (WebKit::IDBObjectStoreBackendProxy::index):
     62        (WebKit::IDBObjectStoreBackendProxy::deleteIndex):
     63        (WebKit::IDBObjectStoreBackendProxy::openCursor):
     64        * src/IDBObjectStoreBackendProxy.h: Added.
     65        * src/IDBObjectStoreProxy.h: Removed.
     66        * src/IDBTransactionBackendProxy.cpp:
     67        (WebKit::IDBTransactionBackendProxy::create):
     68        (WebKit::IDBTransactionBackendProxy::IDBTransactionBackendProxy):
     69        (WebKit::IDBTransactionBackendProxy::objectStore):
     70        * src/IDBTransactionBackendProxy.h:
     71        (WebKit::IDBTransactionBackendProxy::getWebIDBTransaction):
     72        * src/IDBTransactionCallbacksProxy.cpp:
     73        (WebKit::IDBTransactionCallbacksProxy::create):
     74        (WebKit::IDBTransactionCallbacksProxy::IDBTransactionCallbacksProxy):
     75        * src/IDBTransactionCallbacksProxy.h:
     76        * src/WebIDBCallbacksImpl.cpp:
     77        (WebKit::WebIDBCallbacksImpl::onError):
     78        (WebKit::WebIDBCallbacksImpl::onSuccess):
     79        * src/WebIDBCallbacksImpl.h:
     80        * src/WebIDBCursorImpl.cpp:
     81        * src/WebIDBCursorImpl.h:
     82        * src/WebIDBDatabaseCallbacksImpl.cpp:
     83        (WebKit::WebIDBDatabaseCallbacksImpl::onVersionChange):
     84        * src/WebIDBDatabaseCallbacksImpl.h:
     85        * src/WebIDBDatabaseError.cpp:
     86        * src/WebIDBDatabaseImpl.cpp:
     87        * src/WebIDBDatabaseImpl.h:
     88        * src/WebIDBFactoryImpl.cpp:
     89        (WebKit::WebIDBFactoryImpl::WebIDBFactoryImpl):
     90        * src/WebIDBFactoryImpl.h:
     91        * src/WebIDBIndexImpl.cpp:
     92        * src/WebIDBIndexImpl.h:
     93        * src/WebIDBKey.cpp:
     94        (WebKit::WebIDBKey::createFromValueAndKeyPath):
     95        (WebKit::WebIDBKey::injectIDBKeyIntoSerializedValue):
     96        * src/WebIDBKeyPath.cpp:
     97        (WebKit::WebIDBKeyPath::operator const WTF::Vector<IDBKeyPathElement, 0>&):
     98        * src/WebIDBKeyRange.cpp:
     99        * src/WebIDBObjectStoreImpl.cpp:
     100        * src/WebIDBObjectStoreImpl.h:
     101        * src/WebIDBTransactionCallbacksImpl.cpp:
     102        * src/WebIDBTransactionCallbacksImpl.h:
     103        * src/WebIDBTransactionImpl.cpp:
     104        * src/WebIDBTransactionImpl.h:
     105
    11062011-03-30  Pavel Podivilov  <podivilov@chromium.org>
    2107
  • trunk/Source/WebKit/chromium/WebKit.gyp

    r82666 r82738  
    360360                'src/IDBDatabaseCallbacksProxy.cpp',
    361361                'src/IDBDatabaseCallbacksProxy.h',
    362                 'src/IDBDatabaseProxy.cpp',
    363                 'src/IDBDatabaseProxy.h',
     362                'src/IDBDatabaseBackendProxy.cpp',
     363                'src/IDBDatabaseBackendProxy.h',
    364364                'src/IDBFactoryBackendProxy.cpp',
    365365                'src/IDBFactoryBackendProxy.h',
    366366                'src/IDBIndexBackendProxy.cpp',
    367367                'src/IDBIndexBackendProxy.h',
    368                 'src/IDBObjectStoreProxy.cpp',
    369                 'src/IDBObjectStoreProxy.h',
     368                'src/IDBObjectStoreBackendProxy.cpp',
     369                'src/IDBObjectStoreBackendProxy.h',
    370370                'src/IDBTransactionBackendProxy.cpp',
    371371                'src/IDBTransactionBackendProxy.h',
  • trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp

    r80564 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3030#include "IDBCallbacksProxy.h"
    3131
     32#if ENABLE(INDEXED_DATABASE)
     33
     34#include "IDBDatabaseBackendProxy.h"
    3235#include "IDBDatabaseError.h"
    33 #include "IDBDatabaseProxy.h"
    3436#include "WebIDBCallbacks.h"
    3537#include "WebIDBCursorImpl.h"
     
    4042#include "WebSerializedScriptValue.h"
    4143
    42 #if ENABLE(INDEXED_DATABASE)
     44using namespace WebCore;
    4345
    44 namespace WebCore {
     46namespace WebKit {
    4547
    46 PassRefPtr<IDBCallbacksProxy> IDBCallbacksProxy::create(PassOwnPtr<WebKit::WebIDBCallbacks> callbacks)
     48PassRefPtr<IDBCallbacksProxy> IDBCallbacksProxy::create(PassOwnPtr<WebIDBCallbacks> callbacks)
    4749{
    4850    return adoptRef(new IDBCallbacksProxy(callbacks));
    4951}
    5052
    51 IDBCallbacksProxy::IDBCallbacksProxy(PassOwnPtr<WebKit::WebIDBCallbacks> callbacks)
     53IDBCallbacksProxy::IDBCallbacksProxy(PassOwnPtr<WebIDBCallbacks> callbacks)
    5254    : m_callbacks(callbacks)
    5355{
     
    6062void IDBCallbacksProxy::onError(PassRefPtr<IDBDatabaseError> idbDatabaseError)
    6163{
    62     m_callbacks->onError(WebKit::WebIDBDatabaseError(idbDatabaseError));
     64    m_callbacks->onError(WebIDBDatabaseError(idbDatabaseError));
    6365}
    6466
    6567void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBCursorBackendInterface> idbCursorBackend)
    6668{
    67     m_callbacks->onSuccess(new WebKit::WebIDBCursorImpl(idbCursorBackend));
     69    m_callbacks->onSuccess(new WebIDBCursorImpl(idbCursorBackend));
    6870}
    6971
    7072void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend)
    7173{
    72     m_callbacks->onSuccess(new WebKit::WebIDBDatabaseImpl(backend));
     74    m_callbacks->onSuccess(new WebIDBDatabaseImpl(backend));
    7375}
    7476
    7577void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBKey> idbKey)
    7678{
    77     m_callbacks->onSuccess(WebKit::WebIDBKey(idbKey));
     79    m_callbacks->onSuccess(WebIDBKey(idbKey));
    7880}
    7981
    8082void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBTransactionBackendInterface> backend)
    8183{
    82     m_callbacks->onSuccess(new WebKit::WebIDBTransactionImpl(backend));
     84    m_callbacks->onSuccess(new WebIDBTransactionImpl(backend));
    8385}
    8486
    8587void IDBCallbacksProxy::onSuccess(PassRefPtr<SerializedScriptValue> serializedScriptValue)
    8688{
    87     m_callbacks->onSuccess(WebKit::WebSerializedScriptValue(serializedScriptValue));
     89    m_callbacks->onSuccess(WebSerializedScriptValue(serializedScriptValue));
    8890}
    8991
     
    9395}
    9496
    95 } // namespace WebCore
     97} // namespace WebKit
    9698
    9799#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h

    r80564 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3030#define IDBCallbacksProxy_h
    3131
     32#if ENABLE(INDEXED_DATABASE)
     33
    3234#include "IDBCallbacks.h"
    3335#include <wtf/PassOwnPtr.h>
     
    3537#include <wtf/RefPtr.h>
    3638
    37 #if ENABLE(INDEXED_DATABASE)
     39namespace WebKit {
    3840
    39 namespace WebKit {
    4041class WebIDBCallbacks;
    41 }
    4242
    43 namespace WebCore {
    44 
    45 class IDBCallbacksProxy : public IDBCallbacks {
     43class IDBCallbacksProxy : public WebCore::IDBCallbacks {
    4644public:
    47     static PassRefPtr<IDBCallbacksProxy> create(PassOwnPtr<WebKit::WebIDBCallbacks>);
     45    static PassRefPtr<IDBCallbacksProxy> create(PassOwnPtr<WebIDBCallbacks>);
    4846    virtual ~IDBCallbacksProxy();
    4947
    50     virtual void onError(PassRefPtr<IDBDatabaseError>);
    51     virtual void onSuccess(PassRefPtr<IDBCursorBackendInterface>);
    52     virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>);
    53     virtual void onSuccess(PassRefPtr<IDBKey>);
    54     virtual void onSuccess(PassRefPtr<IDBTransactionBackendInterface>);
    55     virtual void onSuccess(PassRefPtr<SerializedScriptValue>);
     48    virtual void onError(PassRefPtr<WebCore::IDBDatabaseError>);
     49    virtual void onSuccess(PassRefPtr<WebCore::IDBCursorBackendInterface>);
     50    virtual void onSuccess(PassRefPtr<WebCore::IDBDatabaseBackendInterface>);
     51    virtual void onSuccess(PassRefPtr<WebCore::IDBKey>);
     52    virtual void onSuccess(PassRefPtr<WebCore::IDBTransactionBackendInterface>);
     53    virtual void onSuccess(PassRefPtr<WebCore::SerializedScriptValue>);
    5654    virtual void onBlocked();
    5755
    5856private:
    59     IDBCallbacksProxy(PassOwnPtr<WebKit::WebIDBCallbacks>);
     57    IDBCallbacksProxy(PassOwnPtr<WebIDBCallbacks>);
    6058
    61     OwnPtr<WebKit::WebIDBCallbacks> m_callbacks;
     59    OwnPtr<WebIDBCallbacks> m_callbacks;
    6260};
    6361
    64 
    65 } // namespace WebCore
     62} // namespace WebKit
    6663
    6764#endif
  • trunk/Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp

    r80171 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3737#include "WebSerializedScriptValue.h"
    3838
    39 namespace WebCore {
     39using namespace WebCore;
    4040
    41 PassRefPtr<IDBCursorBackendInterface> IDBCursorBackendProxy::create(PassOwnPtr<WebKit::WebIDBCursor> idbCursor)
     41namespace WebKit {
     42
     43PassRefPtr<IDBCursorBackendInterface> IDBCursorBackendProxy::create(PassOwnPtr<WebIDBCursor> idbCursor)
    4244{
    4345    return adoptRef(new IDBCursorBackendProxy(idbCursor));
    4446}
    4547
    46 IDBCursorBackendProxy::IDBCursorBackendProxy(PassOwnPtr<WebKit::WebIDBCursor> idbCursor)
     48IDBCursorBackendProxy::IDBCursorBackendProxy(PassOwnPtr<WebIDBCursor> idbCursor)
    4749    : m_idbCursor(idbCursor)
    4850{
     
    8890}
    8991
    90 } // namespace WebCore
     92} // namespace WebKit
    9193
    9294#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBCursorBackendProxy.h

    r80171 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3636#include <wtf/RefPtr.h>
    3737
    38 namespace WebCore {
     38namespace WebKit {
    3939
    40 class IDBCursorBackendProxy : public IDBCursorBackendInterface {
     40class IDBCursorBackendProxy : public WebCore::IDBCursorBackendInterface {
    4141public:
    42     static PassRefPtr<IDBCursorBackendInterface> create(PassOwnPtr<WebKit::WebIDBCursor>);
     42    static PassRefPtr<WebCore::IDBCursorBackendInterface> create(PassOwnPtr<WebIDBCursor>);
    4343    virtual ~IDBCursorBackendProxy();
    4444
    4545    virtual unsigned short direction() const;
    46     virtual PassRefPtr<IDBKey> key() const;
    47     virtual PassRefPtr<IDBKey> primaryKey() const;
    48     virtual PassRefPtr<SerializedScriptValue> value() const;
    49     virtual void update(PassRefPtr<SerializedScriptValue>, PassRefPtr<IDBCallbacks>, ExceptionCode&);
    50     virtual void continueFunction(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, ExceptionCode&);
    51     virtual void deleteFunction(PassRefPtr<IDBCallbacks>, ExceptionCode&);
     46    virtual PassRefPtr<WebCore::IDBKey> key() const;
     47    virtual PassRefPtr<WebCore::IDBKey> primaryKey() const;
     48    virtual PassRefPtr<WebCore::SerializedScriptValue> value() const;
     49    virtual void update(PassRefPtr<WebCore::SerializedScriptValue>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::ExceptionCode&);
     50    virtual void continueFunction(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::ExceptionCode&);
     51    virtual void deleteFunction(PassRefPtr<WebCore::IDBCallbacks>, WebCore::ExceptionCode&);
    5252
    5353private:
    54     IDBCursorBackendProxy(PassOwnPtr<WebKit::WebIDBCursor>);
     54    IDBCursorBackendProxy(PassOwnPtr<WebIDBCursor>);
    5555
    56     OwnPtr<WebKit::WebIDBCursor> m_idbCursor;
     56    OwnPtr<WebIDBCursor> m_idbCursor;
    5757};
    5858
    59 } // namespace WebCore
     59} // namespace WebKit
    6060
    6161#endif
  • trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp

    • Property svn:eol-style set to LF
    r82737 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2525
    2626#include "config.h"
    27 #include "IDBDatabaseProxy.h"
     27#include "IDBDatabaseBackendProxy.h"
     28
     29#if ENABLE(INDEXED_DATABASE)
    2830
    2931#include "DOMStringList.h"
    3032#include "IDBCallbacks.h"
    3133#include "IDBDatabaseCallbacks.h"
    32 #include "IDBObjectStoreProxy.h"
     34#include "IDBObjectStoreBackendProxy.h"
    3335#include "IDBTransactionBackendProxy.h"
    3436#include "WebDOMStringList.h"
     
    4143#include "WebIDBTransaction.h"
    4244
    43 #if ENABLE(INDEXED_DATABASE)
     45using namespace WebCore;
    4446
    45 namespace WebCore {
     47namespace WebKit {
    4648
    47 PassRefPtr<IDBDatabaseBackendInterface> IDBDatabaseProxy::create(PassOwnPtr<WebKit::WebIDBDatabase> database)
     49PassRefPtr<IDBDatabaseBackendInterface> IDBDatabaseBackendProxy::create(PassOwnPtr<WebIDBDatabase> database)
    4850{
    49     return adoptRef(new IDBDatabaseProxy(database));
     51    return adoptRef(new IDBDatabaseBackendProxy(database));
    5052}
    5153
    52 IDBDatabaseProxy::IDBDatabaseProxy(PassOwnPtr<WebKit::WebIDBDatabase> database)
     54IDBDatabaseBackendProxy::IDBDatabaseBackendProxy(PassOwnPtr<WebIDBDatabase> database)
    5355    : m_webIDBDatabase(database)
    5456{
    5557}
    5658
    57 IDBDatabaseProxy::~IDBDatabaseProxy()
     59IDBDatabaseBackendProxy::~IDBDatabaseBackendProxy()
    5860{
    5961}
    6062
    61 String IDBDatabaseProxy::name() const
     63String IDBDatabaseBackendProxy::name() const
    6264{
    6365    return m_webIDBDatabase->name();
    6466}
    6567
    66 String IDBDatabaseProxy::version() const
     68String IDBDatabaseBackendProxy::version() const
    6769{
    6870    return m_webIDBDatabase->version();
    6971}
    7072
    71 PassRefPtr<DOMStringList> IDBDatabaseProxy::objectStoreNames() const
     73PassRefPtr<DOMStringList> IDBDatabaseBackendProxy::objectStoreNames() const
    7274{
    7375    return m_webIDBDatabase->objectStoreNames();
    7476}
    7577
    76 PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabaseProxy::createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     78PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabaseBackendProxy::createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    7779{
    7880    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
    7981    // all implementations of IDB interfaces are proxy objects.
    8082    IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
    81     WebKit::WebIDBObjectStore* objectStore = m_webIDBDatabase->createObjectStore(name, keyPath, autoIncrement, *transactionProxy->getWebIDBTransaction(), ec);
     83    WebIDBObjectStore* objectStore = m_webIDBDatabase->createObjectStore(name, keyPath, autoIncrement, *transactionProxy->getWebIDBTransaction(), ec);
    8284    if (!objectStore)
    8385        return 0;
    84     return IDBObjectStoreProxy::create(objectStore);
     86    return IDBObjectStoreBackendProxy::create(objectStore);
    8587}
    8688
    87 void IDBDatabaseProxy::deleteObjectStore(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     89void IDBDatabaseBackendProxy::deleteObjectStore(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    8890{
    8991    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
     
    9395}
    9496
    95 void IDBDatabaseProxy::setVersion(const String& version, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks, ExceptionCode& ec)
     97void IDBDatabaseBackendProxy::setVersion(const String& version, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks, ExceptionCode& ec)
    9698{
    9799    m_webIDBDatabase->setVersion(version, new WebIDBCallbacksImpl(callbacks), ec);
    98100}
    99101
    100 PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseProxy::transaction(DOMStringList* storeNames, unsigned short mode, ExceptionCode& ec)
     102PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendProxy::transaction(DOMStringList* storeNames, unsigned short mode, ExceptionCode& ec)
    101103{
    102     WebKit::WebDOMStringList names(storeNames);
    103     WebKit::WebIDBTransaction* transaction = m_webIDBDatabase->transaction(names, mode, ec);
     104    WebDOMStringList names(storeNames);
     105    WebIDBTransaction* transaction = m_webIDBDatabase->transaction(names, mode, ec);
    104106    if (!transaction) {
    105107        ASSERT(ec);
     
    109111}
    110112
    111 void IDBDatabaseProxy::close(PassRefPtr<IDBDatabaseCallbacks>)
     113void IDBDatabaseBackendProxy::close(PassRefPtr<IDBDatabaseCallbacks>)
    112114{
    113115    m_webIDBDatabase->close();
    114116}
    115117
    116 void IDBDatabaseProxy::open(PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks)
     118void IDBDatabaseBackendProxy::open(PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks)
    117119{
    118120    m_webIDBDatabase->open(new WebIDBDatabaseCallbacksImpl(databaseCallbacks));
    119121}
    120122
    121 } // namespace WebCore
     123} // namespace WebKit
    122124
    123125#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h

    r82737 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2424 */
    2525
    26 #ifndef IDBDatabaseProxy_h
    27 #define IDBDatabaseProxy_h
     26#ifndef IDBDatabaseBackendProxy_h
     27#define IDBDatabaseBackendProxy_h
     28
     29#if ENABLE(INDEXED_DATABASE)
    2830
    2931#include "IDBDatabaseBackendInterface.h"
     
    3234#include <wtf/PassRefPtr.h>
    3335
    34 #if ENABLE(INDEXED_DATABASE)
     36namespace WebKit {
    3537
    36 namespace WebKit { class WebIDBDatabase; }
     38class WebIDBDatabase;
    3739
    38 namespace WebCore {
    39 
    40 class IDBDatabaseProxy : public IDBDatabaseBackendInterface {
     40class IDBDatabaseBackendProxy : public WebCore::IDBDatabaseBackendInterface {
    4141public:
    42     static PassRefPtr<IDBDatabaseBackendInterface> create(PassOwnPtr<WebKit::WebIDBDatabase>);
    43     virtual ~IDBDatabaseProxy();
     42    static PassRefPtr<WebCore::IDBDatabaseBackendInterface> create(PassOwnPtr<WebIDBDatabase>);
     43    virtual ~IDBDatabaseBackendProxy();
    4444
    4545    virtual String name() const;
    4646    virtual String version() const;
    47     virtual PassRefPtr<DOMStringList> objectStoreNames() const;
     47    virtual PassRefPtr<WebCore::DOMStringList> objectStoreNames() const;
    4848
    49     virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&);
    50     virtual void deleteObjectStore(const String& name, IDBTransactionBackendInterface*, ExceptionCode&);
    51     virtual void setVersion(const String& version, PassRefPtr<IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>, ExceptionCode&);
    52     virtual PassRefPtr<IDBTransactionBackendInterface> transaction(DOMStringList* storeNames, unsigned short mode, ExceptionCode&);
    53     virtual void close(PassRefPtr<IDBDatabaseCallbacks>);
     49    virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> createObjectStore(const String& name, const String& keyPath, bool autoIncrement, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     50    virtual void deleteObjectStore(const String& name, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     51    virtual void setVersion(const String& version, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::IDBDatabaseCallbacks>, WebCore::ExceptionCode&);
     52    virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> transaction(WebCore::DOMStringList* storeNames, unsigned short mode, WebCore::ExceptionCode&);
     53    virtual void close(PassRefPtr<WebCore::IDBDatabaseCallbacks>);
    5454
    55     virtual void open(PassRefPtr<IDBDatabaseCallbacks>);
     55    virtual void open(PassRefPtr<WebCore::IDBDatabaseCallbacks>);
    5656
    5757private:
    58     IDBDatabaseProxy(PassOwnPtr<WebKit::WebIDBDatabase>);
     58    IDBDatabaseBackendProxy(PassOwnPtr<WebIDBDatabase>);
    5959
    60     OwnPtr<WebKit::WebIDBDatabase> m_webIDBDatabase;
     60    OwnPtr<WebIDBDatabase> m_webIDBDatabase;
    6161};
    6262
    63 } // namespace WebCore
     63} // namespace WebKit
    6464
    6565#endif
    6666
    67 #endif // IDBDatabaseProxy_h
     67#endif // IDBDatabaseBackendProxy_h
  • trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.cpp

    r80183 r82738  
    3131#include "WebIDBDatabaseCallbacks.h"
    3232
    33 namespace WebCore {
     33using namespace WebCore;
    3434
    35 PassRefPtr<IDBDatabaseCallbacksProxy> IDBDatabaseCallbacksProxy::create(PassOwnPtr<WebKit::WebIDBDatabaseCallbacks> callbacks)
     35namespace WebKit {
     36
     37PassRefPtr<IDBDatabaseCallbacksProxy> IDBDatabaseCallbacksProxy::create(PassOwnPtr<WebIDBDatabaseCallbacks> callbacks)
    3638{
    3739    return adoptRef(new IDBDatabaseCallbacksProxy(callbacks));
    3840}
    3941
    40 IDBDatabaseCallbacksProxy::IDBDatabaseCallbacksProxy(PassOwnPtr<WebKit::WebIDBDatabaseCallbacks> callbacks)
     42IDBDatabaseCallbacksProxy::IDBDatabaseCallbacksProxy(PassOwnPtr<WebIDBDatabaseCallbacks> callbacks)
    4143    : m_callbacks(callbacks)
    4244{
     
    5254}
    5355
    54 } // namespace WebCore
     56} // namespace WebKit
    5557
    5658#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.h

    r80183 r82738  
    2727#define IDBDatabaseCallbacksProxy_h
    2828
    29 #include "IDBDatabaseCallbacks.h"
    30 
    3129#if ENABLE(INDEXED_DATABASE)
    3230
     31#include "IDBDatabaseCallbacks.h"
    3332#include <wtf/PassOwnPtr.h>
    3433
    35 namespace WebKit { class WebIDBDatabaseCallbacks; }
     34namespace WebKit {
    3635
    37 namespace WebCore {
     36class WebIDBDatabaseCallbacks;
    3837
    39 class IDBDatabaseCallbacksProxy : public IDBDatabaseCallbacks {
     38class IDBDatabaseCallbacksProxy : public WebCore::IDBDatabaseCallbacks {
    4039public:
    41     static PassRefPtr<IDBDatabaseCallbacksProxy> create(PassOwnPtr<WebKit::WebIDBDatabaseCallbacks>);
     40    static PassRefPtr<IDBDatabaseCallbacksProxy> create(PassOwnPtr<WebIDBDatabaseCallbacks>);
    4241    virtual ~IDBDatabaseCallbacksProxy();
    4342
     
    4544
    4645private:
    47     IDBDatabaseCallbacksProxy(PassOwnPtr<WebKit::WebIDBDatabaseCallbacks>);
     46    IDBDatabaseCallbacksProxy(PassOwnPtr<WebIDBDatabaseCallbacks>);
    4847
    49     OwnPtr<WebKit::WebIDBDatabaseCallbacks> m_callbacks;
     48    OwnPtr<WebIDBDatabaseCallbacks> m_callbacks;
    5049};
    5150
    52 } // namespace WebCore
     51} // namespace WebKit
    5352
    5453#endif
  • trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp

    r80635 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3030#include "IDBFactoryBackendProxy.h"
    3131
     32#if ENABLE(INDEXED_DATABASE)
     33
    3234#include "DOMStringList.h"
     35#include "IDBDatabaseBackendProxy.h"
    3336#include "IDBDatabaseError.h"
    34 #include "IDBDatabaseProxy.h"
    3537#include "WebFrameImpl.h"
    3638#include "WebIDBCallbacksImpl.h"
     
    4244#include "WebVector.h"
    4345
    44 #if ENABLE(INDEXED_DATABASE)
     46using namespace WebCore;
    4547
    46 namespace WebCore {
     48namespace WebKit {
    4749
    4850PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendProxy::create()
     
    5254
    5355IDBFactoryBackendProxy::IDBFactoryBackendProxy()
    54     : m_webIDBFactory(WebKit::webKitClient()->idbFactory())
     56    : m_webIDBFactory(webKitClient()->idbFactory())
    5557{
    5658}
     
    6264void IDBFactoryBackendProxy::open(const String& name, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<SecurityOrigin> origin, Frame* frame, const String& dataDir, int64_t maximumSize, BackingStoreType backingStoreType)
    6365{
    64     WebKit::WebFrame* webFrame = WebKit::WebFrameImpl::fromFrame(frame);
    65     m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir, maximumSize, static_cast<WebKit::WebIDBFactory::BackingStoreType>(backingStoreType));
     66    WebFrame* webFrame = WebFrameImpl::fromFrame(frame);
     67    m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir, maximumSize, static_cast<WebIDBFactory::BackingStoreType>(backingStoreType));
    6668}
    6769
    68 } // namespace WebCore
     70} // namespace WebKit
    6971
    7072#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.h

    r80635 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3030#define IDBFactoryBackendProxy_h
    3131
     32#if ENABLE(INDEXED_DATABASE)
     33
    3234#include "IDBFactoryBackendInterface.h"
    3335
    34 #if ENABLE(INDEXED_DATABASE)
     36namespace WebCore { class DOMStringList; }
    3537
    36 namespace WebKit { class WebIDBFactory; }
     38namespace WebKit {
    3739
    38 namespace WebCore {
     40class WebIDBFactory;
    3941
    40 class DOMStringList;
    41 
    42 class IDBFactoryBackendProxy : public IDBFactoryBackendInterface {
     42class IDBFactoryBackendProxy : public WebCore::IDBFactoryBackendInterface {
    4343public:
    44     static PassRefPtr<IDBFactoryBackendInterface> create();
     44    static PassRefPtr<WebCore::IDBFactoryBackendInterface> create();
    4545    virtual ~IDBFactoryBackendProxy();
    4646
    47     PassRefPtr<DOMStringList> databases(void) const;
    48     virtual void open(const String& name, PassRefPtr<IDBCallbacks>, PassRefPtr<SecurityOrigin>, Frame*, const String& dataDir, int64_t maximumSize, BackingStoreType);
     47    PassRefPtr<WebCore::DOMStringList> databases(void) const;
     48    virtual void open(const String& name, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::SecurityOrigin>, WebCore::Frame*, const String& dataDir, int64_t maximumSize, BackingStoreType);
    4949
    5050private:
     
    5252
    5353    // We don't own this pointer (unlike all the other proxy classes which do).
    54     WebKit::WebIDBFactory* m_webIDBFactory;
     54    WebIDBFactory* m_webIDBFactory;
    5555};
    5656
    57 } // namespace WebCore
     57} // namespace WebKit
    5858
    5959#endif
  • trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp

    r69721 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3838#include "WebIDBKeyRange.h"
    3939
    40 namespace WebCore {
     40using namespace WebCore;
    4141
    42 PassRefPtr<IDBIndexBackendInterface> IDBIndexBackendProxy::create(PassOwnPtr<WebKit::WebIDBIndex> index)
     42namespace WebKit {
     43
     44PassRefPtr<IDBIndexBackendInterface> IDBIndexBackendProxy::create(PassOwnPtr<WebIDBIndex> index)
    4345{
    4446    return adoptRef(new IDBIndexBackendProxy(index));
    4547}
    4648
    47 IDBIndexBackendProxy::IDBIndexBackendProxy(PassOwnPtr<WebKit::WebIDBIndex> index)
     49IDBIndexBackendProxy::IDBIndexBackendProxy(PassOwnPtr<WebIDBIndex> index)
    4850    : m_webIDBIndex(index)
    4951{
     
    106108}
    107109
    108 } // namespace WebCore
     110} // namespace WebKit
    109111
    110112#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h

    r69721 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#define IDBIndexBackendProxy_h
    2828
     29#if ENABLE(INDEXED_DATABASE)
     30
    2931#include "IDBIndexBackendInterface.h"
    3032#include <wtf/OwnPtr.h>
    3133#include <wtf/PassOwnPtr.h>
    3234
    33 #if ENABLE(INDEXED_DATABASE)
     35namespace WebKit {
    3436
    35 namespace WebKit { class WebIDBIndex; }
     37class WebIDBIndex;
    3638
    37 namespace WebCore {
    38 
    39 class IDBIndexBackendProxy : public IDBIndexBackendInterface {
     39class IDBIndexBackendProxy : public WebCore::IDBIndexBackendInterface {
    4040public:
    41     static PassRefPtr<IDBIndexBackendInterface> create(PassOwnPtr<WebKit::WebIDBIndex>);
     41    static PassRefPtr<IDBIndexBackendInterface> create(PassOwnPtr<WebIDBIndex>);
    4242    virtual ~IDBIndexBackendProxy();
    4343
     
    4747    virtual bool unique();
    4848
    49     virtual void openCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&);
    50     virtual void openKeyCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&);
    51     virtual void get(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&);
    52     virtual void getKey(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*, ExceptionCode&);
     49    virtual void openCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     50    virtual void openKeyCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     51    virtual void get(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
     52    virtual void getKey(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
    5353
    5454private:
    55     IDBIndexBackendProxy(PassOwnPtr<WebKit::WebIDBIndex>);
     55    IDBIndexBackendProxy(PassOwnPtr<WebIDBIndex>);
    5656
    57     OwnPtr<WebKit::WebIDBIndex> m_webIDBIndex;
     57    OwnPtr<WebIDBIndex> m_webIDBIndex;
    5858};
    5959
    60 } // namespace WebCore
     60} // namespace WebKit
    6161
    6262#endif
  • trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp

    r82737 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2525
    2626#include "config.h"
    27 #include "IDBObjectStoreProxy.h"
     27#include "IDBObjectStoreBackendProxy.h"
     28
     29#if ENABLE(INDEXED_DATABASE)
    2830
    2931#include "DOMStringList.h"
     
    4042#include "WebSerializedScriptValue.h"
    4143
    42 #if ENABLE(INDEXED_DATABASE)
     44using namespace WebCore;
    4345
    44 namespace WebCore {
     46namespace WebKit {
    4547
    46 PassRefPtr<IDBObjectStoreBackendInterface> IDBObjectStoreProxy::create(PassOwnPtr<WebKit::WebIDBObjectStore> objectStore)
     48PassRefPtr<IDBObjectStoreBackendInterface> IDBObjectStoreBackendProxy::create(PassOwnPtr<WebIDBObjectStore> objectStore)
    4749{
    48     return adoptRef(new IDBObjectStoreProxy(objectStore));
     50    return adoptRef(new IDBObjectStoreBackendProxy(objectStore));
    4951}
    5052
    51 IDBObjectStoreProxy::IDBObjectStoreProxy(PassOwnPtr<WebKit::WebIDBObjectStore> objectStore)
     53IDBObjectStoreBackendProxy::IDBObjectStoreBackendProxy(PassOwnPtr<WebIDBObjectStore> objectStore)
    5254    : m_webIDBObjectStore(objectStore)
    5355{
    5456}
    5557
    56 IDBObjectStoreProxy::~IDBObjectStoreProxy()
     58IDBObjectStoreBackendProxy::~IDBObjectStoreBackendProxy()
    5759{
    5860}
    5961
    60 String IDBObjectStoreProxy::name() const
     62String IDBObjectStoreBackendProxy::name() const
    6163{
    6264    return m_webIDBObjectStore->name();
    6365}
    6466
    65 String IDBObjectStoreProxy::keyPath() const
     67String IDBObjectStoreBackendProxy::keyPath() const
    6668{
    6769    return m_webIDBObjectStore->keyPath();
    6870}
    6971
    70 PassRefPtr<DOMStringList> IDBObjectStoreProxy::indexNames() const
     72PassRefPtr<DOMStringList> IDBObjectStoreBackendProxy::indexNames() const
    7173{
    7274    return m_webIDBObjectStore->indexNames();
    7375}
    7476
    75 void IDBObjectStoreProxy::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     77void IDBObjectStoreBackendProxy::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    7678{
    7779    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
     
    8183}
    8284
    83 void IDBObjectStoreProxy::put(PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key, PutMode putMode, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     85void IDBObjectStoreBackendProxy::put(PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key, PutMode putMode, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    8486{
    8587    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
    8688    // all implementations of IDB interfaces are proxy objects.
    8789    IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
    88     m_webIDBObjectStore->put(value, key, static_cast<WebKit::WebIDBObjectStore::PutMode>(putMode), new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);
     90    m_webIDBObjectStore->put(value, key, static_cast<WebIDBObjectStore::PutMode>(putMode), new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);
    8991}
    9092
    91 void IDBObjectStoreProxy::deleteFunction(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     93void IDBObjectStoreBackendProxy::deleteFunction(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    9294{
    9395    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
     
    9799}
    98100
    99 void IDBObjectStoreProxy::clear(PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     101void IDBObjectStoreBackendProxy::clear(PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    100102{
    101103    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
     
    105107}
    106108
    107 PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreProxy::createIndex(const String& name, const String& keyPath, bool unique, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     109PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreBackendProxy::createIndex(const String& name, const String& keyPath, bool unique, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    108110{
    109111    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
    110112    // all implementations of IDB interfaces are proxy objects.
    111113    IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
    112     WebKit::WebIDBIndex* index = m_webIDBObjectStore->createIndex(name, keyPath, unique, *transactionProxy->getWebIDBTransaction(), ec);
     114    WebIDBIndex* index = m_webIDBObjectStore->createIndex(name, keyPath, unique, *transactionProxy->getWebIDBTransaction(), ec);
    113115    if (!index)
    114116        return 0;
     
    116118}
    117119
    118 PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreProxy::index(const String& name, ExceptionCode& ec)
     120PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreBackendProxy::index(const String& name, ExceptionCode& ec)
    119121{
    120     WebKit::WebIDBIndex* index = m_webIDBObjectStore->index(name, ec);
     122    WebIDBIndex* index = m_webIDBObjectStore->index(name, ec);
    121123    if (!index)
    122124        return 0;
     
    124126}
    125127
    126 void IDBObjectStoreProxy::deleteIndex(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     128void IDBObjectStoreBackendProxy::deleteIndex(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    127129{
    128130    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
     
    132134}
    133135
    134 void IDBObjectStoreProxy::openCursor(PassRefPtr<IDBKeyRange> range, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
     136void IDBObjectStoreBackendProxy::openCursor(PassRefPtr<IDBKeyRange> range, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    135137{
    136138    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
     
    140142}
    141143
    142 } // namespace WebCore
     144} // namespace WebKit
    143145
    144146#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp

    r72765 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2929#if ENABLE(INDEXED_DATABASE)
    3030
    31 #include "IDBObjectStoreProxy.h"
     31#include "IDBObjectStoreBackendProxy.h"
    3232#include "IDBTransactionCallbacks.h"
    3333#include "WebIDBDatabaseError.h"
     
    3636#include "WebIDBTransactionCallbacksImpl.h"
    3737
    38 namespace WebCore {
     38using namespace WebCore;
    3939
    40 PassRefPtr<IDBTransactionBackendInterface> IDBTransactionBackendProxy::create(PassOwnPtr<WebKit::WebIDBTransaction> transaction)
     40namespace WebKit {
     41
     42PassRefPtr<IDBTransactionBackendInterface> IDBTransactionBackendProxy::create(PassOwnPtr<WebIDBTransaction> transaction)
    4143{
    4244    return adoptRef(new IDBTransactionBackendProxy(transaction));
    4345}
    4446
    45 IDBTransactionBackendProxy::IDBTransactionBackendProxy(PassOwnPtr<WebKit::WebIDBTransaction> transaction)
     47IDBTransactionBackendProxy::IDBTransactionBackendProxy(PassOwnPtr<WebIDBTransaction> transaction)
    4648    : m_webIDBTransaction(transaction)
    4749{
     
    5557PassRefPtr<IDBObjectStoreBackendInterface> IDBTransactionBackendProxy::objectStore(const String& name, ExceptionCode& ec)
    5658{
    57     WebKit::WebIDBObjectStore* objectStore = m_webIDBTransaction->objectStore(name, ec);
     59    WebIDBObjectStore* objectStore = m_webIDBTransaction->objectStore(name, ec);
    5860    if (!objectStore)
    5961        return 0;
    60     return IDBObjectStoreProxy::create(objectStore);
     62    return IDBObjectStoreBackendProxy::create(objectStore);
    6163}
    6264
     
    8991}
    9092
    91 } // namespace WebCore
     93} // namespace WebKit
    9294
    9395#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h

    r72765 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#define IDBTransactionBackendProxy_h
    2828
    29 #include "IDBTransactionBackendInterface.h"
    30 
    3129#if ENABLE(INDEXED_DATABASE)
    3230
     31#include "IDBTransactionBackendInterface.h"
    3332#include <wtf/OwnPtr.h>
    3433#include <wtf/PassOwnPtr.h>
    3534
    36 namespace WebKit { class WebIDBTransaction; }
     35namespace WebKit {
    3736
    38 namespace WebCore {
     37class WebIDBTransaction;
    3938
    40 class IDBTransactionBackendProxy : public IDBTransactionBackendInterface {
     39class IDBTransactionBackendProxy : public WebCore::IDBTransactionBackendInterface {
    4140public:
    42     static PassRefPtr<IDBTransactionBackendInterface> create(PassOwnPtr<WebKit::WebIDBTransaction>);
     41    static PassRefPtr<IDBTransactionBackendInterface> create(PassOwnPtr<WebIDBTransaction>);
    4342    virtual ~IDBTransactionBackendProxy();
    4443
    45     virtual PassRefPtr<IDBObjectStoreBackendInterface> objectStore(const String& name, ExceptionCode&);
     44    virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> objectStore(const String& name, WebCore::ExceptionCode&);
    4645    virtual unsigned short mode() const;
    4746    virtual void abort();
    48     virtual bool scheduleTask(PassOwnPtr<ScriptExecutionContext::Task>, PassOwnPtr<ScriptExecutionContext::Task>);
     47    virtual bool scheduleTask(PassOwnPtr<WebCore::ScriptExecutionContext::Task>, PassOwnPtr<WebCore::ScriptExecutionContext::Task>);
    4948    virtual void didCompleteTaskEvents();
    50     virtual void setCallbacks(IDBTransactionCallbacks*);
     49    virtual void setCallbacks(WebCore::IDBTransactionCallbacks*);
    5150
    52     WebKit::WebIDBTransaction* getWebIDBTransaction() const { return m_webIDBTransaction.get(); }
     51    WebIDBTransaction* getWebIDBTransaction() const { return m_webIDBTransaction.get(); }
    5352
    5453private:
    55     IDBTransactionBackendProxy(PassOwnPtr<WebKit::WebIDBTransaction>);
     54    IDBTransactionBackendProxy(PassOwnPtr<WebIDBTransaction>);
    5655
    57     OwnPtr<WebKit::WebIDBTransaction> m_webIDBTransaction;
     56    OwnPtr<WebIDBTransaction> m_webIDBTransaction;
    5857};
    5958
    60 } // namespace WebCore
     59} // namespace WebKit
    6160
    6261#endif
  • trunk/Source/WebKit/chromium/src/IDBTransactionCallbacksProxy.cpp

    r77647 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3030#include "IDBTransactionCallbacksProxy.h"
    3131
     32#if ENABLE(INDEXED_DATABASE)
     33
    3234#include "WebIDBTransactionCallbacks.h"
    3335
    34 #if ENABLE(INDEXED_DATABASE)
     36using namespace WebCore;
    3537
    36 namespace WebCore {
     38namespace WebKit {
    3739
    38 PassRefPtr<IDBTransactionCallbacksProxy> IDBTransactionCallbacksProxy::create(PassOwnPtr<WebKit::WebIDBTransactionCallbacks> callbacks)
     40PassRefPtr<IDBTransactionCallbacksProxy> IDBTransactionCallbacksProxy::create(PassOwnPtr<WebIDBTransactionCallbacks> callbacks)
    3941{
    4042    return adoptRef(new IDBTransactionCallbacksProxy(callbacks));
    4143}
    4244
    43 IDBTransactionCallbacksProxy::IDBTransactionCallbacksProxy(PassOwnPtr<WebKit::WebIDBTransactionCallbacks> callbacks)
     45IDBTransactionCallbacksProxy::IDBTransactionCallbacksProxy(PassOwnPtr<WebIDBTransactionCallbacks> callbacks)
    4446    : m_callbacks(callbacks)
    4547{
     
    6062}
    6163
    62 } // namespace WebCore
     64} // namespace WebKit
    6365
    6466#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/IDBTransactionCallbacksProxy.h

    r77647 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3030#define IDBTransactionCallbacksProxy_h
    3131
    32 #include "IDBTransactionCallbacks.h"
    33 
    3432#if ENABLE(INDEXED_DATABASE)
    3533
     34#include "IDBTransactionCallbacks.h"
    3635#include <wtf/PassOwnPtr.h>
    3736#include <wtf/PassRefPtr.h>
    3837
    39 namespace WebKit { class WebIDBTransactionCallbacks; }
     38namespace WebKit {
    4039
    41 namespace WebCore {
     40class WebIDBTransactionCallbacks;
    4241
    43 class IDBTransactionCallbacksProxy : public IDBTransactionCallbacks {
     42class IDBTransactionCallbacksProxy : public WebCore::IDBTransactionCallbacks {
    4443public:
    45     static PassRefPtr<IDBTransactionCallbacksProxy> create(PassOwnPtr<WebKit::WebIDBTransactionCallbacks>);
     44    static PassRefPtr<IDBTransactionCallbacksProxy> create(PassOwnPtr<WebIDBTransactionCallbacks>);
    4645    virtual ~IDBTransactionCallbacksProxy();
    4746
     
    5049
    5150private:
    52     IDBTransactionCallbacksProxy(PassOwnPtr<WebKit::WebIDBTransactionCallbacks>);
     51    IDBTransactionCallbacksProxy(PassOwnPtr<WebIDBTransactionCallbacks>);
    5352
    54     OwnPtr<WebKit::WebIDBTransactionCallbacks> m_callbacks;
     53    OwnPtr<WebIDBTransactionCallbacks> m_callbacks;
    5554};
    5655
    5756
    58 } // namespace WebCore
     57} // namespace WebKit
    5958
    6059#endif
  • trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp

    r80564 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#include "WebIDBCallbacksImpl.h"
    2828
     29#if ENABLE(INDEXED_DATABASE)
     30
    2931#include "IDBCallbacks.h"
    3032#include "IDBCursorBackendProxy.h"
     33#include "IDBDatabaseBackendProxy.h"
    3134#include "IDBDatabaseError.h"
    32 #include "IDBDatabaseProxy.h"
    3335#include "IDBKey.h"
    3436#include "IDBTransactionBackendProxy.h"
     
    4042#include "WebSerializedScriptValue.h"
    4143
    42 #if ENABLE(INDEXED_DATABASE)
     44using namespace WebCore;
    4345
    44 namespace WebCore {
     46namespace WebKit {
    4547
    4648WebIDBCallbacksImpl::WebIDBCallbacksImpl(PassRefPtr<IDBCallbacks> callbacks)
     
    5355}
    5456
    55 void WebIDBCallbacksImpl::onError(const WebKit::WebIDBDatabaseError& error)
     57void WebIDBCallbacksImpl::onError(const WebIDBDatabaseError& error)
    5658{
    5759    m_callbacks->onError(error);
    5860}
    5961
    60 void WebIDBCallbacksImpl::onSuccess(WebKit::WebIDBCursor* cursor)
     62void WebIDBCallbacksImpl::onSuccess(WebIDBCursor* cursor)
    6163{
    6264    m_callbacks->onSuccess(IDBCursorBackendProxy::create(cursor));
    6365}
    6466
    65 void WebIDBCallbacksImpl::onSuccess(WebKit::WebIDBDatabase* webKitInstance)
     67void WebIDBCallbacksImpl::onSuccess(WebIDBDatabase* webKitInstance)
    6668{
    67     m_callbacks->onSuccess(IDBDatabaseProxy::create(webKitInstance));
     69    m_callbacks->onSuccess(IDBDatabaseBackendProxy::create(webKitInstance));
    6870}
    6971
    70 void WebIDBCallbacksImpl::onSuccess(const WebKit::WebIDBKey& key)
     72void WebIDBCallbacksImpl::onSuccess(const WebIDBKey& key)
    7173{
    7274    m_callbacks->onSuccess(key);
    7375}
    7476
    75 void WebIDBCallbacksImpl::onSuccess(WebKit::WebIDBTransaction* webKitInstance)
     77void WebIDBCallbacksImpl::onSuccess(WebIDBTransaction* webKitInstance)
    7678{
    7779    m_callbacks->onSuccess(IDBTransactionBackendProxy::create(webKitInstance));
    7880}
    7981
    80 void WebIDBCallbacksImpl::onSuccess(const WebKit::WebSerializedScriptValue& serializedScriptValue)
     82void WebIDBCallbacksImpl::onSuccess(const WebSerializedScriptValue& serializedScriptValue)
    8183{
    8284    m_callbacks->onSuccess(serializedScriptValue);
     
    8890}
    8991
    90 } // namespace WebCore
     92} // namespace WebKit
    9193
    9294#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h

    r80564 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#define WebIDBCallbacksImpl_h
    2828
     29#if ENABLE(INDEXED_DATABASE)
     30
    2931#include "WebIDBCallbacks.h"
    3032#include <wtf/PassRefPtr.h>
    3133#include <wtf/RefPtr.h>
    3234
    33 #if ENABLE(INDEXED_DATABASE)
     35namespace WebCore { class IDBCallbacks; }
    3436
    35 namespace WebCore {
     37namespace WebKit {
    3638
    37 class IDBCallbacks;
    38 
    39 class WebIDBCallbacksImpl : public WebKit::WebIDBCallbacks {
     39class WebIDBCallbacksImpl : public WebIDBCallbacks {
    4040public:
    41     WebIDBCallbacksImpl(PassRefPtr<IDBCallbacks>);
     41    WebIDBCallbacksImpl(PassRefPtr<WebCore::IDBCallbacks>);
    4242    virtual ~WebIDBCallbacksImpl();
    4343
    44     virtual void onError(const WebKit::WebIDBDatabaseError&);
    45     virtual void onSuccess(WebKit::WebIDBCursor*);
    46     virtual void onSuccess(WebKit::WebIDBDatabase*);
    47     virtual void onSuccess(const WebKit::WebIDBKey&);
    48     virtual void onSuccess(WebKit::WebIDBTransaction*);
    49     virtual void onSuccess(const WebKit::WebSerializedScriptValue&);
     44    virtual void onError(const WebIDBDatabaseError&);
     45    virtual void onSuccess(WebIDBCursor*);
     46    virtual void onSuccess(WebIDBDatabase*);
     47    virtual void onSuccess(const WebIDBKey&);
     48    virtual void onSuccess(WebIDBTransaction*);
     49    virtual void onSuccess(const WebSerializedScriptValue&);
    5050    virtual void onBlocked();
    5151
    5252private:
    53     RefPtr<IDBCallbacks> m_callbacks;
     53    RefPtr<WebCore::IDBCallbacks> m_callbacks;
    5454};
    5555
    56 } // namespace WebCore
     56} // namespace WebKit
    5757
    58 #endif
     58#endif // ENABLE(INDEXED_DATABASE)
    5959
    6060#endif // WebIDBCallbacksImpl_h
  • trunk/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp

    r80171 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2626#include "config.h"
    2727#include "WebIDBCursorImpl.h"
     28
     29#if ENABLE(INDEXED_DATABASE)
    2830
    2931#include "IDBAny.h"
     
    8183}
    8284
    83 } // namespace WebCore
     85} // namespace WebKit
     86
     87#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBCursorImpl.h

    r80171 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2626#ifndef WebIDBCursorImpl_h
    2727#define WebIDBCursorImpl_h
     28
     29#if ENABLE(INDEXED_DATABASE)
    2830
    2931#include "WebCommon.h"
     
    5759} // namespace WebKit
    5860
     61#endif // ENABLE(INDEXED_DATABASE)
     62
    5963#endif // WebIDBCursorImpl_h
  • trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp

    r80183 r82738  
    3232#include "WebString.h"
    3333
    34 namespace WebCore {
     34using namespace WebCore;
     35
     36namespace WebKit {
    3537
    3638WebIDBDatabaseCallbacksImpl::WebIDBDatabaseCallbacksImpl(PassRefPtr<IDBDatabaseCallbacks> callbacks)
     
    4345}
    4446
    45 void WebIDBDatabaseCallbacksImpl::onVersionChange(const WebKit::WebString& version)
     47void WebIDBDatabaseCallbacksImpl::onVersionChange(const WebString& version)
    4648{
    4749    m_callbacks->onVersionChange(version);
    4850}
    4951
    50 } // namespace WebCore
     52} // namespace WebKit
    5153
    5254#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h

    r80183 r82738  
    3535#include <wtf/RefPtr.h>
    3636
    37 namespace WebCore {
     37namespace WebCore { class IDBDatabaseCallbacks; }
    3838
    39 class IDBDatabaseCallbacks;
     39namespace WebKit {
    4040
    41 class WebIDBDatabaseCallbacksImpl : public WebKit::WebIDBDatabaseCallbacks {
     41class WebIDBDatabaseCallbacksImpl : public WebIDBDatabaseCallbacks {
    4242public:
    43     WebIDBDatabaseCallbacksImpl(PassRefPtr<IDBDatabaseCallbacks>);
     43    WebIDBDatabaseCallbacksImpl(PassRefPtr<WebCore::IDBDatabaseCallbacks>);
    4444    virtual ~WebIDBDatabaseCallbacksImpl();
    4545
    46     virtual void onVersionChange(const WebKit::WebString& version);
     46    virtual void onVersionChange(const WebString& version);
    4747
    4848private:
    49     RefPtr<IDBDatabaseCallbacks> m_callbacks;
     49    RefPtr<WebCore::IDBDatabaseCallbacks> m_callbacks;
    5050};
    5151
    52 } // namespace WebCore
     52} // namespace WebKit
    5353
    54 #endif
     54#endif // ENABLE(INDEXED_DATABASE)
    5555
    5656#endif // WebIDBDatabaseCallbacksImpl_h
  • trunk/Source/WebKit/chromium/src/WebIDBDatabaseError.cpp

    r74188 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3232#include "WebIDBDatabaseError.h"
    3333
     34#if ENABLE(INDEXED_DATABASE)
     35
    3436#include "IDBDatabaseError.h"
    3537#include "WebString.h"
    36 
    37 #if ENABLE(INDEXED_DATABASE)
    3838
    3939using namespace WebCore;
  • trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp

    r80183 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#include "WebIDBDatabaseImpl.h"
    2828
     29#if ENABLE(INDEXED_DATABASE)
     30
    2931#include "DOMStringList.h"
    3032#include "IDBCallbacksProxy.h"
     
    3638#include "WebIDBObjectStoreImpl.h"
    3739#include "WebIDBTransactionImpl.h"
    38 
    39 #if ENABLE(INDEXED_DATABASE)
    4040
    4141using namespace WebCore;
     
    113113}
    114114
    115 } // namespace WebCore
     115} // namespace WebKit
    116116
    117117#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h

    r80183 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#define WebIDBDatabaseImpl_h
    2828
     29#if ENABLE(INDEXED_DATABASE)
     30
    2931#include "WebCommon.h"
    3032#include "WebExceptionCode.h"
     
    3335#include <wtf/RefPtr.h>
    3436
    35 namespace WebCore {
    36 class IDBDatabaseBackendInterface;
    37 class IDBDatabaseCallbacksProxy;
    38 }
     37namespace WebCore { class IDBDatabaseBackendInterface; }
    3938
    4039namespace WebKit {
    4140
     41class IDBDatabaseCallbacksProxy;
    4242class WebIDBDatabaseCallbacks;
    4343class WebIDBObjectStore;
     
    6464private:
    6565    WTF::RefPtr<WebCore::IDBDatabaseBackendInterface> m_databaseBackend;
    66     WTF::RefPtr<WebCore::IDBDatabaseCallbacksProxy> m_databaseCallbacks;
     66    WTF::RefPtr<IDBDatabaseCallbacksProxy> m_databaseCallbacks;
    6767};
    6868
     
    7070
    7171#endif // WebIDBDatabaseImpl_h
     72
     73#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp

    r80635 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3232#include "WebIDBFactoryImpl.h"
    3333
     34#if ENABLE(INDEXED_DATABASE)
     35
    3436#include "DOMStringList.h"
    3537#include "IDBCallbacksProxy.h"
     
    3840#include "WebIDBDatabaseError.h"
    3941#include <wtf/OwnPtr.h>
    40 
    41 #if ENABLE(INDEXED_DATABASE)
    4242
    4343using namespace WebCore;
     
    5151
    5252WebIDBFactoryImpl::WebIDBFactoryImpl()
    53     : m_idbFactoryBackend(WebCore::IDBFactoryBackendImpl::create())
     53    : m_idbFactoryBackend(IDBFactoryBackendImpl::create())
    5454{
    5555}
  • trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.h

    r80635 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3030#define WebIDBFactoryImpl_h
    3131
     32#if ENABLE(INDEXED_DATABASE)
     33
    3234#include "WebDOMStringList.h"
    3335#include "WebIDBFactory.h"
     
    5153} // namespace WebKit
    5254
     55#endif // ENABLE(INDEXED_DATABASE)
     56
    5357#endif // WebIDBFactoryImpl_h
  • trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp

    r69721 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#include "WebIDBIndexImpl.h"
    2828
     29#if ENABLE(INDEXED_DATABASE)
     30
    2931#include "IDBCallbacksProxy.h"
    3032#include "IDBIndex.h"
     
    3335#include "WebIDBKey.h"
    3436#include "WebIDBKeyRange.h"
    35 
    36 #if ENABLE(INDEXED_DATABASE)
    3737
    3838using namespace WebCore;
     
    8989}
    9090
    91 } // namespace WebCore
     91} // namespace WebKit
    9292
    9393#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h

    r69721 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2626#ifndef WebIDBIndexImpl_h
    2727#define WebIDBIndexImpl_h
     28
     29#if ENABLE(INDEXED_DATABASE)
    2830
    2931#include "WebCommon.h"
     
    5860} // namespace WebKit
    5961
     62#endif // ENABLE(INDEXED_DATABASE)
     63
    6064#endif // WebIDBIndexImpl_h
  • trunk/Source/WebKit/chromium/src/WebIDBKey.cpp

    r78721 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    8181    if (serializedScriptValue.isNull())
    8282        return WebIDBKey::createInvalid();
    83     return WebCore::createIDBKeyFromSerializedValueAndKeyPath(serializedScriptValue, idbKeyPath);
     83    return createIDBKeyFromSerializedValueAndKeyPath(serializedScriptValue, idbKeyPath);
    8484}
    8585
    8686WebSerializedScriptValue WebIDBKey::injectIDBKeyIntoSerializedValue(const WebIDBKey& key, const WebSerializedScriptValue& value, const WebIDBKeyPath& path)
    8787{
    88     return WebCore::injectIDBKeyIntoSerializedValue(key, value, path);
     88    return injectIDBKeyIntoSerializedValue(key, value, path);
    8989}
    9090
  • trunk/Source/WebKit/chromium/src/WebIDBKeyPath.cpp

    r65439 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    6868}
    6969
    70 WebIDBKeyPath::operator const WTF::Vector<WebCore::IDBKeyPathElement, 0>&() const
     70WebIDBKeyPath::operator const WTF::Vector<IDBKeyPathElement, 0>&() const
    7171{
    7272    return *m_private.get();
  • trunk/Source/WebKit/chromium/src/WebIDBKeyRange.cpp

    r73264 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#include "WebIDBKeyRange.h"
    2828
     29#if ENABLE(INDEXED_DATABASE)
     30
    2931#include "IDBKey.h"
    3032#include "IDBKeyRange.h"
    3133#include "WebIDBKey.h"
    3234
    33 using WebCore::IDBKeyRange;
     35using namespace WebCore;
    3436
    3537namespace WebKit {
     
    9496
    9597} // namespace WebKit
     98
     99#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp

    r80564 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2727#include "WebIDBObjectStoreImpl.h"
    2828
     29#if ENABLE(INDEXED_DATABASE)
     30
    2931#include "DOMStringList.h"
    3032#include "IDBCallbacksProxy.h"
     
    3739#include "WebIDBTransaction.h"
    3840#include "WebSerializedScriptValue.h"
    39 
    40 #if ENABLE(INDEXED_DATABASE)
    4141
    4242using namespace WebCore;
     
    114114}
    115115
    116 } // namespace WebCore
     116} // namespace WebKit
    117117
    118118#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h

    r78416 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2626#ifndef WebIDBObjectStoreImpl_h
    2727#define WebIDBObjectStoreImpl_h
     28
     29#if ENABLE(INDEXED_DATABASE)
    2830
    2931#include "WebCommon.h"
     
    6567} // namespace WebKit
    6668
     69#endif // ENABLE(INDEXED_DATABASE)
     70
    6771#endif // WebIDBObjectStoreImpl_h
  • trunk/Source/WebKit/chromium/src/WebIDBTransactionCallbacksImpl.cpp

    r77647 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3131#include "IDBTransactionCallbacks.h"
    3232
    33 namespace WebCore {
     33using namespace WebCore;
     34
     35namespace WebKit {
    3436
    3537WebIDBTransactionCallbacksImpl::WebIDBTransactionCallbacksImpl(PassRefPtr<IDBTransactionCallbacks> callbacks)
     
    5254}
    5355
    54 } // namespace WebCore
     56} // namespace WebKit
    5557
    5658#endif // ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/chromium/src/WebIDBTransactionCallbacksImpl.h

    r77647 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    3333#include <wtf/RefPtr.h>
    3434
    35 namespace WebCore {
     35namespace WebCore { class IDBTransactionCallbacks; }
    3636
    37 class IDBTransactionCallbacks;
     37namespace WebKit {
    3838
    39 class WebIDBTransactionCallbacksImpl : public WebKit::WebIDBTransactionCallbacks {
     39class WebIDBTransactionCallbacksImpl : public WebIDBTransactionCallbacks {
    4040public:
    41     WebIDBTransactionCallbacksImpl(PassRefPtr<IDBTransactionCallbacks>);
     41    WebIDBTransactionCallbacksImpl(PassRefPtr<WebCore::IDBTransactionCallbacks>);
    4242    virtual ~WebIDBTransactionCallbacksImpl();
    4343
     
    4646
    4747private:
    48     RefPtr<IDBTransactionCallbacks> m_callbacks;
     48    RefPtr<WebCore::IDBTransactionCallbacks> m_callbacks;
    4949};
    5050
    51 } // namespace WebCore
     51} // namespace WebKit
    5252
    53 #endif
     53#endif // ENABLE(INDEXED_DATABASE)
    5454
    5555#endif // WebIDBTransactionCallbacksImpl_h
  • trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.cpp

    r72765 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
  • trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.h

    r72765 r82738  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
Note: See TracChangeset for help on using the changeset viewer.