Title: [220395] trunk/Source/WebCore
- Revision
- 220395
- Author
- zandober...@gmail.com
- Date
- 2017-08-08 01:36:38 -0700 (Tue, 08 Aug 2017)
Log Message
[TexMap] Group GL header file inclusions in a single header file
https://bugs.webkit.org/show_bug.cgi?id=175313
Reviewed by Carlos Garcia Campos.
Add a helper header file to the TextureMapper subsystem that includes
the OpenGL headers, properly addressing the build configuration to
include headers as provided by either libepoxy, the OpenGL ES library,
or the OpenGL library.
TextureMapperContextAttributes implementation file is the only one
that can leverage the header at the moment, but more will follow.
* platform/graphics/texmap/TextureMapperContextAttributes.cpp:
* platform/graphics/texmap/TextureMapperGLHeaders.h: Copied from Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.cpp.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (220394 => 220395)
--- trunk/Source/WebCore/ChangeLog 2017-08-08 08:29:19 UTC (rev 220394)
+++ trunk/Source/WebCore/ChangeLog 2017-08-08 08:36:38 UTC (rev 220395)
@@ -1,3 +1,21 @@
+2017-08-08 Zan Dobersek <zdober...@igalia.com>
+
+ [TexMap] Group GL header file inclusions in a single header file
+ https://bugs.webkit.org/show_bug.cgi?id=175313
+
+ Reviewed by Carlos Garcia Campos.
+
+ Add a helper header file to the TextureMapper subsystem that includes
+ the OpenGL headers, properly addressing the build configuration to
+ include headers as provided by either libepoxy, the OpenGL ES library,
+ or the OpenGL library.
+
+ TextureMapperContextAttributes implementation file is the only one
+ that can leverage the header at the moment, but more will follow.
+
+ * platform/graphics/texmap/TextureMapperContextAttributes.cpp:
+ * platform/graphics/texmap/TextureMapperGLHeaders.h: Copied from Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.cpp.
+
2017-08-08 Wenson Hsieh <wenson_hs...@apple.com>
[iOS WK2] WKWebView schedules nonstop layout after pressing cmb+b,i,u inside a contenteditable div
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.cpp (220394 => 220395)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.cpp 2017-08-08 08:29:19 UTC (rev 220394)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperContextAttributes.cpp 2017-08-08 08:36:38 UTC (rev 220395)
@@ -28,16 +28,9 @@
#if USE(TEXTURE_MAPPER_GL)
+#include "TextureMapperGLHeaders.h"
#include <wtf/text/WTFString.h>
-#if USE(LIBEPOXY)
-#include <epoxy/gl.h>
-#elif USE(OPENGL_ES_2)
-#include <GLES2/gl2.h>
-#else
-#include "OpenGLShims.h"
-#endif
-
namespace WebCore {
void TextureMapperContextAttributes::initialize()
Added: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h (0 => 220395)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h 2017-08-08 08:36:38 UTC (rev 220395)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2017 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if USE(LIBEPOXY)
+#include <epoxy/gl.h>
+#elif USE(OPENGL_ES_2)
+#include <GLES2/gl2.h>
+#else
+#include "OpenGLShims.h"
+#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
