[Webkit-unassigned] [Bug 38297] Webkit doesn't compile with 3D-canvas enabled and video disabled

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=38297


David Levin <levin at chromium.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #54662|review?, commit-queue?      |review-
               Flag|                            |




--- Comment #4 from David Levin <levin at chromium.org>  2010-04-29 00:28:04 PST ---
(From update of attachment 54662)

> diff --git a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
> index e336027..9481a0c 100644
> --- a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
> +++ b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
> @@ -32,10 +32,18 @@
>  #include "ExceptionCode.h"
>  #include "HTMLCanvasElement.h"
>  #include "HTMLImageElement.h"
> +
> +#if ENABLE(VIDEO)
>  #include "HTMLVideoElement.h"
> +#endif
> +
>  #include "JSHTMLCanvasElement.h"
>  #include "JSHTMLImageElement.h"
> +
> +#if ENABLE(VIDEO)
>  #include "JSHTMLVideoElement.h"
> +#endif
> +
>  #include "JSImageData.h"
>  #include "JSWebGLBuffer.h"
>  #include "JSWebGLFloatArray.h"

This has the same problem that Darin noted last time.  It should look some
thing like this (note that the ifdef'ed includes are placed after all others):

#include "ExceptionCode.h"
#include "HTMLCanvasElement.h"
#include "HTMLImageElement.h"
#include "JSHTMLCanvasElement.h"
#include "JSHTMLImageElement.h"
#include "JSImageData.h"
#include "JSWebGLBuffer.h"
#include "JSWebGLFloatArray.h"

#if ENABLE(VIDEO)
#include "HTMLVideoElement.h"
#include "JSHTMLVideoElement.h"
#endif

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.