diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp')
| -rw-r--r-- | WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp index e336027..41000fd 100644 --- a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp +++ b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp @@ -32,10 +32,8 @@ #include "ExceptionCode.h" #include "HTMLCanvasElement.h" #include "HTMLImageElement.h" -#include "HTMLVideoElement.h" #include "JSHTMLCanvasElement.h" #include "JSHTMLImageElement.h" -#include "JSHTMLVideoElement.h" #include "JSImageData.h" #include "JSWebGLBuffer.h" #include "JSWebGLFloatArray.h" @@ -60,6 +58,11 @@ #include <wtf/FastMalloc.h> #include <wtf/OwnFastMallocPtr.h> +#if ENABLE(VIDEO) +#include "HTMLVideoElement.h" +#include "JSHTMLVideoElement.h" +#endif + using namespace JSC; namespace WebCore { @@ -352,9 +355,11 @@ JSValue JSWebGLRenderingContext::texImage2D(ExecState* exec, const ArgList& args } else if (o->inherits(&JSHTMLCanvasElement::s_info)) { HTMLCanvasElement* element = static_cast<HTMLCanvasElement*>(static_cast<JSHTMLCanvasElement*>(o)->impl()); context->texImage2D(target, level, element, flipY, premultiplyAlpha, ec); +#if ENABLE(VIDEO) } else if (o->inherits(&JSHTMLVideoElement::s_info)) { HTMLVideoElement* element = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(o)->impl()); context->texImage2D(target, level, element, flipY, premultiplyAlpha, ec); +#endif } else ec = TYPE_MISMATCH_ERR; } else { @@ -461,9 +466,11 @@ JSValue JSWebGLRenderingContext::texSubImage2D(ExecState* exec, const ArgList& a } else if (o->inherits(&JSHTMLCanvasElement::s_info)) { HTMLCanvasElement* element = static_cast<HTMLCanvasElement*>(static_cast<JSHTMLCanvasElement*>(o)->impl()); context->texSubImage2D(target, level, xoff, yoff, element, flipY, premultiplyAlpha, ec); +#if ENABLE(VIDEO) } else if (o->inherits(&JSHTMLVideoElement::s_info)) { HTMLVideoElement* element = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(o)->impl()); context->texSubImage2D(target, level, xoff, yoff, element, flipY, premultiplyAlpha, ec); +#endif } else ec = TYPE_MISMATCH_ERR; } else { |