diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp')
| -rw-r--r-- | Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp index df24eb7..cab7ba3 100644 --- a/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp +++ b/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp @@ -28,7 +28,7 @@ #include "CanvasRenderingContext2D.h" #include "JSCanvasRenderingContext2D.h" -#if ENABLE(3D_CANVAS) +#if ENABLE(WEBGL) #include "WebGLRenderingContext.h" #include "JSWebGLRenderingContext.h" #endif @@ -42,7 +42,7 @@ JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CanvasR if (!object) return jsUndefined(); -#if ENABLE(3D_CANVAS) +#if ENABLE(WEBGL) if (object->is3d()) return getDOMObjectWrapper<JSWebGLRenderingContext>(exec, globalObject, static_cast<WebGLRenderingContext*>(object)); #endif |