diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-25 18:27:58 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:38:51 +0100 |
| commit | 4980157932f4b4f19805689ec2b7b173febecac4 (patch) | |
| tree | 0b7bdfc88ef0385694c0f4e81852c0fc341cb9d3 | |
| parent | 9fb42e52f91229f48fbc922ad3939ecd5ecdd727 (diff) | |
| download | external_webkit-4980157932f4b4f19805689ec2b7b173febecac4.zip external_webkit-4980157932f4b4f19805689ec2b7b173febecac4.tar.gz external_webkit-4980157932f4b4f19805689ec2b7b173febecac4.tar.bz2 | |
Merge WebKit at r70209: Cherry pick build fix
See https://bugs.webkit.org/show_bug.cgi?id=48243 for details.
Change-Id: Idf1bf291f2370e611ebb2595f820598f68925336
| -rw-r--r-- | WebCore/bindings/generic/RuntimeEnabledFeatures.h | 2 | ||||
| -rw-r--r-- | WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h index 1054f64..b572b2c 100644 --- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h +++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h @@ -92,7 +92,7 @@ public: static bool openDatabaseSyncEnabled(); #endif -#if ENABLE(3D_CANVAS) +#if ENABLE(3D_CANVAS) || ENABLE(BLOB) static void setWebGLEnabled(bool isEnabled) { isWebGLEnabled = isEnabled; } static bool arrayBufferEnabled() { return isWebGLEnabled; } static bool int8ArrayEnabled() { return isWebGLEnabled; } diff --git a/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h b/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h index afaf6bf..ffea07c 100644 --- a/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h +++ b/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h @@ -30,7 +30,7 @@ #include "config.h" -#if ENABLE(3D_CANVAS) +#if ENABLE(3D_CANVAS) || ENABLE(BLOB) #include "ArrayBuffer.h" |