Use angle-bracket form to include external headers in WebCore
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jan 2015 11:46:50 +0000 (11:46 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jan 2015 11:46:50 +0000 (11:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=140288

Reviewed by Žan Doberšek.

* CMakeLists.txt:
* platform/graphics/GraphicsContext.cpp:
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
* platform/graphics/harfbuzz/HarfBuzzFace.cpp:
* platform/graphics/harfbuzz/HarfBuzzFaceCoreText.cpp:
* platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
* platform/graphics/mac/GraphicsContext3DMac.mm:
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
* platform/graphics/win/GraphicsContext3DWin.cpp:
* platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
* platform/image-decoders/png/PNGImageDecoder.cpp:
* platform/image-decoders/webp/WEBPImageDecoder.cpp:
* platform/image-encoders/JPEGImageEncoder.cpp:
* platform/image-encoders/PNGImageEncoder.cpp:
* platform/text/TextEncodingDetectorICU.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@178166 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/GraphicsContext.cpp
Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp
Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.cpp
Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCoreText.cpp
Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp
Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp
Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp
Source/WebCore/platform/image-encoders/PNGImageEncoder.cpp
Source/WebCore/platform/text/TextEncodingDetectorICU.cpp

index 5af2aae..72abd3b 100644 (file)
@@ -2954,6 +2954,7 @@ list(APPEND WebCore_LIBRARIES
 if (WTF_USE_3D_GRAPHICS)
     list(APPEND WebCore_INCLUDE_DIRECTORIES
         "${THIRDPARTY_DIR}/ANGLE/src"
+        "${THIRDPARTY_DIR}/ANGLE/include/"
         "${THIRDPARTY_DIR}/ANGLE/include/KHR"
         "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
         "${WEBCORE_DIR}/platform/graphics/gpu"
index d605b2d..80886e4 100644 (file)
@@ -1,3 +1,26 @@
+2015-01-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Use angle-bracket form to include external headers in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=140288
+
+        Reviewed by Žan Doberšek.
+
+        * CMakeLists.txt:
+        * platform/graphics/GraphicsContext.cpp:
+        * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+        * platform/graphics/harfbuzz/HarfBuzzFace.cpp:
+        * platform/graphics/harfbuzz/HarfBuzzFaceCoreText.cpp:
+        * platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+        * platform/graphics/win/GraphicsContext3DWin.cpp:
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        * platform/image-decoders/webp/WEBPImageDecoder.cpp:
+        * platform/image-encoders/JPEGImageEncoder.cpp:
+        * platform/image-encoders/PNGImageEncoder.cpp:
+        * platform/text/TextEncodingDetectorICU.cpp:
+
 2015-01-09  Csaba Osztrogonác  <ossy@webkit.org>
 
         One more unreviewed speculative buildfix after r178154.
index 47491d8..3a054d0 100644 (file)
@@ -35,8 +35,6 @@
 #include "RoundedRect.h"
 #include "TextRun.h"
 
-#include "stdio.h"
-
 namespace WebCore {
 
 class TextRunIterator {
index b10fcac..e64e82a 100644 (file)
 #include "NotImplemented.h"
 #include "PlatformContextCairo.h"
 #include "RefPtrCairo.h"
+#include <GLSLANG/ShaderLang.h>
 #include <cairo.h>
 
-#if PLATFORM(WIN)
-#include "GLSLANG/ShaderLang.h"
-#else
-#include "ShaderLang.h"
-#endif
-
 #if USE(OPENGL_ES_2)
 #include "Extensions3DOpenGLES.h"
 #else
index b5b31fc..f03cace 100644 (file)
@@ -32,8 +32,8 @@
 #include "HarfBuzzFace.h"
 
 #include "FontPlatformData.h"
-#include "hb-ot.h"
-#include "hb.h"
+#include <hb-ot.h>
+#include <hb.h>
 
 namespace WebCore {
 
index 5dd8190..7d8364d 100644 (file)
@@ -34,9 +34,8 @@
 #include "FontPlatformData.h"
 #include "HarfBuzzShaper.h"
 #include "SimpleFontData.h"
-
-#include "hb.h"
 #include <ApplicationServices/ApplicationServices.h>
+#include <hb.h>
 
 namespace WebCore {
 
index 11f5153..8955024 100644 (file)
@@ -34,7 +34,7 @@
 #include "Font.h"
 #include "HarfBuzzFace.h"
 #include "SurrogatePairAwareTextIterator.h"
-#include "hb-icu.h"
+#include <hb-icu.h>
 #include <unicode/normlzr.h>
 #include <unicode/uchar.h>
 #include <wtf/MathExtras.h>
index 44ea4f1..eb52370 100644 (file)
@@ -34,7 +34,7 @@
 
 #import "BlockExceptions.h"
 
-#include "ANGLE/ShaderLang.h"
+#include <ANGLE/ShaderLang.h>
 #include "CanvasRenderingContext.h"
 #include <CoreGraphics/CGBitmapContext.h>
 #include "Extensions3DOpenGL.h"
index 846026f..45d5124 100644 (file)
 #include <wtf/Vector.h>
 
 #if PLATFORM(IOS)
-#include "ANGLE/ShaderLang.h"
+#include <ANGLE/ShaderLang.h>
 #include <OpenGLES/ES2/glext.h>
 #elif PLATFORM(MAC)
-#include "ANGLE/ShaderLang.h"
+#include <ANGLE/ShaderLang.h>
 #include <OpenGL/gl.h>
 #elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
 #include "OpenGLShims.h"
index 497a0cd..bc0ecf5 100644 (file)
@@ -33,9 +33,9 @@
 #include <wtf/PassOwnPtr.h>
 
 #if PLATFORM(WIN)
-#include "GLSLANG/ShaderLang.h"
+#include <GLSLANG/ShaderLang.h>
 #else
-#include "ShaderLang.h"
+#include <ANGLE/ShaderLang.h>
 #endif
 
 #if USE(OPENGL_ES_2)
index d424070..bbe709c 100644 (file)
 
 extern "C" {
 #if USE(ICCJPEG)
-#include "iccjpeg.h"
+#include <iccjpeg.h>
 #endif
 #if USE(QCMSLIB)
-#include "qcms.h"
+#include <qcms.h>
 #endif
 #include <setjmp.h>
 }
index ed7b194..b9ba5fb 100644 (file)
 #include "PNGImageDecoder.h"
 
 #include "Color.h"
-#include "png.h"
+#include <png.h>
 #include <wtf/StdLibExtras.h>
 
 #if USE(QCMSLIB)
-#include "qcms.h"
+#include <qcms.h>
 #endif
 
 #if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4))
index 206fef6..c0bcf1e 100644 (file)
@@ -32,8 +32,8 @@
 #if USE(WEBP)
 
 #ifdef QCMS_WEBP_COLOR_CORRECTION
-#include "qcms.h"
-#include "webp/demux.h"
+#include <qcms.h>
+#include <webp/demux.h>
 #else
 #undef ICCP_FLAG
 #define ICCP_FLAG 0
index d202388..6bc30db 100644 (file)
@@ -25,7 +25,7 @@
 #include "IntSize.h"
 // FIXME: jpeglib.h requires stdio.h to be included first for FILE
 #include <stdio.h>
-#include "jpeglib.h"
+#include <jpeglib.h>
 #include <setjmp.h>
 
 namespace WebCore {
index 301acba..3aa5122 100644 (file)
@@ -34,7 +34,7 @@
 #include "PNGImageEncoder.h"
 
 #include "IntSize.h"
-#include "png.h"
+#include <png.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
index 430104e..e380668 100644 (file)
@@ -32,8 +32,8 @@
 #include "TextEncodingDetector.h"
 
 #include "TextEncoding.h"
-#include "unicode/ucnv.h"
-#include "unicode/ucsdet.h"
+#include <unicode/ucnv.h>
+#include <unicode/ucsdet.h>
 
 namespace WebCore {