Changeset 73264 in webkit


Ignore:
Timestamp:
Dec 3, 2010 8:14:21 AM (13 years ago)
Author:
jorlow@chromium.org
Message:

2010-11-29 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Clean up IndexedDB 2 sided roll bits
​https://bugs.webkit.org/show_bug.cgi?id=50160

  • public/WebIDBDatabase.h: (WebKit::WebIDBDatabase::version): (WebKit::WebIDBDatabase::objectStoreNames): (WebKit::WebIDBDatabase::deleteObjectStore):
  • public/WebIDBFactory.h: (WebKit::WebIDBFactory::open):
  • public/WebIDBKeyRange.h:
  • public/WebIDBObjectStore.h: (WebKit::WebIDBObjectStore::deleteFunction):
  • src/IDBDatabaseProxy.cpp:
  • src/IDBDatabaseProxy.h:
  • src/WebIDBKeyRange.cpp:
Location:
trunk/WebKit/chromium
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r73193 r73264  
     12010-11-29  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        [Chromium] Clean up IndexedDB 2 sided roll bits
     6        https://bugs.webkit.org/show_bug.cgi?id=50160
     7
     8        * public/WebIDBDatabase.h:
     9        (WebKit::WebIDBDatabase::version):
     10        (WebKit::WebIDBDatabase::objectStoreNames):
     11        (WebKit::WebIDBDatabase::deleteObjectStore):
     12        * public/WebIDBFactory.h:
     13        (WebKit::WebIDBFactory::open):
     14        * public/WebIDBKeyRange.h:
     15        * public/WebIDBObjectStore.h:
     16        (WebKit::WebIDBObjectStore::deleteFunction):
     17        * src/IDBDatabaseProxy.cpp:
     18        * src/IDBDatabaseProxy.h:
     19        * src/WebIDBKeyRange.cpp:
     20
    1212010-12-02  Chris Rogers  <crogers@google.com>
    222

  • trunk/WebKit/chromium/public/WebIDBDatabase.h

    r72771 r73264  
    4848        return WebString();
    4949    }
    50     // FIXME: remove after roll.
    51     virtual WebString description() const
    52     {
    53         return WebString();
    54     }
    5550    virtual WebString version() const
    5651    {
    … …  
    5853        return WebString();
    5954    }
    60     virtual WebDOMStringList objectStores() const { return objectStoreNames(); } // FIXME: Remove after roll.
    61     virtual WebDOMStringList objectStoreNames() const { return objectStores(); } // FIXME: Assert not reached after roll.
     55    virtual WebDOMStringList objectStoreNames() const
     56    {
     57        WEBKIT_ASSERT_NOT_REACHED();
     58        return WebDOMStringList();
     59    }
    6260    virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction&, WebExceptionCode&)
    6361    {
    … …  
    6563        return 0;
    6664    }
    67     virtual void deleteObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode& ec) { removeObjectStore(name, transaction, ec); }
    68     // FIXME: remove after roll.
    69     virtual void removeObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode& ec) { deleteObjectStore(name, transaction, ec); }
     65    virtual void deleteObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
    7066    virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    7167    // Transfers ownership of the WebIDBTransaction to the caller.

  • trunk/WebKit/chromium/public/WebIDBFactory.h

    r72794 r73264  
    5252    virtual ~WebIDBFactory() { }
    5353
    54     // FIXME: Remove after roll.
    55     virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir, unsigned long long maximumSize)
    56     {
    57         open(name, callbacks, origin, webFrame, dataDir, maximumSize);
    58     }
    59 
    6054    // The WebKit implementation of open ignores the WebFrame* parameter.
    6155    virtual void open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir, unsigned long long maximumSize)
    6256    {
    63         // WEBKIT_ASSERT_NOT_REACHED();
    64         open(name, "", callbacks, origin, webFrame, dataDir, maximumSize);
     57        WEBKIT_ASSERT_NOT_REACHED();
    6558    }
    6659};

  • trunk/WebKit/chromium/public/WebIDBKeyRange.h

    r72767 r73264  
    4444    WebIDBKeyRange(const WebIDBKey& lower, const WebIDBKey& upper, bool lowerOpen, bool upperOpen) { assign(lower, upper, lowerOpen, upperOpen); }
    4545
    46     // FIXME: Remove next 3 methods after next roll.
    47     WebIDBKeyRange(const WebIDBKey& lower, const WebIDBKey& upper, unsigned short flags) { assign(lower, upper, flags); }
    48     WEBKIT_API void assign(const WebIDBKey& lower, const WebIDBKey& upper, unsigned short flags);
    49     WEBKIT_API unsigned short flags() const;
    50     WEBKIT_API WebIDBKey left() const;
    51     WEBKIT_API WebIDBKey right() const;
    52 
    5346    WEBKIT_API WebIDBKey lower() const;
    5447    WEBKIT_API WebIDBKey upper() const;

  • trunk/WebKit/chromium/public/WebIDBObjectStore.h

    r72771 r73264  
    6262    virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    6363    virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, bool addOnly, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    64     // FIXME: Remove after roll.
    65     virtual void remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec) { deleteFunction(key, callbacks, transaction, ec); }
    66     virtual void deleteFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec) { remove(key, callbacks, transaction, ec); }
     64    virtual void deleteFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
    6765    virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction&, WebExceptionCode&)
    6866    {

  • trunk/WebKit/chromium/src/IDBDatabaseProxy.cpp

    r72771 r73264  
    6262}
    6363
    64 String IDBDatabaseProxy::description() const
    65 {
    66     return m_webIDBDatabase->description();
    67 }
    68 
    6964String IDBDatabaseProxy::version() const
    7065{

  • trunk/WebKit/chromium/src/IDBDatabaseProxy.h

    r72771 r73264  
    4444
    4545    virtual String name() const;
    46     virtual String description() const;
    4746    virtual String version() const;
    4847    virtual PassRefPtr<DOMStringList> objectStoreNames() const;

  • trunk/WebKit/chromium/src/WebIDBKeyRange.cpp

    r72767 r73264  
    4848}
    4949
    50 // FIXME: Remove this after next roll.
    51 void WebIDBKeyRange::assign(const WebIDBKey& lower, const WebIDBKey& upper, unsigned short flags)
    52 {
    53     bool lowerOpen = !!(flags & 1);
    54     bool upperOpen = !!(flags & 2);
    55 
    56     if (lower.type() == WebIDBKey::InvalidType && upper.type() == WebIDBKey::InvalidType)
    57         m_private = 0;
    58     else
    59         m_private = IDBKeyRange::create(lower, upper, lowerOpen, upperOpen);
    60 }
    61 
    6250void WebIDBKeyRange::reset()
    6351{
    6452    m_private.reset();
    65 }
    66 
    67 WebIDBKey WebIDBKeyRange::left() const
    68 {
    69     return lower();
    70 }
    71 
    72 WebIDBKey WebIDBKeyRange::right() const
    73 {
    74     return upper();
    7553}
    7654
    … …  
    9977}
    10078
    101 // FIXME: Remove this after next roll.
    102 unsigned short WebIDBKeyRange::flags() const
    103 {
    104     if (!m_private.get())
    105         return 0;
    106 
    107     unsigned short flags = 0;
    108     if (m_private->lowerOpen())
    109         flags |= 1;
    110     if (m_private->upperOpen())
    111         flags |= 2;
    112     return flags;
    113 }
    114 
    11579WebIDBKeyRange::WebIDBKeyRange(const PassRefPtr<IDBKeyRange>& value)
    11680    : m_private(value)
Note: See TracChangeset for help on using the changeset viewer.