Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Side by Side Diff: Source/modules/indexeddb/IDBRequest.h

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<IDBReques t> 56 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<IDBReques t>
57 , public EventTargetWithInlineData 57 , public EventTargetWithInlineData
58 , public ActiveDOMObject { 58 , public ActiveDOMObject {
59 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<I DBRequest>); 59 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<I DBRequest>);
60 DEFINE_WRAPPERTYPEINFO(); 60 DEFINE_WRAPPERTYPEINFO();
61 USING_PRE_FINALIZER(IDBRequest, dispose); 61 USING_PRE_FINALIZER(IDBRequest, dispose);
62 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(IDBRequest); 62 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(IDBRequest);
63 public: 63 public:
64 static IDBRequest* create(ScriptState*, IDBAny* source, IDBTransaction*); 64 static IDBRequest* create(ScriptState*, IDBAny* source, IDBTransaction*);
65 virtual ~IDBRequest(); 65 virtual ~IDBRequest();
66 virtual void trace(Visitor*) OVERRIDE; 66 virtual void trace(Visitor*) override;
67 67
68 ScriptState* scriptState() { return m_scriptState.get(); } 68 ScriptState* scriptState() { return m_scriptState.get(); }
69 ScriptValue result(ExceptionState&); 69 ScriptValue result(ExceptionState&);
70 DOMError* error(ExceptionState&) const; 70 DOMError* error(ExceptionState&) const;
71 ScriptValue source() const; 71 ScriptValue source() const;
72 IDBTransaction* transaction() const { return m_transaction.get(); } 72 IDBTransaction* transaction() const { return m_transaction.get(); }
73 73
74 bool isResultDirty() const { return m_resultDirty; } 74 bool isResultDirty() const { return m_resultDirty; }
75 IDBAny* resultAsAny() const { return m_result; } 75 IDBAny* resultAsAny() const { return m_result; }
76 76
(...skipping 26 matching lines...) Expand all
103 virtual void onSuccess(int64_t); 103 virtual void onSuccess(int64_t);
104 virtual void onSuccess(); 104 virtual void onSuccess();
105 virtual void onSuccess(IDBKey*, IDBKey* primaryKey, PassRefPtr<SharedBuffer> , PassOwnPtr<Vector<WebBlobInfo> >); 105 virtual void onSuccess(IDBKey*, IDBKey* primaryKey, PassRefPtr<SharedBuffer> , PassOwnPtr<Vector<WebBlobInfo> >);
106 106
107 // Only IDBOpenDBRequest instances should receive these: 107 // Only IDBOpenDBRequest instances should receive these:
108 virtual void onBlocked(int64_t oldVersion) { ASSERT_NOT_REACHED(); } 108 virtual void onBlocked(int64_t oldVersion) { ASSERT_NOT_REACHED(); }
109 virtual void onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBDatabase>, const IDBDatabaseMetadata&, WebIDBDataLoss, String dataLossMessage) { ASSERT_NO T_REACHED(); } 109 virtual void onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBDatabase>, const IDBDatabaseMetadata&, WebIDBDataLoss, String dataLossMessage) { ASSERT_NO T_REACHED(); }
110 virtual void onSuccess(PassOwnPtr<WebIDBDatabase>, const IDBDatabaseMetadata &) { ASSERT_NOT_REACHED(); } 110 virtual void onSuccess(PassOwnPtr<WebIDBDatabase>, const IDBDatabaseMetadata &) { ASSERT_NOT_REACHED(); }
111 111
112 // ActiveDOMObject 112 // ActiveDOMObject
113 virtual bool hasPendingActivity() const OVERRIDE FINAL; 113 virtual bool hasPendingActivity() const override final;
114 virtual void stop() OVERRIDE FINAL; 114 virtual void stop() override final;
115 115
116 // EventTarget 116 // EventTarget
117 virtual const AtomicString& interfaceName() const OVERRIDE; 117 virtual const AtomicString& interfaceName() const override;
118 virtual ExecutionContext* executionContext() const OVERRIDE FINAL; 118 virtual ExecutionContext* executionContext() const override final;
119 virtual void uncaughtExceptionInEventHandler() OVERRIDE FINAL; 119 virtual void uncaughtExceptionInEventHandler() override final;
120 120
121 using EventTarget::dispatchEvent; 121 using EventTarget::dispatchEvent;
122 virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE; 122 virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) override;
123 123
124 // Called by a version change transaction that has finished to set this 124 // Called by a version change transaction that has finished to set this
125 // request back from DONE (following "upgradeneeded") back to PENDING (for 125 // request back from DONE (following "upgradeneeded") back to PENDING (for
126 // the upcoming "success" or "error"). 126 // the upcoming "success" or "error").
127 void transactionDidFinishAndDispatch(); 127 void transactionDidFinishAndDispatch();
128 128
129 IDBCursor* getResultCursor() const; 129 IDBCursor* getResultCursor() const;
130 130
131 protected: 131 protected:
132 IDBRequest(ScriptState*, IDBAny* source, IDBTransaction*); 132 IDBRequest(ScriptState*, IDBAny* source, IDBTransaction*);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 OwnPtr<Vector<WebBlobInfo> > m_blobInfo; 167 OwnPtr<Vector<WebBlobInfo> > m_blobInfo;
168 168
169 bool m_didFireUpgradeNeededEvent; 169 bool m_didFireUpgradeNeededEvent;
170 bool m_preventPropagation; 170 bool m_preventPropagation;
171 bool m_resultDirty; 171 bool m_resultDirty;
172 }; 172 };
173 173
174 } // namespace blink 174 } // namespace blink
175 175
176 #endif // IDBRequest_h 176 #endif // IDBRequest_h
OLDNEW
« no previous file with comments | « Source/modules/indexeddb/IDBOpenDBRequest.h ('k') | Source/modules/indexeddb/IDBRequestTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698