diff options
| author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2014-12-05 15:04:29 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-09 10:49:28 +0100 |
| commit | af6588f8d723931a298c995fa97259bb7f7deb55 (patch) | |
| tree | 060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/gin/array_buffer.h | |
| parent | 2fff84d821cc7b1c785f6404e0f8091333283e74 (diff) | |
| download | qtwebengine-chromium-af6588f8d723931a298c995fa97259bb7f7deb55.tar.gz | |
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/gin/array_buffer.h')
| -rw-r--r-- | chromium/gin/array_buffer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/gin/array_buffer.h b/chromium/gin/array_buffer.h index 858cbf1088a..fe3fae28153 100644 --- a/chromium/gin/array_buffer.h +++ b/chromium/gin/array_buffer.h @@ -16,11 +16,11 @@ namespace gin { class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { public: - virtual void* Allocate(size_t length) OVERRIDE; - virtual void* AllocateUninitialized(size_t length) OVERRIDE; - virtual void Free(void* data, size_t length) OVERRIDE; + void* Allocate(size_t length) override; + void* AllocateUninitialized(size_t length) override; + void Free(void* data, size_t length) override; - static ArrayBufferAllocator* SharedInstance(); + GIN_EXPORT static ArrayBufferAllocator* SharedInstance(); }; class GIN_EXPORT ArrayBuffer { |