| Index: Source/modules/indexeddb/IDBCursor.h
|
| diff --git a/Source/modules/indexeddb/IDBCursor.h b/Source/modules/indexeddb/IDBCursor.h
|
| index c414eb065e19f835aa1a1633220fbf1187304ba2..200434745d9cc2b118f5897ce2ea968c4252c951 100644
|
| --- a/Source/modules/indexeddb/IDBCursor.h
|
| +++ b/Source/modules/indexeddb/IDBCursor.h
|
| @@ -38,17 +38,12 @@
|
|
|
| namespace blink {
|
|
|
| -class WebBlobInfo;
|
| -
|
| -} // namespace blink
|
| -
|
| -namespace blink {
|
| -
|
| class ExceptionState;
|
| class IDBAny;
|
| class IDBTransaction;
|
| class ExecutionContext;
|
| class SharedBuffer;
|
| +class WebBlobInfo;
|
|
|
| class IDBCursor : public GarbageCollectedFinalized<IDBCursor>, public ScriptWrappable {
|
| public:
|
| @@ -57,10 +52,10 @@ public:
|
| static const AtomicString& directionPrev();
|
| static const AtomicString& directionPrevUnique();
|
|
|
| - static blink::WebIDBCursorDirection stringToDirection(const String& modeString, ExceptionState&);
|
| + static WebIDBCursorDirection stringToDirection(const String& modeString, ExceptionState&);
|
| static const AtomicString& directionToString(unsigned short mode);
|
|
|
| - static IDBCursor* create(PassOwnPtr<blink::WebIDBCursor>, blink::WebIDBCursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
|
| + static IDBCursor* create(PassOwnPtr<WebIDBCursor>, WebIDBCursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
|
| virtual ~IDBCursor();
|
| void trace(Visitor*);
|
| void contextWillBeDestroyed() { m_backend.clear(); }
|
| @@ -86,22 +81,22 @@ public:
|
| void postSuccessHandlerCallback();
|
| bool isDeleted() const;
|
| void close();
|
| - void setValueReady(IDBKey*, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<blink::WebBlobInfo> >);
|
| + void setValueReady(IDBKey*, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<WebBlobInfo> >);
|
| IDBKey* idbPrimaryKey() const { return m_primaryKey; }
|
| IDBRequest* request() const { return m_request.get(); }
|
| virtual bool isKeyCursor() const { return true; }
|
| virtual bool isCursorWithValue() const { return false; }
|
|
|
| protected:
|
| - IDBCursor(PassOwnPtr<blink::WebIDBCursor>, blink::WebIDBCursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
|
| + IDBCursor(PassOwnPtr<WebIDBCursor>, WebIDBCursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
|
|
|
| private:
|
| IDBObjectStore* effectiveObjectStore() const;
|
| void handleBlobAcks();
|
|
|
| - OwnPtr<blink::WebIDBCursor> m_backend;
|
| + OwnPtr<WebIDBCursor> m_backend;
|
| Member<IDBRequest> m_request;
|
| - const blink::WebIDBCursorDirection m_direction;
|
| + const WebIDBCursorDirection m_direction;
|
| Member<IDBAny> m_source;
|
| Member<IDBTransaction> m_transaction;
|
| bool m_gotValue;
|
| @@ -111,7 +106,7 @@ private:
|
| Member<IDBKey> m_key;
|
| Member<IDBKey> m_primaryKey;
|
| RefPtr<SharedBuffer> m_value;
|
| - OwnPtr<Vector<blink::WebBlobInfo> > m_blobInfo;
|
| + OwnPtr<Vector<WebBlobInfo> > m_blobInfo;
|
| };
|
|
|
| } // namespace blink
|
|
|