[Webkit-unassigned] [Bug 146511] [GTK] ENABLE_OPENGL=OFF builds still include GL-specific files

[bugzilla-daemon at webkit.org]

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

Carlos Garcia Campos <cgarcia at igalia.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #257251|review?                     |review-
              Flags|                            |

--- Comment #19 from Carlos Garcia Campos <cgarcia at igalia.com> ---
Comment on attachment 257251
  --> https://bugs.webkit.org/attachment.cgi?id=257251
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=257251&action=review

> Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp:25
>  #include "config.h"
> +
> +#if USE(TEXTURE_MAPPER_GL)
>  #include "BitmapTextureGL.h"

We don't do this. The header should be guarded too, and then here include config.h and the main header unconditionally, and then we guard the rest of the file.

> Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:24
>  #include "config.h"
> +
> +#if USE(TEXTURE_MAPPER_GL)

Same here. Also it's a bit weird that the header has #if USE(TEXTURE_MAPPER) and the implementation USE(TEXTURE_MAPPER_GL). They should have the same condition. I guess what you want is to change the header in this case.

> Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp:26
> +#if USE(TEXTURE_MAPPER_GL)
> +
>  #include "TextureMapperShaderProgram.h"

Same here.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:1370
> +    Window native;

setNativeSurfaceHandleForCompositing expects a uint64_t, so use that instead of Window. Also, this is not an if but an #if, so you don't need to declare this variable here, you can do it when assigned below on each #if branch. And use a better name, windowID, for example.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.webkit.org/pipermail/webkit-unassigned/attachments/20150805/1792561b/attachment-0001.html>