diff options
author | tasak@google.com <tasak@google.com> | 2015-09-03 05:42:57 +0000 |
---|---|---|
committer | tasak@google.com <tasak@google.com> | 2015-09-03 05:42:57 +0000 |
commit | 393ea73a05c0ec8592efbcd65d9d5691bba30cd0 (patch) | |
tree | 0098edb8c0546790334e663f29c00ff45298f65b | |
parent | dd13a6052beb16e82e60a2053dedd69a853072ae (diff) | |
download | chromium_src-393ea73a05c0ec8592efbcd65d9d5691bba30cd0.zip chromium_src-393ea73a05c0ec8592efbcd65d9d5691bba30cd0.tar.gz chromium_src-393ea73a05c0ec8592efbcd65d9d5691bba30cd0.tar.bz2 |
[part 2] Make classes and structures in modules fast-allocated.
- modified: modules/gamepad, geofencing, geolocation, indexeddb, mediasession, mediastream,
navigatorcontentutils, permissions, presentation, push_messaging, quota, screen_orientation,
serviceworkers, speech, storage, vibration, vr, webaudio, webdatabase, webmidi, websockets,
and platform/audio.
- Added STATIC_ONLY, STACK_ALLOCATED, DISALLOW_ALLOCATION, or ALLOW_ONLY_INLINE_ALLOCATION
instead of WTF_MAKE_FAST_ALLOCATED(_WILL_BE_REMOVED) if possible.
BUG=523249
Review URL: https://codereview.chromium.org/1318793005
git-svn-id: svn://svn.chromium.org/blink/trunk@201701 bbb929c8-8fbe-4397-9dbb-9b2b20218538
68 files changed, 103 insertions, 45 deletions
diff --git a/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h b/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h index 43cfc3b..bf51606 100644 --- a/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h +++ b/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h @@ -23,6 +23,7 @@ public: void sampleGamepads(WebGamepads&); struct ConnectionChange { + DISALLOW_ALLOCATION(); WebGamepad pad; unsigned index; }; diff --git a/third_party/WebKit/Source/modules/geofencing/GeofencingError.h b/third_party/WebKit/Source/modules/geofencing/GeofencingError.h index 969c8fe..64ef8d1 100644 --- a/third_party/WebKit/Source/modules/geofencing/GeofencingError.h +++ b/third_party/WebKit/Source/modules/geofencing/GeofencingError.h @@ -16,14 +16,11 @@ class DOMException; class ScriptPromiseResolver; class GeofencingError { - WTF_MAKE_NONCOPYABLE(GeofencingError); + STATIC_ONLY(GeofencingError); public: // For CallbackPromiseAdapter. using WebType = const WebGeofencingError&; static DOMException* take(ScriptPromiseResolver*, const WebGeofencingError& webError); - -private: - GeofencingError() = delete; }; } // namespace blink diff --git a/third_party/WebKit/Source/modules/geolocation/GeolocationClient.h b/third_party/WebKit/Source/modules/geolocation/GeolocationClient.h index 42d68bc..5a27f06 100644 --- a/third_party/WebKit/Source/modules/geolocation/GeolocationClient.h +++ b/third_party/WebKit/Source/modules/geolocation/GeolocationClient.h @@ -37,6 +37,7 @@ class GeolocationPosition; class LocalFrame; class GeolocationClient : public NoBaseWillBeGarbageCollectedFinalized<GeolocationClient> { + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(GeolocationClient); public: virtual ~GeolocationClient() { } diff --git a/third_party/WebKit/Source/modules/geolocation/GeolocationController.h b/third_party/WebKit/Source/modules/geolocation/GeolocationController.h index 0a65f71..77365b3 100644 --- a/third_party/WebKit/Source/modules/geolocation/GeolocationController.h +++ b/third_party/WebKit/Source/modules/geolocation/GeolocationController.h @@ -43,6 +43,7 @@ class GeolocationPosition; class MODULES_EXPORT GeolocationController final : public NoBaseWillBeGarbageCollectedFinalized<GeolocationController>, public WillBeHeapSupplement<LocalFrame>, public PageLifecycleObserver { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(GeolocationController); WTF_MAKE_NONCOPYABLE(GeolocationController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(GeolocationController); public: virtual ~GeolocationController(); diff --git a/third_party/WebKit/Source/modules/geolocation/testing/GeolocationClientMock.h b/third_party/WebKit/Source/modules/geolocation/testing/GeolocationClientMock.h index ae27f2f..e9db20e 100644 --- a/third_party/WebKit/Source/modules/geolocation/testing/GeolocationClientMock.h +++ b/third_party/WebKit/Source/modules/geolocation/testing/GeolocationClientMock.h @@ -44,7 +44,7 @@ class GeolocationController; class GeolocationPosition; // Provides a mock object for the geolocation client. -class GeolocationClientMock : public GeolocationClient { +class GeolocationClientMock final : public GeolocationClient { public: GeolocationClientMock(); ~GeolocationClientMock() override; diff --git a/third_party/WebKit/Source/modules/geolocation/testing/InternalsGeolocation.h b/third_party/WebKit/Source/modules/geolocation/testing/InternalsGeolocation.h index 1c9f64a..fa73fee 100644 --- a/third_party/WebKit/Source/modules/geolocation/testing/InternalsGeolocation.h +++ b/third_party/WebKit/Source/modules/geolocation/testing/InternalsGeolocation.h @@ -32,6 +32,7 @@ #define InternalsGeolocation_h #include "platform/Timer.h" +#include "wtf/Allocator.h" #include "wtf/text/WTFString.h" namespace blink { @@ -41,6 +42,7 @@ class GeolocationClientMock; class Internals; class InternalsGeolocation { + STATIC_ONLY(InternalsGeolocation); public: static void setGeolocationClientMock(Internals&, Document*); static void setGeolocationPosition(Internals&, Document*, double latitude, double longitude, double accuracy); diff --git a/third_party/WebKit/Source/modules/imagebitmap/WindowImageBitmapFactories.h b/third_party/WebKit/Source/modules/imagebitmap/WindowImageBitmapFactories.h index dd1683e..efadd08 100644 --- a/third_party/WebKit/Source/modules/imagebitmap/WindowImageBitmapFactories.h +++ b/third_party/WebKit/Source/modules/imagebitmap/WindowImageBitmapFactories.h @@ -35,6 +35,7 @@ #include "bindings/core/v8/ScriptPromiseResolver.h" #include "bindings/core/v8/ScriptState.h" #include "platform/geometry/IntRect.h" +#include "wtf/Allocator.h" #include "wtf/Forward.h" #include "wtf/HashSet.h" @@ -48,6 +49,7 @@ class HTMLImageElement; class HTMLVideoElement; class WindowImageBitmapFactories { + STATIC_ONLY(WindowImageBitmapFactories); public: static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, HTMLImageElement*, ExceptionState&); static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, HTMLImageElement*, int sx, int sy, int sw, int sh, ExceptionState&); diff --git a/third_party/WebKit/Source/modules/indexeddb/DOMWindowIndexedDatabase.h b/third_party/WebKit/Source/modules/indexeddb/DOMWindowIndexedDatabase.h index 9a07234..af73d0b 100644 --- a/third_party/WebKit/Source/modules/indexeddb/DOMWindowIndexedDatabase.h +++ b/third_party/WebKit/Source/modules/indexeddb/DOMWindowIndexedDatabase.h @@ -38,6 +38,7 @@ class DOMWindow; class DOMWindowIndexedDatabase final : public NoBaseWillBeGarbageCollected<DOMWindowIndexedDatabase>, public WillBeHeapSupplement<LocalDOMWindow>, public DOMWindowProperty { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMWindowIndexedDatabase); DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowIndexedDatabase); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(DOMWindowIndexedDatabase); public: static DOMWindowIndexedDatabase& from(LocalDOMWindow&); diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.h b/third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.h index f76c99c..ba4c3ff 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.h +++ b/third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.h @@ -30,6 +30,7 @@ #define IDBEventDispatcher_h #include "platform/heap/Handle.h" +#include "wtf/Allocator.h" #include "wtf/RefPtr.h" #include "wtf/Vector.h" @@ -39,11 +40,9 @@ class Event; class EventTarget; class IDBEventDispatcher { + STATIC_ONLY(IDBEventDispatcher); public: static bool dispatch(Event*, WillBeHeapVector<RefPtrWillBeMember<EventTarget>>&); // The target first and then its ancestors in order of how the event bubbles. - -private: - IDBEventDispatcher(); }; } // namespace blink diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h b/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h index a0799e1..7f1cabc 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h +++ b/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h @@ -29,6 +29,7 @@ #include "bindings/modules/v8/UnionTypesModules.h" #include "modules/ModulesExport.h" #include "public/platform/modules/indexeddb/WebIDBKeyPath.h" +#include "wtf/Allocator.h" #include "wtf/Vector.h" #include "wtf/text/WTFString.h" @@ -42,6 +43,7 @@ enum IDBKeyPathParseError { MODULES_EXPORT void IDBParseKeyPath(const String&, Vector<String>&, IDBKeyPathParseError&); class MODULES_EXPORT IDBKeyPath { + DISALLOW_ALLOCATION(); public: IDBKeyPath() : m_type(NullType) { } explicit IDBKeyPath(const String&); diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h b/third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h index 2a22792..f08079f 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h +++ b/third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h @@ -31,6 +31,7 @@ #include "modules/indexeddb/IDBKeyPath.h" #include "public/platform/modules/indexeddb/WebIDBMetadata.h" +#include "wtf/Allocator.h" #include "wtf/HashMap.h" #include "wtf/text/StringHash.h" #include "wtf/text/WTFString.h" @@ -38,6 +39,7 @@ namespace blink { struct IDBIndexMetadata { + ALLOW_ONLY_INLINE_ALLOCATION(); IDBIndexMetadata() { } IDBIndexMetadata(const String& name, int64_t id, const IDBKeyPath& keyPath, bool unique, bool multiEntry) : name(name) @@ -55,6 +57,7 @@ struct IDBIndexMetadata { }; struct IDBObjectStoreMetadata { + ALLOW_ONLY_INLINE_ALLOCATION(); IDBObjectStoreMetadata() { } IDBObjectStoreMetadata(const String& name, int64_t id, const IDBKeyPath& keyPath, bool autoIncrement, int64_t maxIndexId) : name(name) @@ -77,6 +80,7 @@ struct IDBObjectStoreMetadata { }; struct IDBDatabaseMetadata { + DISALLOW_ALLOCATION(); // FIXME: These can probably be collapsed into 0. enum { NoIntVersion = -1, diff --git a/third_party/WebKit/Source/modules/indexeddb/WebIDBCallbacksImpl.h b/third_party/WebKit/Source/modules/indexeddb/WebIDBCallbacksImpl.h index 7951861..97602f1 100644 --- a/third_party/WebKit/Source/modules/indexeddb/WebIDBCallbacksImpl.h +++ b/third_party/WebKit/Source/modules/indexeddb/WebIDBCallbacksImpl.h @@ -48,6 +48,7 @@ struct WebIDBMetadata; struct WebIDBValue; class WebIDBCallbacksImpl final : public WebIDBCallbacks { + WTF_MAKE_FAST_ALLOCATED(WebIDBCallbacksImpl); public: static PassOwnPtr<WebIDBCallbacksImpl> create(IDBRequest*); diff --git a/third_party/WebKit/Source/modules/indexeddb/WebIDBDatabaseCallbacksImpl.h b/third_party/WebKit/Source/modules/indexeddb/WebIDBDatabaseCallbacksImpl.h index 9e43b53..e9c0da9 100644 --- a/third_party/WebKit/Source/modules/indexeddb/WebIDBDatabaseCallbacksImpl.h +++ b/third_party/WebKit/Source/modules/indexeddb/WebIDBDatabaseCallbacksImpl.h @@ -37,6 +37,7 @@ namespace blink { class WebIDBDatabaseCallbacksImpl final : public WebIDBDatabaseCallbacks { + WTF_MAKE_FAST_ALLOCATED(WebIDBDatabaseCallbacksImpl); public: static PassOwnPtr<WebIDBDatabaseCallbacksImpl> create(IDBDatabaseCallbacks*); diff --git a/third_party/WebKit/Source/modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h b/third_party/WebKit/Source/modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h index b9efdec..14ed4ea 100644 --- a/third_party/WebKit/Source/modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h +++ b/third_party/WebKit/Source/modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h @@ -38,6 +38,7 @@ class WorkerGlobalScope; class WorkerGlobalScopeIndexedDatabase final : public NoBaseWillBeGarbageCollectedFinalized<WorkerGlobalScopeIndexedDatabase>, public WillBeHeapSupplement<WorkerGlobalScope> { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScopeIndexedDatabase); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(WorkerGlobalScopeIndexedDatabase); public: virtual ~WorkerGlobalScopeIndexedDatabase(); static WorkerGlobalScopeIndexedDatabase& from(WillBeHeapSupplementable<WorkerGlobalScope>&); diff --git a/third_party/WebKit/Source/modules/mediasession/HTMLMediaElementMediaSession.h b/third_party/WebKit/Source/modules/mediasession/HTMLMediaElementMediaSession.h index 228287d..2d1c571 100644 --- a/third_party/WebKit/Source/modules/mediasession/HTMLMediaElementMediaSession.h +++ b/third_party/WebKit/Source/modules/mediasession/HTMLMediaElementMediaSession.h @@ -17,6 +17,7 @@ namespace blink { // MediaSession with HTMLMediaElement. class HTMLMediaElementMediaSession final : public NoBaseWillBeGarbageCollected<HTMLMediaElementMediaSession>, public WillBeHeapSupplement<HTMLMediaElement> { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementMediaSession); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(HTMLMediaElementMediaSession); public: static MediaSession* session(HTMLMediaElement&); static void setSession(HTMLMediaElement&, MediaSession*); diff --git a/third_party/WebKit/Source/modules/mediasource/HTMLVideoElementMediaSource.cpp b/third_party/WebKit/Source/modules/mediasource/HTMLVideoElementMediaSource.cpp index 7323cce..8f24c1b 100644 --- a/third_party/WebKit/Source/modules/mediasource/HTMLVideoElementMediaSource.cpp +++ b/third_party/WebKit/Source/modules/mediasource/HTMLVideoElementMediaSource.cpp @@ -36,10 +36,6 @@ namespace blink { -HTMLVideoElementMediaSource::HTMLVideoElementMediaSource() { } - -HTMLVideoElementMediaSource::~HTMLVideoElementMediaSource() { } - VideoPlaybackQuality* HTMLVideoElementMediaSource::getVideoPlaybackQuality(HTMLVideoElement& videoElement) { unsigned total = 0; diff --git a/third_party/WebKit/Source/modules/mediasource/HTMLVideoElementMediaSource.h b/third_party/WebKit/Source/modules/mediasource/HTMLVideoElementMediaSource.h index 0dd929b..f6602a5 100644 --- a/third_party/WebKit/Source/modules/mediasource/HTMLVideoElementMediaSource.h +++ b/third_party/WebKit/Source/modules/mediasource/HTMLVideoElementMediaSource.h @@ -32,7 +32,7 @@ #define HTMLVideoElementMediaSource_h #include "platform/heap/Handle.h" -#include "wtf/PassRefPtr.h" +#include "wtf/Allocator.h" namespace blink { @@ -40,12 +40,9 @@ class HTMLVideoElement; class VideoPlaybackQuality; class HTMLVideoElementMediaSource { + STATIC_ONLY(HTMLVideoElementMediaSource); public: static VideoPlaybackQuality* getVideoPlaybackQuality(HTMLVideoElement&); - -private: - HTMLVideoElementMediaSource(); - ~HTMLVideoElementMediaSource(); }; } diff --git a/third_party/WebKit/Source/modules/mediasource/URLMediaSource.h b/third_party/WebKit/Source/modules/mediasource/URLMediaSource.h index dc9d89a..301a06f 100644 --- a/third_party/WebKit/Source/modules/mediasource/URLMediaSource.h +++ b/third_party/WebKit/Source/modules/mediasource/URLMediaSource.h @@ -31,6 +31,7 @@ #ifndef URLMediaSource_h #define URLMediaSource_h +#include "wtf/Allocator.h" #include "wtf/Forward.h" namespace blink { @@ -39,6 +40,7 @@ class MediaSource; class ExecutionContext; class URLMediaSource { + STATIC_ONLY(URLMediaSource); public: static String createObjectURL(ExecutionContext*, MediaSource*); }; diff --git a/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp b/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp index 7fc0d4e..3b79806 100644 --- a/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp +++ b/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp @@ -40,14 +40,6 @@ namespace blink { -NavigatorMediaStream::NavigatorMediaStream() -{ -} - -NavigatorMediaStream::~NavigatorMediaStream() -{ -} - void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const MediaStreamConstraints& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState) { if (!successCallback) diff --git a/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.h b/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.h index 12cfb27..b24f5d7 100644 --- a/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.h +++ b/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.h @@ -21,6 +21,7 @@ #define NavigatorMediaStream_h #include "platform/heap/Handle.h" +#include "wtf/Allocator.h" #include "wtf/PassRefPtr.h" #include "wtf/text/WTFString.h" @@ -35,14 +36,11 @@ class NavigatorUserMediaErrorCallback; class NavigatorUserMediaSuccessCallback; class NavigatorMediaStream { + STATIC_ONLY(NavigatorMediaStream); public: static void webkitGetUserMedia(Navigator&, const MediaStreamConstraints&, NavigatorUserMediaSuccessCallback*, NavigatorUserMediaErrorCallback*, ExceptionState&); static void getMediaDevices(Navigator&, MediaDeviceInfoCallback*, ExceptionState&); - -private: - NavigatorMediaStream(); - ~NavigatorMediaStream(); }; } // namespace blink diff --git a/third_party/WebKit/Source/modules/mediastream/URLMediaStream.h b/third_party/WebKit/Source/modules/mediastream/URLMediaStream.h index 09c9652..8fe758d 100644 --- a/third_party/WebKit/Source/modules/mediastream/URLMediaStream.h +++ b/third_party/WebKit/Source/modules/mediastream/URLMediaStream.h @@ -31,6 +31,7 @@ #ifndef URLMediaStream_h #define URLMediaStream_h +#include "wtf/Allocator.h" #include "wtf/Forward.h" namespace blink { @@ -39,6 +40,7 @@ class MediaStream; class ExecutionContext; class URLMediaStream { + STATIC_ONLY(URLMediaStream); public: static String createObjectURL(ExecutionContext*, MediaStream*); }; diff --git a/third_party/WebKit/Source/modules/mediastream/UserMediaClient.h b/third_party/WebKit/Source/modules/mediastream/UserMediaClient.h index 9afa20b..12e4af4 100644 --- a/third_party/WebKit/Source/modules/mediastream/UserMediaClient.h +++ b/third_party/WebKit/Source/modules/mediastream/UserMediaClient.h @@ -35,12 +35,14 @@ #include "modules/mediastream/MediaDevicesRequest.h" #include "modules/mediastream/UserMediaRequest.h" #include "platform/mediastream/MediaStreamTrackSourcesRequest.h" +#include "wtf/FastAllocBase.h" namespace blink { class LocalFrame; class UserMediaClient { + WTF_MAKE_FAST_ALLOCATED(UserMediaClient); public: virtual void requestUserMedia(UserMediaRequest*) = 0; virtual void cancelUserMediaRequest(UserMediaRequest*) = 0; diff --git a/third_party/WebKit/Source/modules/mediastream/UserMediaController.h b/third_party/WebKit/Source/modules/mediastream/UserMediaController.h index 9d7a011..0655dd6 100644 --- a/third_party/WebKit/Source/modules/mediastream/UserMediaController.h +++ b/third_party/WebKit/Source/modules/mediastream/UserMediaController.h @@ -37,6 +37,7 @@ class UserMediaRequest; class UserMediaController final : public NoBaseWillBeGarbageCollected<UserMediaController>, public WillBeHeapSupplement<LocalFrame> { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(UserMediaController); DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(UserMediaController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(UserMediaController); public: static PassOwnPtrWillBeRawPtr<UserMediaController> create(UserMediaClient*); diff --git a/third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtils.h b/third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtils.h index 6ce509f..1c2bb28 100644 --- a/third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtils.h +++ b/third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtils.h @@ -42,6 +42,7 @@ class Navigator; class MODULES_EXPORT NavigatorContentUtils final : public NoBaseWillBeGarbageCollectedFinalized<NavigatorContentUtils>, public WillBeHeapSupplement<LocalFrame> { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorContentUtils); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(NavigatorContentUtils); public: virtual ~NavigatorContentUtils(); diff --git a/third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtilsClient.h b/third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtilsClient.h index b74ac4a..e21d46e 100644 --- a/third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtilsClient.h +++ b/third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtilsClient.h @@ -28,6 +28,7 @@ #include "modules/ModulesExport.h" #include "platform/weborigin/KURL.h" +#include "wtf/Allocator.h" #include "wtf/text/WTFString.h" namespace blink { @@ -35,6 +36,7 @@ namespace blink { class LocalFrame; class NavigatorContentUtilsClient { + WTF_MAKE_FAST_ALLOCATED(NavigatorContentUtilsClient); public: virtual ~NavigatorContentUtilsClient() { } virtual void registerProtocolHandler(const String& scheme, const KURL&, const String& title) = 0; diff --git a/third_party/WebKit/Source/modules/navigatorcontentutils/testing/InternalsNavigatorContentUtils.h b/third_party/WebKit/Source/modules/navigatorcontentutils/testing/InternalsNavigatorContentUtils.h index 4edd3ca..d0f183b 100644 --- a/third_party/WebKit/Source/modules/navigatorcontentutils/testing/InternalsNavigatorContentUtils.h +++ b/third_party/WebKit/Source/modules/navigatorcontentutils/testing/InternalsNavigatorContentUtils.h @@ -5,12 +5,15 @@ #ifndef InternalsNavigatorContentUtils_h #define InternalsNavigatorContentUtils_h +#include "wtf/Allocator.h" + namespace blink { class Document; class Internals; class InternalsNavigatorContentUtils { + STATIC_ONLY(InternalsNavigatorContentUtils); public: static void setNavigatorContentUtilsClientMock(Internals&, Document*); }; diff --git a/third_party/WebKit/Source/modules/navigatorcontentutils/testing/NavigatorContentUtilsClientMock.h b/third_party/WebKit/Source/modules/navigatorcontentutils/testing/NavigatorContentUtilsClientMock.h index 8754f68..c3fed52 100644 --- a/third_party/WebKit/Source/modules/navigatorcontentutils/testing/NavigatorContentUtilsClientMock.h +++ b/third_party/WebKit/Source/modules/navigatorcontentutils/testing/NavigatorContentUtilsClientMock.h @@ -14,7 +14,7 @@ namespace blink { class KURL; // Provides a mock object for the navigatorcontentutils client. -class NavigatorContentUtilsClientMock : public NavigatorContentUtilsClient { +class NavigatorContentUtilsClientMock final : public NavigatorContentUtilsClient { public: NavigatorContentUtilsClientMock() { } ~NavigatorContentUtilsClientMock() override { } diff --git a/third_party/WebKit/Source/modules/permissions/PermissionCallback.h b/third_party/WebKit/Source/modules/permissions/PermissionCallback.h index 5057fed..acbc787 100644 --- a/third_party/WebKit/Source/modules/permissions/PermissionCallback.h +++ b/third_party/WebKit/Source/modules/permissions/PermissionCallback.h @@ -9,6 +9,7 @@ #include "public/platform/modules/permissions/WebPermissionClient.h" #include "public/platform/modules/permissions/WebPermissionStatus.h" #include "public/platform/modules/permissions/WebPermissionType.h" +#include "wtf/FastAllocBase.h" #include "wtf/Noncopyable.h" namespace blink { @@ -20,6 +21,8 @@ class ScriptPromiseResolver; // the callback. It takes a WebPermissionType in its constructor and will pass // it to the PermissionStatus. class PermissionCallback final : public WebPermissionCallback { + WTF_MAKE_FAST_ALLOCATED(PermissionCallback); + WTF_MAKE_NONCOPYABLE(PermissionCallback); public: PermissionCallback(ScriptPromiseResolver*, WebPermissionType); ~PermissionCallback() override; @@ -30,8 +33,6 @@ public: private: Persistent<ScriptPromiseResolver> m_resolver; WebPermissionType m_permissionType; - - WTF_MAKE_NONCOPYABLE(PermissionCallback); }; } // namespace blink diff --git a/third_party/WebKit/Source/modules/permissions/PermissionController.h b/third_party/WebKit/Source/modules/permissions/PermissionController.h index f75efa6..f67bf04 100644 --- a/third_party/WebKit/Source/modules/permissions/PermissionController.h +++ b/third_party/WebKit/Source/modules/permissions/PermissionController.h @@ -19,6 +19,7 @@ class MODULES_EXPORT PermissionController final , public LocalFrameLifecycleObserver { WTF_MAKE_NONCOPYABLE(PermissionController); WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PermissionController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PermissionController); public: virtual ~PermissionController(); diff --git a/third_party/WebKit/Source/modules/presentation/PresentationController.h b/third_party/WebKit/Source/modules/presentation/PresentationController.h index dce55c9..03407df 100644 --- a/third_party/WebKit/Source/modules/presentation/PresentationController.h +++ b/third_party/WebKit/Source/modules/presentation/PresentationController.h @@ -29,6 +29,7 @@ class MODULES_EXPORT PresentationController final , public LocalFrameLifecycleObserver , public WebPresentationController { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PresentationController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PresentationController); WTF_MAKE_NONCOPYABLE(PresentationController); public: ~PresentationController() override; diff --git a/third_party/WebKit/Source/modules/presentation/PresentationError.h b/third_party/WebKit/Source/modules/presentation/PresentationError.h index 5904f23..c295b1a 100644 --- a/third_party/WebKit/Source/modules/presentation/PresentationError.h +++ b/third_party/WebKit/Source/modules/presentation/PresentationError.h @@ -7,6 +7,7 @@ #include "platform/heap/Handle.h" #include "public/platform/modules/presentation/WebPresentationError.h" +#include "wtf/Allocator.h" namespace blink { @@ -15,16 +16,12 @@ class ScriptPromiseResolver; // A container of methods taking care of WebPresentationError in WebCallbacks subclasses. class PresentationError final { - WTF_MAKE_NONCOPYABLE(PresentationError); + STATIC_ONLY(PresentationError); public: // For CallbackPromiseAdapter. using WebType = const WebPresentationError&; static DOMException* take(ScriptPromiseResolver*, const WebPresentationError&); - -private: - PresentationError() = delete; - ~PresentationError() = delete; }; } // namespace blink diff --git a/third_party/WebKit/Source/modules/push_messaging/PushController.h b/third_party/WebKit/Source/modules/push_messaging/PushController.h index 3980e21..0ebe4e1 100644 --- a/third_party/WebKit/Source/modules/push_messaging/PushController.h +++ b/third_party/WebKit/Source/modules/push_messaging/PushController.h @@ -19,6 +19,7 @@ class WebPushClient; class PushController final : public NoBaseWillBeGarbageCollected<PushController>, public WillBeHeapSupplement<LocalFrame> { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PushController); WTF_MAKE_NONCOPYABLE(PushController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PushController); public: static PassOwnPtrWillBeRawPtr<PushController> create(WebPushClient*); diff --git a/third_party/WebKit/Source/modules/push_messaging/PushError.h b/third_party/WebKit/Source/modules/push_messaging/PushError.h index ed38bb1..89f297a 100644 --- a/third_party/WebKit/Source/modules/push_messaging/PushError.h +++ b/third_party/WebKit/Source/modules/push_messaging/PushError.h @@ -8,20 +8,18 @@ #include "core/dom/DOMException.h" #include "platform/heap/Handle.h" #include "public/platform/modules/push_messaging/WebPushError.h" +#include "wtf/Allocator.h" namespace blink { class ScriptPromiseResolver; class PushError { - WTF_MAKE_NONCOPYABLE(PushError); + STATIC_ONLY(PushError); public: // For CallbackPromiseAdapter. using WebType = const WebPushError&; static DOMException* take(ScriptPromiseResolver*, const WebPushError& webError); - -private: - PushError() = delete; }; } // namespace blink diff --git a/third_party/WebKit/Source/modules/push_messaging/PushPermissionStatusCallbacks.h b/third_party/WebKit/Source/modules/push_messaging/PushPermissionStatusCallbacks.h index 79d1570..35eafa8 100644 --- a/third_party/WebKit/Source/modules/push_messaging/PushPermissionStatusCallbacks.h +++ b/third_party/WebKit/Source/modules/push_messaging/PushPermissionStatusCallbacks.h @@ -21,6 +21,7 @@ class ScriptPromiseResolver; // Will resolve the underlying promise depending on the permission received. class PushPermissionStatusCallbacks final : public WebPushPermissionStatusCallbacks { WTF_MAKE_NONCOPYABLE(PushPermissionStatusCallbacks); + WTF_MAKE_FAST_ALLOCATED(PushPermissionStatusCallbacks); public: explicit PushPermissionStatusCallbacks(ScriptPromiseResolver*); diff --git a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.h b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.h index c924487..bdff38e 100644 --- a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.h +++ b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.h @@ -22,6 +22,7 @@ struct WebPushSubscription; // will pass it to the PushSubscription. class PushSubscriptionCallbacks final : public WebPushSubscriptionCallbacks { WTF_MAKE_NONCOPYABLE(PushSubscriptionCallbacks); + WTF_MAKE_FAST_ALLOCATED(PushSubscriptionCallbacks); public: PushSubscriptionCallbacks(ScriptPromiseResolver*, ServiceWorkerRegistration*); ~PushSubscriptionCallbacks() override; diff --git a/third_party/WebKit/Source/modules/quota/DOMWindowQuota.h b/third_party/WebKit/Source/modules/quota/DOMWindowQuota.h index 3bca96f..2c2cb57 100644 --- a/third_party/WebKit/Source/modules/quota/DOMWindowQuota.h +++ b/third_party/WebKit/Source/modules/quota/DOMWindowQuota.h @@ -43,6 +43,7 @@ class DOMWindow; class DOMWindowQuota final : public NoBaseWillBeGarbageCollected<DOMWindowQuota>, public WillBeHeapSupplement<LocalDOMWindow>, public DOMWindowProperty { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMWindowQuota); DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowQuota); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(DOMWindowQuota); public: static DOMWindowQuota& from(LocalDOMWindow&); static DeprecatedStorageInfo* webkitStorageInfo(DOMWindow&); diff --git a/third_party/WebKit/Source/modules/screen_orientation/LockOrientationCallback.h b/third_party/WebKit/Source/modules/screen_orientation/LockOrientationCallback.h index 74bc20d..64d1fc0 100644 --- a/third_party/WebKit/Source/modules/screen_orientation/LockOrientationCallback.h +++ b/third_party/WebKit/Source/modules/screen_orientation/LockOrientationCallback.h @@ -20,6 +20,7 @@ class ScriptPromiseResolver; // that will resolve the underlying promise depending on the result passed to // the callback. class LockOrientationCallback final : public WebLockOrientationCallback { + WTF_MAKE_FAST_ALLOCATED(LockOrientationCallback); WTF_MAKE_NONCOPYABLE(LockOrientationCallback); public: explicit LockOrientationCallback(ScriptPromiseResolver*); diff --git a/third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationController.h b/third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationController.h index 5400401..b9839cc 100644 --- a/third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationController.h +++ b/third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationController.h @@ -27,6 +27,7 @@ class MODULES_EXPORT ScreenOrientationController final , public PlatformEventController { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ScreenOrientationController); WTF_MAKE_NONCOPYABLE(ScreenOrientationController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(ScreenOrientationController); public: ~ScreenOrientationController() override; diff --git a/third_party/WebKit/Source/modules/serviceworkers/testing/InternalsServiceWorker.h b/third_party/WebKit/Source/modules/serviceworkers/testing/InternalsServiceWorker.h index 248df93..d032c46 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/testing/InternalsServiceWorker.h +++ b/third_party/WebKit/Source/modules/serviceworkers/testing/InternalsServiceWorker.h @@ -5,12 +5,15 @@ #ifndef InternalsServiceWorker_h #define InternalsServiceWorker_h +#include "wtf/Allocator.h" + namespace blink { class Internals; class ServiceWorker; class InternalsServiceWorker { + STATIC_ONLY(InternalsServiceWorker); public: static void terminateServiceWorker(Internals&, ServiceWorker*); }; diff --git a/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h b/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h index a74aa91..0b00d96 100644 --- a/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h +++ b/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h @@ -39,6 +39,7 @@ class DOMWindow; class MODULES_EXPORT DOMWindowSpeechSynthesis final : public NoBaseWillBeGarbageCollected<DOMWindowSpeechSynthesis>, public WillBeHeapSupplement<LocalDOMWindow>, public DOMWindowProperty { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMWindowSpeechSynthesis); DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowSpeechSynthesis); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(DOMWindowSpeechSynthesis); public: static SpeechSynthesis* speechSynthesis(DOMWindow&); static DOMWindowSpeechSynthesis& from(LocalDOMWindow&); diff --git a/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.h b/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.h index 52e8a19..387dbc1 100644 --- a/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.h +++ b/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.h @@ -36,6 +36,7 @@ class MediaStreamTrack; class SpeechRecognitionController final : public NoBaseWillBeGarbageCollectedFinalized<SpeechRecognitionController>, public WillBeHeapSupplement<Page> { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(SpeechRecognitionController); public: virtual ~SpeechRecognitionController(); diff --git a/third_party/WebKit/Source/modules/speech/testing/InternalsSpeechSynthesis.h b/third_party/WebKit/Source/modules/speech/testing/InternalsSpeechSynthesis.h index f495fff..f370375 100644 --- a/third_party/WebKit/Source/modules/speech/testing/InternalsSpeechSynthesis.h +++ b/third_party/WebKit/Source/modules/speech/testing/InternalsSpeechSynthesis.h @@ -31,12 +31,15 @@ #ifndef InternalsSpeechSynthesis_h #define InternalsSpeechSynthesis_h +#include "wtf/Allocator.h" + namespace blink { class Document; class Internals; class InternalsSpeechSynthesis { + STATIC_ONLY(InternalsSpeechSynthesis); public: static void enableMockSpeechSynthesizer(Internals&, Document*); }; diff --git a/third_party/WebKit/Source/modules/storage/DOMWindowStorage.h b/third_party/WebKit/Source/modules/storage/DOMWindowStorage.h index 440037e..9b40087 100644 --- a/third_party/WebKit/Source/modules/storage/DOMWindowStorage.h +++ b/third_party/WebKit/Source/modules/storage/DOMWindowStorage.h @@ -18,6 +18,7 @@ class Storage; class DOMWindowStorage final : public NoBaseWillBeGarbageCollected<DOMWindowStorage>, public WillBeHeapSupplement<LocalDOMWindow>, public DOMWindowProperty { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMWindowStorage); DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowStorage); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(DOMWindowStorage); public: static DOMWindowStorage& from(LocalDOMWindow&); static Storage* sessionStorage(DOMWindow&, ExceptionState&); diff --git a/third_party/WebKit/Source/modules/storage/DOMWindowStorageController.h b/third_party/WebKit/Source/modules/storage/DOMWindowStorageController.h index 88a6c80..6630f67a 100644 --- a/third_party/WebKit/Source/modules/storage/DOMWindowStorageController.h +++ b/third_party/WebKit/Source/modules/storage/DOMWindowStorageController.h @@ -19,6 +19,7 @@ class Event; class MODULES_EXPORT DOMWindowStorageController final : public NoBaseWillBeGarbageCollected<DOMWindowStorageController>, public WillBeHeapSupplement<Document>, public DOMWindowLifecycleObserver { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMWindowStorageController); DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowStorageController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(DOMWindowStorageController); public: DECLARE_VIRTUAL_TRACE(); diff --git a/third_party/WebKit/Source/modules/storage/StorageNamespace.h b/third_party/WebKit/Source/modules/storage/StorageNamespace.h index a236cc1..259c1d5 100644 --- a/third_party/WebKit/Source/modules/storage/StorageNamespace.h +++ b/third_party/WebKit/Source/modules/storage/StorageNamespace.h @@ -38,6 +38,7 @@ class SecurityOrigin; class StorageArea; class MODULES_EXPORT StorageNamespace { + WTF_MAKE_FAST_ALLOCATED(StorageNamespace); public: explicit StorageNamespace(PassOwnPtr<WebStorageNamespace>); ~StorageNamespace(); diff --git a/third_party/WebKit/Source/modules/storage/StorageNamespaceController.h b/third_party/WebKit/Source/modules/storage/StorageNamespaceController.h index 3087351..13908e3 100644 --- a/third_party/WebKit/Source/modules/storage/StorageNamespaceController.h +++ b/third_party/WebKit/Source/modules/storage/StorageNamespaceController.h @@ -18,6 +18,7 @@ class StorageNamespace; class MODULES_EXPORT StorageNamespaceController final : public NoBaseWillBeGarbageCollectedFinalized<StorageNamespaceController>, public WillBeHeapSupplement<Page> { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StorageNamespaceController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(StorageNamespaceController); public: StorageNamespace* sessionStorage(bool optionalCreate = true); StorageClient* storageClient() { return m_client; } diff --git a/third_party/WebKit/Source/modules/vibration/NavigatorVibration.h b/third_party/WebKit/Source/modules/vibration/NavigatorVibration.h index 546a0fc..8df8796 100644 --- a/third_party/WebKit/Source/modules/vibration/NavigatorVibration.h +++ b/third_party/WebKit/Source/modules/vibration/NavigatorVibration.h @@ -38,6 +38,7 @@ class MODULES_EXPORT NavigatorVibration final , public WillBeHeapSupplement<Page> , public PageLifecycleObserver { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorVibration); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(NavigatorVibration); public: typedef Vector<unsigned> VibrationPattern; diff --git a/third_party/WebKit/Source/modules/vibration/testing/InternalsVibration.h b/third_party/WebKit/Source/modules/vibration/testing/InternalsVibration.h index c39dc81..307e248 100644 --- a/third_party/WebKit/Source/modules/vibration/testing/InternalsVibration.h +++ b/third_party/WebKit/Source/modules/vibration/testing/InternalsVibration.h @@ -31,6 +31,7 @@ #ifndef InternalsVibration_h #define InternalsVibration_h +#include "wtf/Allocator.h" #include "wtf/Vector.h" namespace blink { @@ -39,6 +40,7 @@ class Document; class Internals; class InternalsVibration { + STATIC_ONLY(InternalsVibration); public: static bool isVibrating(Internals&, Document*); static Vector<unsigned> pendingVibrationPattern(Internals&, Document*); diff --git a/third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h b/third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h index f04950f..3836dce 100644 --- a/third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h +++ b/third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.h @@ -15,6 +15,7 @@ class ScriptPromiseResolver; class WebVRClient; class VRGetDevicesCallback final : public WebVRGetDevicesCallback { + WTF_MAKE_FAST_ALLOCATED(VRGetDevicesCallback); public: VRGetDevicesCallback(ScriptPromiseResolver*, VRHardwareUnitCollection*); ~VRGetDevicesCallback() override; diff --git a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h index 8e39cb7..67c9966 100644 --- a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h +++ b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h @@ -40,6 +40,7 @@ class DOMArrayBuffer; // Upon successful decoding, a completion callback will be invoked with the decoded PCM data in an AudioBuffer. class AsyncAudioDecoder { + DISALLOW_ALLOCATION(); WTF_MAKE_NONCOPYABLE(AsyncAudioDecoder); public: AsyncAudioDecoder(); diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.h b/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.h index bdf1a3f..ed7e28c 100644 --- a/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.h +++ b/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.h @@ -28,6 +28,7 @@ #include "modules/webaudio/AudioNode.h" #include "modules/webaudio/AudioSummingJunction.h" #include "platform/audio/AudioBus.h" +#include "wtf/FastAllocBase.h" #include "wtf/HashSet.h" namespace blink { @@ -39,6 +40,7 @@ class AudioNodeOutput; // The number of channels of the input's bus is the maximum of the number of channels of all its connections. class AudioNodeInput final : public AudioSummingJunction { + WTF_MAKE_FAST_ALLOCATED(AudioNodeInput); public: static PassOwnPtr<AudioNodeInput> create(AudioHandler&); diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.h b/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.h index db67e40..e86f45f4 100644 --- a/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.h +++ b/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.h @@ -38,6 +38,7 @@ class AudioNodeInput; // AudioNodeOutput represents a single output for an AudioNode. // It may be connected to one or more AudioNodeInputs. class AudioNodeOutput final { + WTF_MAKE_FAST_ALLOCATED(AudioNodeOutput); public: // It's OK to pass 0 for numberOfChannels in which case // setNumberOfChannels() must be called later on. diff --git a/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.h b/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.h index b9e5a99..42f5bda 100644 --- a/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.h +++ b/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.h @@ -38,6 +38,7 @@ namespace blink { class AudioParamTimeline { + DISALLOW_ALLOCATION(); public: AudioParamTimeline() { diff --git a/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.h b/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.h index 99771ed..32e6620 100644 --- a/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.h +++ b/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.h @@ -37,6 +37,7 @@ class AudioBus; class RealtimeAnalyser final { WTF_MAKE_NONCOPYABLE(RealtimeAnalyser); + DISALLOW_ALLOCATION(); public: RealtimeAnalyser(); diff --git a/third_party/WebKit/Source/modules/webaudio/testing/InternalsWebAudio.h b/third_party/WebKit/Source/modules/webaudio/testing/InternalsWebAudio.h index 9536a49..e7accff 100644 --- a/third_party/WebKit/Source/modules/webaudio/testing/InternalsWebAudio.h +++ b/third_party/WebKit/Source/modules/webaudio/testing/InternalsWebAudio.h @@ -5,11 +5,14 @@ #ifndef InternalsWebAudio_h #define InternalsWebAudio_h +#include "wtf/Allocator.h" + namespace blink { class Internals; class InternalsWebAudio { + STATIC_ONLY(InternalsWebAudio); public: static unsigned audioHandlerCount(Internals&); }; diff --git a/third_party/WebKit/Source/modules/webdatabase/ChangeVersionData.h b/third_party/WebKit/Source/modules/webdatabase/ChangeVersionData.h index 109ed999..bf660fc 100644 --- a/third_party/WebKit/Source/modules/webdatabase/ChangeVersionData.h +++ b/third_party/WebKit/Source/modules/webdatabase/ChangeVersionData.h @@ -26,11 +26,13 @@ #ifndef ChangeVersionData_h #define ChangeVersionData_h +#include "wtf/Allocator.h" #include "wtf/text/WTFString.h" namespace blink { class ChangeVersionData { + STACK_ALLOCATED(); public: ChangeVersionData(String oldVersion, String newVersion) : m_oldVersion(oldVersion), m_newVersion(newVersion) { } diff --git a/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.h b/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.h index b2a43eb..de3de42 100644 --- a/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.h +++ b/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.h @@ -38,12 +38,9 @@ class DatabaseCallback; class ExceptionState; class DOMWindowWebDatabase { + STATIC_ONLY(DOMWindowWebDatabase); public: static Database* openDatabase(DOMWindow&, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, DatabaseCallback* creationCallback, ExceptionState&); - -private: - DOMWindowWebDatabase() { } - ~DOMWindowWebDatabase() { } }; } // namespace blink diff --git a/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.h b/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.h index f447b194..6da1acc 100644 --- a/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.h +++ b/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.h @@ -41,6 +41,8 @@ namespace blink { class MODULES_EXPORT QuotaTracker { + WTF_MAKE_FAST_ALLOCATED(QuotaTracker); + WTF_MAKE_NONCOPYABLE(QuotaTracker); public: static QuotaTracker& instance(); diff --git a/third_party/WebKit/Source/modules/webdatabase/SQLError.h b/third_party/WebKit/Source/modules/webdatabase/SQLError.h index 6c8e03d..b9cd3b3 100644 --- a/third_party/WebKit/Source/modules/webdatabase/SQLError.h +++ b/third_party/WebKit/Source/modules/webdatabase/SQLError.h @@ -35,6 +35,7 @@ namespace blink { class SQLErrorData { + WTF_MAKE_FAST_ALLOCATED(SQLErrorData); public: static PassOwnPtr<SQLErrorData> create(unsigned code, const String& message) { diff --git a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLValue.h b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLValue.h index 79792e1..72b0718 100644 --- a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLValue.h +++ b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLValue.h @@ -29,11 +29,13 @@ #ifndef SQLValue_h #define SQLValue_h +#include "wtf/Allocator.h" #include "wtf/text/WTFString.h" namespace blink { class SQLValue { + ALLOW_ONLY_INLINE_ALLOCATION(); public: enum Type { NullValue, NumberValue, StringValue }; diff --git a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.h b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.h index 622cedd..f5dcf4f 100644 --- a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.h +++ b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.h @@ -31,6 +31,7 @@ #ifndef SQLiteFileSystem_h #define SQLiteFileSystem_h +#include "wtf/Allocator.h" #include "wtf/Threading.h" #include "wtf/text/WTFString.h" @@ -41,6 +42,7 @@ namespace blink { // A class that abstracts the file system related operations required // by the WebKit database code. class SQLiteFileSystem { + DISALLOW_ALLOCATION(); public: // Registers a user-defined SQLite VFS. static void registerSQLiteVFS(); diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h b/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h index 943ad4d..e1fb8bd9 100644 --- a/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h +++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h @@ -22,6 +22,7 @@ class ScriptState; class MODULES_EXPORT MIDIAccessInitializer : public ScriptPromiseResolver, public MIDIAccessorClient { public: struct PortDescriptor { + ALLOW_ONLY_INLINE_ALLOCATION(); String id; String manufacturer; String name; diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h b/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h index cb6e582..f498c58 100644 --- a/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h +++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h @@ -33,6 +33,7 @@ #include "public/platform/WebMIDIAccessor.h" #include "public/platform/WebMIDIAccessorClient.h" +#include "wtf/FastAllocBase.h" #include "wtf/OwnPtr.h" #include "wtf/PassOwnPtr.h" @@ -41,6 +42,7 @@ namespace blink { class MIDIAccessorClient; class MIDIAccessor final : public WebMIDIAccessorClient { + WTF_MAKE_FAST_ALLOCATED(MIDIAccessor); public: static PassOwnPtr<MIDIAccessor> create(MIDIAccessorClient*); diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIController.h b/third_party/WebKit/Source/modules/webmidi/MIDIController.h index bc66bbe..ee81f8e 100644 --- a/third_party/WebKit/Source/modules/webmidi/MIDIController.h +++ b/third_party/WebKit/Source/modules/webmidi/MIDIController.h @@ -41,6 +41,7 @@ class MIDIClient; class MIDIController final : public NoBaseWillBeGarbageCollectedFinalized<MIDIController>, public WillBeHeapSupplement<LocalFrame> { WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MIDIController); + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(MIDIController); public: virtual ~MIDIController(); diff --git a/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.h b/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.h index 7a2ef75..5a2c7af 100644 --- a/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.h +++ b/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.h @@ -18,11 +18,13 @@ class Document; class KURL; class InspectorWebSocketCreateEvent { + STATIC_ONLY(InspectorWebSocketCreateEvent); public: static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(Document*, unsigned long identifier, const KURL&, const String& protocol); }; class InspectorWebSocketEvent { + STATIC_ONLY(InspectorWebSocketEvent); public: static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(Document*, unsigned long identifier); }; diff --git a/third_party/WebKit/Source/modules/websockets/WebSocketFrame.h b/third_party/WebKit/Source/modules/websockets/WebSocketFrame.h index 7574281..0a8d3d2 100644 --- a/third_party/WebKit/Source/modules/websockets/WebSocketFrame.h +++ b/third_party/WebKit/Source/modules/websockets/WebSocketFrame.h @@ -31,9 +31,12 @@ #ifndef WebSocketFrame_h #define WebSocketFrame_h +#include "wtf/Allocator.h" + namespace blink { struct WebSocketFrame { + STACK_ALLOCATED(); // RFC6455 opcodes. enum OpCode { OpCodeContinuation = 0x0, diff --git a/third_party/WebKit/Source/platform/audio/AudioDSPKernel.h b/third_party/WebKit/Source/platform/audio/AudioDSPKernel.h index 9932445..6c3ad8b 100644 --- a/third_party/WebKit/Source/platform/audio/AudioDSPKernel.h +++ b/third_party/WebKit/Source/platform/audio/AudioDSPKernel.h @@ -32,12 +32,14 @@ #define AudioDSPKernel_h #include "platform/audio/AudioDSPKernelProcessor.h" +#include "wtf/FastAllocBase.h" namespace blink { // AudioDSPKernel does the processing for one channel of an AudioDSPKernelProcessor. class PLATFORM_EXPORT AudioDSPKernel { + WTF_MAKE_FAST_ALLOCATED(AudioDSPKernel); public: AudioDSPKernel(AudioDSPKernelProcessor* kernelProcessor) : m_kernelProcessor(kernelProcessor) diff --git a/third_party/WebKit/Source/platform/audio/AudioProcessor.h b/third_party/WebKit/Source/platform/audio/AudioProcessor.h index ec9e994..ddc9fb0 100644 --- a/third_party/WebKit/Source/platform/audio/AudioProcessor.h +++ b/third_party/WebKit/Source/platform/audio/AudioProcessor.h @@ -32,6 +32,7 @@ #define AudioProcessor_h #include "platform/PlatformExport.h" +#include "wtf/FastAllocBase.h" namespace blink { @@ -42,6 +43,7 @@ class AudioBus; // or as the processor for a basic (one input - one output) AudioNode. class PLATFORM_EXPORT AudioProcessor { + WTF_MAKE_FAST_ALLOCATED(AudioProcessor); public: AudioProcessor(float sampleRate, unsigned numberOfChannels) : m_initialized(false) |