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/html/canvas/WebGLBuffer.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/html/canvas/WebGLBuffer.cpp')
-rw-r--r-- | Source/WebCore/html/canvas/WebGLBuffer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/html/canvas/WebGLBuffer.cpp b/Source/WebCore/html/canvas/WebGLBuffer.cpp index 849472b..ee0ebe6 100644 --- a/Source/WebCore/html/canvas/WebGLBuffer.cpp +++ b/Source/WebCore/html/canvas/WebGLBuffer.cpp @@ -25,7 +25,7 @@ #include "config.h" -#if ENABLE(3D_CANVAS) +#if ENABLE(WEBGL) #include "WebGLBuffer.h" @@ -34,7 +34,7 @@ #include "WebGLRenderingContext.h" namespace WebCore { - + PassRefPtr<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContext* ctx) { return adoptRef(new WebGLBuffer(ctx)); @@ -207,4 +207,4 @@ void WebGLBuffer::clearCachedMaxIndices() } -#endif // ENABLE(3D_CANVAS) +#endif // ENABLE(WEBGL) |