Changeset 69541 in webkit


Ignore:
Timestamp:
Oct 11, 2010 5:19:25 PM (14 years ago)
Author:
jorlow@chromium.org
Message:

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

Reviewed by Nate Chapin.

[Chromium] Add plumbing for synchronous indexedDB exceptions
​https://bugs.webkit.org/show_bug.cgi?id=47511

Add a WebExceptionCode file (already run by fishd) and add versions of
each applicable method that take such a parameter. A follow up patch
will be posted with the meat.

  • WebKit.gyp:
  • public/WebExceptionCode.h: Added.
  • public/WebIDBCursor.h: (WebKit::WebIDBCursor::update): (WebKit::WebIDBCursor::continueFunction): (WebKit::WebIDBCursor::remove):
  • public/WebIDBDatabase.h: (WebKit::WebIDBDatabase::objectStore): (WebKit::WebIDBDatabase::createObjectStore): (WebKit::WebIDBDatabase::removeObjectStore): (WebKit::WebIDBDatabase::setVersion): (WebKit::WebIDBDatabase::transaction):
  • public/WebIDBIndex.h: (WebKit::WebIDBIndex::openObjectCursor): (WebKit::WebIDBIndex::openKeyCursor): (WebKit::WebIDBIndex::getObject): (WebKit::WebIDBIndex::getKey):
  • public/WebIDBObjectStore.h: (WebKit::WebIDBObjectStore::get): (WebKit::WebIDBObjectStore::put): (WebKit::WebIDBObjectStore::remove): (WebKit::WebIDBObjectStore::createIndex): (WebKit::WebIDBObjectStore::index): (WebKit::WebIDBObjectStore::removeIndex): (WebKit::WebIDBObjectStore::openCursor):
