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

• Status: RESOLVED
• Resolution: FIXED
• Component: WebGL

[Noam Rosenthal]

JSWebGLRenderingContextCustom.cpp contains video files without an #ifdef guard

[Noam Rosenthal]

Created attachment 54643 [details]
compile fix

[Darin Adler]

Comment on attachment 54643 [details]
compile fix

>  #include "HTMLVideoElement.h"
>  #include "JSHTMLCanvasElement.h"
>  #include "JSHTMLImageElement.h"
> +#if ENABLE(VIDEO)
>  #include "JSHTMLVideoElement.h"
> +#endif
>  #include "JSImageData.h"
>  #include "JSWebGLBuffer.h"
>  #include "JSWebGLFloatArray.h"

Conditional includes should go in their own paragraph, after the unconditional ones, not sorted in the include list.

Sorry to be so picky about a minor aspect of the patch.

[Noam Rosenthal]

Created attachment 54662 [details]
paragraph style fix

no problem with style nit-picks! they make the webkit code easier to read...

[David Levin]

Comment on attachment 54662 [details]
paragraph style fix


> 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

[Noam Rosenthal]

Created attachment 54766 [details]
style fix to the style fix

[WebKit Commit Bot]

Comment on attachment 54766 [details]
style fix to the style fix

Clearing flags on attachment: 54766

Committed r58642: <http://trac.webkit.org/changeset/58642>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.