Bug 180914 – fix build with -DENABLE_OPENGL=OFF: add missing ENABLE_WEBGL conditionals

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

Building webkitgtk-2.19.3 fails with cmake -DENABLE_OPENGL=OFF fails
on certain files.  Apparently because the code is not enclosed in #if
ENABLE(WEBGL) .. #endif blocks as expected.

* Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.h
* Source/WebCore/html/canvas/WebGLContextGroup.h
Eg.
     In file included from ../Source/WebCore/html/canvas/WebGLContextGroup.cpp:27:0,
       from DerivedSources/WebCore/unified-sources/UnifiedSource252.cpp:2:
    ../Source/WebCore/html/canvas/WebGLContextGroup.h:37:21: error: 'WebGLRenderingContextBase' has not been declared
         void addContext(WebGLRenderingContextBase&);
                         ^~~~~~~~~~~~~~~~~~~~~~~~~

* Source/WebCore/html/canvas/WebGLExtension.{h,cpp}:

    In file included from ../Source/WebCore/html/canvas/OESVertexArrayObject.h:29:0,
                     from ../Source/WebCore/html/canvas/OESVertexArrayObject.cpp:27,
                     from DerivedSources/WebCore/unified-sources/UnifiedSource250.cpp:8:
    ../Source/WebCore/html/canvas/WebGLExtension.h: In member function 'void WebCore::WebGLExtension::ref()':
    ../Source/WebCore/html/canvas/WebGLExtension.h:60:27: error: invalid use of incomplete type 'class WebCore::WebGLRenderingContextBase'
         void ref() { m_context.ref(); }
                ^

The attached patch outlining those fixes is against webkitgtk-2.19.3

Created attachment 342798 [details]
tentative patch

[Adrian Perez]

The attached patch looks good to me, but it is missing ChangeLog
entries. Could you please use “Tools/Scripts/prepare-ChangeLog”
from your WebKit checkout and re-submit the patch with them added?

[Adrian Perez]

(In reply to Adrian Perez from comment #2)
> The attached patch looks good to me, but it is missing ChangeLog
> entries. Could you please use “Tools/Scripts/prepare-ChangeLog”
> from your WebKit checkout and re-submit the patch with them added?

FWIW, I have also added a couple of reviewers in CC. If you want to
get that done automatically next time, the “--suggest-reviewers” flag
can be passed to “Tools/Scripts/webkit-patch upload”.

[Michael Catanzaro]

Please add one blank line above and below the guards, that's more common style in WebKit.

Other than that, it looks good. Once you add a ChangeLog, be sure to use the r? flag (to request review) and cq? flag (to request commit).

[Adrian Perez]

This was fixed in r47452 — closing.

[Adrian Perez]

(In reply to Adrian Perez from comment #5)
> This was fixed in r47452 — closing.

Correcting myself: it was r247452