Location:
trunk/WebKit/chromium
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r69540 r69541  
     12010-10-11  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by Nate Chapin.
     4
     5        [Chromium] Add plumbing for synchronous indexedDB exceptions
     6        https://bugs.webkit.org/show_bug.cgi?id=47511
     7
     8        Add a WebExceptionCode file (already run by fishd) and add versions of
     9        each applicable method that take such a parameter.  A follow up patch
     10        will be posted with the meat.
     11
     12        * WebKit.gyp:
     13        * public/WebExceptionCode.h: Added.
     14        * public/WebIDBCursor.h:
     15        (WebKit::WebIDBCursor::update):
     16        (WebKit::WebIDBCursor::continueFunction):
     17        (WebKit::WebIDBCursor::remove):
     18        * public/WebIDBDatabase.h:
     19        (WebKit::WebIDBDatabase::objectStore):
     20        (WebKit::WebIDBDatabase::createObjectStore):
     21        (WebKit::WebIDBDatabase::removeObjectStore):
     22        (WebKit::WebIDBDatabase::setVersion):
     23        (WebKit::WebIDBDatabase::transaction):
     24        * public/WebIDBIndex.h:
     25        (WebKit::WebIDBIndex::openObjectCursor):
     26        (WebKit::WebIDBIndex::openKeyCursor):
     27        (WebKit::WebIDBIndex::getObject):
     28        (WebKit::WebIDBIndex::getKey):
     29        * public/WebIDBObjectStore.h:
     30        (WebKit::WebIDBObjectStore::get):
     31        (WebKit::WebIDBObjectStore::put):
     32        (WebKit::WebIDBObjectStore::remove):
     33        (WebKit::WebIDBObjectStore::createIndex):
     34        (WebKit::WebIDBObjectStore::index):
     35        (WebKit::WebIDBObjectStore::removeIndex):
     36        (WebKit::WebIDBObjectStore::openCursor):
     37
    1382010-10-11  Andrei Popescu  <andreip@google.com>
    239

  • trunk/WebKit/chromium/WebKit.gyp

    r69365 r69541  
    151151                'public/WebEditingAction.h',
    152152                'public/WebElement.h',
     153                'public/WebExceptionCode.h',
    153154                'public/WebFileChooserCompletion.h',
    154155                'public/WebFileChooserParams.h',

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

    r67986 r69541  
    2828
    2929#include "WebCommon.h"
     30#include "WebExceptionCode.h"
    3031#include "WebIDBCallbacks.h"
    3132#include "WebIDBKey.h"
    … …  
    5354    virtual void value(WebSerializedScriptValue& serializedScriptValue, WebIDBKey& idbKey) const { WEBKIT_ASSERT_NOT_REACHED(); }
    5455
    55     virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
    56     virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
    57     virtual void remove(WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
     56    // FIXME: Remove.
     57    virtual void update(const WebSerializedScriptValue& value, WebIDBCallbacks* callbacks, WebExceptionCode&)
     58    {
     59        update(value, callbacks);
     60    }
     61    virtual void update(const WebSerializedScriptValue& value, WebIDBCallbacks* callbacks)
     62    {
     63        WebExceptionCode ec = 0;
     64        update(value, callbacks, ec);
     65    }
     66    virtual void continueFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, WebExceptionCode&)
     67    {
     68        continueFunction(key, callbacks);
     69    }
     70    virtual void continueFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks)
     71    {
     72        WebExceptionCode ec = 0;
     73        continueFunction(key, callbacks, ec);
     74    }
     75    virtual void remove(WebIDBCallbacks* callbacks, WebExceptionCode&)
     76    {
     77        remove(callbacks);
     78    }
     79    virtual void remove(WebIDBCallbacks* callbacks)
     80    {
     81        WebExceptionCode ec = 0;
     82        remove(callbacks, ec);
     83    }
     84
     85    /*
     86    virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     87    virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     88    virtual void remove(WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     89    */
    5890};
    5991

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

    r69121 r69541  
    2929#include "WebCommon.h"
    3030#include "WebDOMStringList.h"
     31#include "WebExceptionCode.h"
    3132
    3233namespace WebKit {
    … …  
    6364    }
    6465
    65     // FIXME: Remove once we update Chromium side.
    66     virtual void createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
    67     virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction&)
    68     {
    69         WEBKIT_ASSERT_NOT_REACHED();
    70         return 0;
    71     }
    72     // Transfers ownership of the WebIDBObjectStore to the caller.
     66    // FIXME: Remove after next roll.
    7367    virtual WebIDBObjectStore* objectStore(const WebString& name, unsigned short mode)
    7468    {
    … …  
    7670        return 0;
    7771    }
    78     // FIXME: Remove after WebKit roll.
    79     virtual void removeObjectStore(const WebString& name, WebIDBCallbacks* callbacks) { WEBKIT_ASSERT_NOT_REACHED(); }
    80     virtual void removeObjectStore(const WebString& name, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    81     virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks) { WEBKIT_ASSERT_NOT_REACHED(); }
     72    virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction& transaction, WebExceptionCode&)
     73    {
     74        return createObjectStore(name, keyPath, autoIncrement, transaction);
     75    }
     76    virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction& transaction)
     77    {
     78        WebExceptionCode ec = 0;
     79        return createObjectStore(name, keyPath, autoIncrement, transaction, ec);
     80    }
     81    virtual void removeObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode&)
     82    {
     83        removeObjectStore(name, transaction);
     84    }
     85    virtual void removeObjectStore(const WebString& name, const WebIDBTransaction& transaction)
     86    {
     87        WebExceptionCode ec = 0;
     88        removeObjectStore(name, transaction, ec);
     89    }
     90    virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode&)
     91    {
     92        setVersion(version, callbacks);
     93    }
     94    virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks)
     95    {
     96        WebExceptionCode ec = 0;
     97        setVersion(version, callbacks, ec);
     98    }
     99    virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout, WebExceptionCode&)
     100    {
     101        return transaction(names, mode, timeout);
     102    }
     103    virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout)
     104    {
     105        WebExceptionCode ec = 0;
     106        return transaction(names, mode, timeout, ec);
     107    }
     108/*
     109    virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction&, WebExceptionCode&)
     110    {
     111        WEBKIT_ASSERT_NOT_REACHED();
     112        return 0;
     113    }
     114    virtual void removeObjectStore(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     115    virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    82116    // Transfers ownership of the WebIDBTransaction to the caller.
    83     virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout)
     117    virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout, WebExceptionCode&)
    84118    {
    85119        WEBKIT_ASSERT_NOT_REACHED();
    86120        return 0;
    87121    }
     122*/
    88123    virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }
    89124};

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

    r69123 r69541  
    2727#define WebIDBIndex_h
    2828
     29#include "WebExceptionCode.h"
    2930#include "WebIDBTransaction.h"
    3031#include "WebString.h"
    … …  
    6263    }
    6364
    64     // FIXME: openObjectCursor -> openCursor and getObject -> get.
    65     virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    66     virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     65    virtual void openObjectCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
     66    {
     67        WebExceptionCode ec = 0;
     68        openObjectCursor(range, direction, callbacks, transaction, ec);
     69    }
     70    virtual void openObjectCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     71    {
     72        openObjectCursor(range, direction, callbacks, transaction);
     73    }
     74    virtual void openKeyCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
     75    {
     76        WebExceptionCode ec = 0;
     77        openKeyCursor(range, direction, callbacks, transaction, ec);
     78    }
     79    virtual void openKeyCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
    6780    {
    6881        openKeyCursor(range, direction, callbacks, transaction);
    6982    }
    70     virtual void openKeyCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     83    virtual void getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
    7184    {
    72         openCursor(range, direction, callbacks, transaction);
     85        WebExceptionCode ec = 0;
     86        getObject(key, callbacks, transaction, ec);
    7387    }
    74     virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    75     virtual void get(const WebIDBKey& range, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     88    virtual void getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
    7689    {
    77         getKey(range, callbacks, transaction);
     90        getObject(key, callbacks, transaction);
    7891    }
    79     virtual void getKey(const WebIDBKey& range, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     92    virtual void getKey(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
    8093    {
    81         get(range, callbacks, transaction);
     94        WebExceptionCode ec = 0;
     95        getKey(key, callbacks, transaction, ec);
    8296    }
     97    virtual void getKey(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     98    {
     99        getKey(key, callbacks, transaction);
     100    }
     101
     102    /*
     103    virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     104    virtual void openKeyCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     105    virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     106    virtual void getKey(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     107    */
    83108};
    84109

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

    r69121 r69541  
    2828
    2929#include "WebCommon.h"
     30#include "WebExceptionCode.h"
    3031#include "WebDOMStringList.h"
    3132#include "WebIDBCallbacks.h"
    … …  
    5960    }
    6061
    61     virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    62     virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, bool addOnly, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    63     virtual void remove(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    64     // FIXME: Remove once we update Chromium side.
    65     virtual void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
    66     virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction&)
     62    // FIXME: Remove.
     63    virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
     64    {
     65        get(key, callbacks, transaction);
     66    }
     67    virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     68    {
     69        WebExceptionCode ec = 0;
     70        get(key, callbacks, transaction, ec);
     71    }
     72    virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
     73    {
     74        put(value, key, addOnly, callbacks, transaction);
     75    }
     76    virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     77    {
     78        WebExceptionCode ec = 0;
     79        put(value, key, addOnly, callbacks, transaction, ec);
     80    }
     81    virtual void remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
     82    {
     83        remove(key, callbacks, transaction);
     84    }
     85    virtual void remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     86    {
     87        WebExceptionCode ec = 0;
     88        remove(key, callbacks, transaction, ec);
     89    }
     90    virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction& transaction, WebExceptionCode&)
     91    {
     92        return createIndex(name, keyPath, unique, transaction);
     93    }
     94    virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction& transaction)
     95    {
     96        WebExceptionCode ec = 0;
     97        return createIndex(name, keyPath, unique, transaction, ec);
     98    }
     99    virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&)
     100    {
     101        return index(name);
     102    }
     103    virtual WebIDBIndex* index(const WebString& name)
     104    {
     105        WebExceptionCode ec = 0;
     106        return index(name, ec);
     107    }
     108    virtual void removeIndex(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode&)
     109    {
     110        removeIndex(name, transaction);
     111    }
     112    virtual void removeIndex(const WebString& name, const WebIDBTransaction& transaction)
     113    {
     114        WebExceptionCode ec = 0;
     115        removeIndex(name, transaction, ec);
     116    }
     117    virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
     118    {
     119        openCursor(range, direction, callbacks, transaction);
     120    }
     121    virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     122    {
     123        WebExceptionCode ec = 0;
     124        openCursor(range, direction, callbacks, transaction, ec);
     125    }
     126
     127    /*
     128    virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     129    virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, bool addOnly, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     130    virtual void remove(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     131    virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction&, WebExceptionCode&)
    67132    {
    68133        WEBKIT_ASSERT_NOT_REACHED();
    … …  
    70135    }
    71136    // Transfers ownership of the WebIDBIndex to the caller.
    72     virtual WebIDBIndex* index(const WebString& name)
     137    virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&)
    73138    {
    74139        WEBKIT_ASSERT_NOT_REACHED();
    75140        return 0;
    76141    }
    77     // FIXME: Remove once we update Chromium side.
    78     virtual void removeIndex(const WebString& name, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
    79     virtual void removeIndex(const WebString& name, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    80     virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    81     // FIXME: finish.
     142    virtual void removeIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     143    virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
     144    */
    82145};
    83146
Note: See TracChangeset for help on using the changeset viewer.