Diff
Modified: trunk/Source/ThirdParty/ChangeLog (87177 => 87178)
--- trunk/Source/ThirdParty/ChangeLog 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/ChangeLog 2011-05-24 18:50:48 UTC (rev 87178)
@@ -1,3 +1,45 @@
+2011-05-24 Stephen White <senorbla...@chromium.org>
+
+ Reviewed by Kenneth Russell.
+
+ Unfork glu sources as much as possible.
+ https://bugs.webkit.org/show_bug.cgi?id=61365
+
+ Restore the glu sources closer to the original version on oss.sgi.com
+ by removing the WebKit-specific include paths, restoring the include
+ order, and renaming the glu* functions via #defines rather than in
+ the source.
+
+ * glu/README.webkit:
+ Update the README to reflect the changes from trunk.
+ * glu/glu.gyp:
+ Add Source/Thirdparty/glu as an include path, so we can remove the
+ hardcoded paths from the source files.
+ * glu/gluos.h:
+ Add #defines to rename the glu entry points to internal_*.
+ * glu/internal_glu.h:
+ * glu/libtess/dict.c:
+ * glu/libtess/geom.c:
+ * glu/libtess/geom.h:
+ * glu/libtess/memalloc.c:
+ * glu/libtess/mesh.c:
+ * glu/libtess/mesh.h:
+ * glu/libtess/normal.c:
+ * glu/libtess/normal.h:
+ * glu/libtess/priorityq-heap.c:
+ * glu/libtess/priorityq-sort.h:
+ * glu/libtess/priorityq.c:
+ * glu/libtess/priorityq.h:
+ * glu/libtess/render.c:
+ * glu/libtess/render.h:
+ * glu/libtess/sweep.c:
+ * glu/libtess/sweep.h:
+ * glu/libtess/tess.c:
+ * glu/libtess/tess.h:
+ * glu/libtess/tessmono.c:
+ Remove WebKit-specific include paths, and internal_ prefixes from glu
+ entry points. Restore include order to original source order.
+
2011-05-19 Evan Martin <e...@chromium.org>
Reviewed by Tony Chang.
Modified: trunk/Source/ThirdParty/glu/README.webkit (87177 => 87178)
--- trunk/Source/ThirdParty/glu/README.webkit 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/README.webkit 2011-05-24 18:50:48 UTC (rev 87178)
@@ -8,17 +8,13 @@
The following changes were made in order to incorporate this code:
- The addition of a simplified gluos.h to eliminate operating system
- dependencies.
+ dependencies. All entry points to the tesselator were prefixed
+ with internal_ via #defines, to avoid symbol collisions with any
+ host OS version of GLU.
- The removal of inclusion of GL/glu.h and replacement with an
include of internal_glu.h.
- - Includes were modified to be scoped within ThirdParty/glu/ and
- ThirdParty/glu/libtess/.
-
- - The entry points to the tessellator were prefixed with internal_
- to avoid symbol collisions with any host OS version of GLU.
-
- In tess.c, the obsolete entry points gluBeginPolygon,
gluNextContour and gluEndPolygon in tess.c were #if 0'd out.
Default branches were added to the switch statements in GotoState.
Modified: trunk/Source/ThirdParty/glu/glu.gyp (87177 => 87178)
--- trunk/Source/ThirdParty/glu/glu.gyp 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/glu.gyp 2011-05-24 18:50:48 UTC (rev 87178)
@@ -3,7 +3,7 @@
'target_name': 'libtess',
'type': 'static_library',
'include_dirs': [
- '../..',
+ '.',
],
'sources': [
'gluos.h',
Modified: trunk/Source/ThirdParty/glu/gluos.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/gluos.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/gluos.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,6 +42,18 @@
typedef float GLfloat;
typedef void GLvoid;
+#define gluNewTess internal_gluNewTess
+#define gluDeleteTess internal_gluDeleteTess
+#define gluTessProperty internal_gluTessProperty
+#define gluGetTessProperty internal_gluGetTessProperty
+#define gluTessNormal internal_gluTessNormal
+#define gluTessCallback internal_gluTessCallback
+#define gluTessVertex internal_gluTessVertex
+#define gluTessBeginPolygon internal_gluTessBeginPolygon
+#define gluTessBeginContour internal_gluTessBeginContour
+#define gluTessEndContour internal_gluTessEndContour
+#define gluTessEndPolygon internal_gluTessEndPolygon
+
#undef MIN
#undef MAX
Modified: trunk/Source/ThirdParty/glu/internal_glu.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/internal_glu.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/internal_glu.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -36,7 +36,7 @@
#ifndef INTERNAL_GLU_H_
#define INTERNAL_GLU_H_
-#include "ThirdParty/glu/gluos.h"
+#include "gluos.h"
/* Primitives */
#define GL_LINE_LOOP 0x0002
Modified: trunk/Source/ThirdParty/glu/libtess/dict.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/dict.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/dict.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -40,8 +40,8 @@
*/
#include <stddef.h>
-#include "ThirdParty/glu/libtess/dict-list.h"
-#include "ThirdParty/glu/libtess/memalloc.h"
+#include "dict-list.h"
+#include "memalloc.h"
/* really __gl_dictListNewDict */
Dict *dictNewDict( void *frame,
Modified: trunk/Source/ThirdParty/glu/libtess/geom.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/geom.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/geom.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,10 +39,10 @@
** $Header: //depot/main/gfx/lib/glu/libtess/geom.c#5 $
*/
+#include "gluos.h"
#include <assert.h>
-#include "ThirdParty/glu/gluos.h"
-#include "ThirdParty/glu/libtess/mesh.h"
-#include "ThirdParty/glu/libtess/geom.h"
+#include "mesh.h"
+#include "geom.h"
int __gl_vertLeq( GLUvertex *u, GLUvertex *v )
{
Modified: trunk/Source/ThirdParty/glu/libtess/geom.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/geom.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/geom.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,7 +42,7 @@
#ifndef __geom_h_
#define __geom_h_
-#include "ThirdParty/glu/libtess/mesh.h"
+#include "mesh.h"
#ifdef NO_BRANCH_CONDITIONS
/* MIPS architecture has special instructions to evaluate boolean
Modified: trunk/Source/ThirdParty/glu/libtess/memalloc.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/memalloc.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/memalloc.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,8 +39,8 @@
** $Header: //depot/main/gfx/lib/glu/libtess/memalloc.c#5 $
*/
+#include "memalloc.h"
#include "string.h"
-#include "ThirdParty/glu/libtess/memalloc.h"
int __gl_memInit( size_t maxFast )
{
Modified: trunk/Source/ThirdParty/glu/libtess/mesh.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/mesh.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/mesh.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,11 +39,11 @@
** $Header: //depot/main/gfx/lib/glu/libtess/mesh.c#6 $
*/
+#include "gluos.h"
+#include <stddef.h>
#include <assert.h>
-#include <stddef.h>
-#include "ThirdParty/glu/gluos.h"
-#include "ThirdParty/glu/libtess/memalloc.h"
-#include "ThirdParty/glu/libtess/mesh.h"
+#include "mesh.h"
+#include "memalloc.h"
#define TRUE 1
#define FALSE 0
Modified: trunk/Source/ThirdParty/glu/libtess/mesh.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/mesh.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/mesh.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,7 +42,7 @@
#ifndef __mesh_h_
#define __mesh_h_
-#include "ThirdParty/glu/internal_glu.h"
+#include <internal_glu.h>
typedef struct GLUmesh GLUmesh;
Modified: trunk/Source/ThirdParty/glu/libtess/normal.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/normal.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/normal.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,12 +39,12 @@
** $Header: //depot/main/gfx/lib/glu/libtess/normal.c#5 $
*/
+#include "gluos.h"
+#include "mesh.h"
+#include "tess.h"
+#include "normal.h"
+#include <math.h>
#include <assert.h>
-#include <math.h>
-#include "ThirdParty/glu/gluos.h"
-#include "ThirdParty/glu/libtess/mesh.h"
-#include "ThirdParty/glu/libtess/normal.h"
-#include "ThirdParty/glu/libtess/tess.h"
#define TRUE 1
#define FALSE 0
Modified: trunk/Source/ThirdParty/glu/libtess/normal.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/normal.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/normal.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,7 +42,7 @@
#ifndef __normal_h_
#define __normal_h_
-#include "ThirdParty/glu/libtess/tess.h"
+#include "tess.h"
/* __gl_projectPolygon( tess ) determines the polygon normal
* and project vertices onto the plane of the polygon.
Modified: trunk/Source/ThirdParty/glu/libtess/priorityq-heap.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/priorityq-heap.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/priorityq-heap.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,11 +39,11 @@
** $Header: //depot/main/gfx/lib/glu/libtess/priorityq-heap.c#5 $
*/
+#include <stddef.h>
#include <assert.h>
#include <limits.h>
-#include <stddef.h>
-#include "ThirdParty/glu/libtess/memalloc.h"
-#include "ThirdParty/glu/libtess/priorityq-heap.h"
+#include "priorityq-heap.h"
+#include "memalloc.h"
#define INIT_SIZE 32
Modified: trunk/Source/ThirdParty/glu/libtess/priorityq-sort.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/priorityq-sort.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/priorityq-sort.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,7 +42,7 @@
#ifndef __priorityq_sort_h_
#define __priorityq_sort_h_
-#include "ThirdParty/glu/libtess/priorityq-heap.h"
+#include "priorityq-heap.h"
#undef PQkey
#undef PQhandle
Modified: trunk/Source/ThirdParty/glu/libtess/priorityq.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/priorityq.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/priorityq.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,19 +39,19 @@
** $Header: //depot/main/gfx/lib/glu/libtess/priorityq.c#5 $
*/
+#include "gluos.h"
+#include <stddef.h>
#include <assert.h>
#include <limits.h> /* LONG_MAX */
-#include <stddef.h>
-#include "ThirdParty/glu/gluos.h"
-#include "ThirdParty/glu/libtess/memalloc.h"
+#include "memalloc.h"
/* Include all the code for the regular heap-based queue here. */
-#include "ThirdParty/glu/libtess/priorityq-heap.c"
+#include "priorityq-heap.c"
/* Now redefine all the function names to map to their "Sort" versions. */
-#include "ThirdParty/glu/libtess/priorityq-sort.h"
+#include "priorityq-sort.h"
/* really __gl_pqSortNewPriorityQ */
PriorityQ *pqNewPriorityQ( int (*leq)(PQkey key1, PQkey key2) )
Modified: trunk/Source/ThirdParty/glu/libtess/priorityq.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/priorityq.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/priorityq.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,7 +42,7 @@
#ifndef __priorityq_sort_h_
#define __priorityq_sort_h_
-#include "ThirdParty/glu/libtess/priorityq-heap.h"
+#include "priorityq-heap.h"
#undef PQkey
#undef PQhandle
Modified: trunk/Source/ThirdParty/glu/libtess/render.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/render.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/render.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,12 +39,12 @@
** $Header: //depot/main/gfx/lib/glu/libtess/render.c#5 $
*/
+#include "gluos.h"
#include <assert.h>
#include <stddef.h>
-#include "ThirdParty/glu/gluos.h"
-#include "ThirdParty/glu/libtess/mesh.h"
-#include "ThirdParty/glu/libtess/render.h"
-#include "ThirdParty/glu/libtess/tess.h"
+#include "mesh.h"
+#include "tess.h"
+#include "render.h"
#define TRUE 1
#define FALSE 0
Modified: trunk/Source/ThirdParty/glu/libtess/render.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/render.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/render.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,7 +42,7 @@
#ifndef __render_h_
#define __render_h_
-#include "ThirdParty/glu/libtess/mesh.h"
+#include "mesh.h"
/* __gl_renderMesh( tess, mesh ) takes a mesh and breaks it into triangle
* fans, strips, and separate triangles. A substantial effort is made
Modified: trunk/Source/ThirdParty/glu/libtess/sweep.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/sweep.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/sweep.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,19 +39,19 @@
** $Header: //depot/main/gfx/lib/glu/libtess/sweep.c#5 $
*/
+#include "gluos.h"
#include <assert.h>
+#include <stddef.h>
#include <setjmp.h> /* longjmp */
#include <limits.h> /* LONG_MAX */
-#include <stddef.h>
-#include "ThirdParty/glu/gluos.h"
-#include "ThirdParty/glu/libtess/dict.h"
-#include "ThirdParty/glu/libtess/geom.h"
-#include "ThirdParty/glu/libtess/memalloc.h"
-#include "ThirdParty/glu/libtess/mesh.h"
-#include "ThirdParty/glu/libtess/priorityq.h"
-#include "ThirdParty/glu/libtess/sweep.h"
-#include "ThirdParty/glu/libtess/tess.h"
+#include "mesh.h"
+#include "geom.h"
+#include "tess.h"
+#include "dict.h"
+#include "priorityq.h"
+#include "memalloc.h"
+#include "sweep.h"
#define TRUE 1
#define FALSE 0
Modified: trunk/Source/ThirdParty/glu/libtess/sweep.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/sweep.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/sweep.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,7 +42,7 @@
#ifndef __sweep_h_
#define __sweep_h_
-#include "ThirdParty/glu/libtess/mesh.h"
+#include "mesh.h"
/* __gl_computeInterior( tess ) computes the planar arrangement specified
* by the given contours, and further subdivides this arrangement
Modified: trunk/Source/ThirdParty/glu/libtess/tess.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/tess.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/tess.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,19 +39,18 @@
** $Header: //depot/main/gfx/lib/glu/libtess/tess.c#7 $
*/
+#include "gluos.h"
+#include <stddef.h>
#include <assert.h>
#include <setjmp.h>
-#include <stddef.h>
+#include "memalloc.h"
+#include "tess.h"
+#include "mesh.h"
+#include "normal.h"
+#include "sweep.h"
+#include "tessmono.h"
+#include "render.h"
-#include "ThirdParty/glu/gluos.h"
-#include "ThirdParty/glu/libtess/memalloc.h"
-#include "ThirdParty/glu/libtess/mesh.h"
-#include "ThirdParty/glu/libtess/normal.h"
-#include "ThirdParty/glu/libtess/render.h"
-#include "ThirdParty/glu/libtess/sweep.h"
-#include "ThirdParty/glu/libtess/tess.h"
-#include "ThirdParty/glu/libtess/tessmono.h"
-
#define GLU_TESS_DEFAULT_TOLERANCE 0.0
#define GLU_TESS_MESH 100112 /* void (*)(GLUmesh *mesh) */
@@ -92,7 +91,7 @@
GLUtesselator * GLAPIENTRY
-internal_gluNewTess( void )
+gluNewTess( void )
{
GLUtesselator *tess;
@@ -164,11 +163,11 @@
switch( tess->state ) {
case T_DORMANT:
CALL_ERROR_OR_ERROR_DATA( GLU_TESS_MISSING_BEGIN_POLYGON );
- internal_gluTessBeginPolygon( tess, NULL );
+ gluTessBeginPolygon( tess, NULL );
break;
case T_IN_POLYGON:
CALL_ERROR_OR_ERROR_DATA( GLU_TESS_MISSING_BEGIN_CONTOUR );
- internal_gluTessBeginContour( tess );
+ gluTessBeginContour( tess );
break;
default:
assert(0);
@@ -178,7 +177,7 @@
switch( tess->state ) {
case T_IN_CONTOUR:
CALL_ERROR_OR_ERROR_DATA( GLU_TESS_MISSING_END_CONTOUR );
- internal_gluTessEndContour( tess );
+ gluTessEndContour( tess );
break;
case T_IN_POLYGON:
CALL_ERROR_OR_ERROR_DATA( GLU_TESS_MISSING_END_POLYGON );
@@ -195,7 +194,7 @@
void GLAPIENTRY
-internal_gluDeleteTess( GLUtesselator *tess )
+gluDeleteTess( GLUtesselator *tess )
{
RequireState( tess, T_DORMANT );
memFree( tess );
@@ -203,7 +202,7 @@
void GLAPIENTRY
-internal_gluTessProperty( GLUtesselator *tess, GLenum which, GLdouble value )
+gluTessProperty( GLUtesselator *tess, GLenum which, GLdouble value )
{
GLenum windingRule;
@@ -242,7 +241,7 @@
/* Returns tessellator property */
void GLAPIENTRY
-internal_gluGetTessProperty( GLUtesselator *tess, GLenum which, GLdouble *value )
+gluGetTessProperty( GLUtesselator *tess, GLenum which, GLdouble *value )
{
switch (which) {
case GLU_TESS_TOLERANCE:
@@ -270,7 +269,7 @@
} /* gluGetTessProperty() */
void GLAPIENTRY
-internal_gluTessNormal( GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z )
+gluTessNormal( GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z )
{
tess->normal[0] = x;
tess->normal[1] = y;
@@ -278,7 +277,7 @@
}
void GLAPIENTRY
-internal_gluTessCallback( GLUtesselator *tess, GLenum which, void (GLAPIENTRY *fn)())
+gluTessCallback( GLUtesselator *tess, GLenum which, void (GLAPIENTRY *fn)())
{
switch( which ) {
case GLU_TESS_BEGIN:
@@ -417,7 +416,7 @@
void GLAPIENTRY
-internal_gluTessVertex( GLUtesselator *tess, GLdouble coords[3], void *data )
+gluTessVertex( GLUtesselator *tess, GLdouble coords[3], void *data )
{
int i, tooLarge = FALSE;
GLdouble x, clamped[3];
@@ -464,7 +463,7 @@
void GLAPIENTRY
-internal_gluTessBeginPolygon( GLUtesselator *tess, void *data )
+gluTessBeginPolygon( GLUtesselator *tess, void *data )
{
RequireState( tess, T_DORMANT );
@@ -478,7 +477,7 @@
void GLAPIENTRY
-internal_gluTessBeginContour( GLUtesselator *tess )
+gluTessBeginContour( GLUtesselator *tess )
{
RequireState( tess, T_IN_POLYGON );
@@ -495,14 +494,14 @@
void GLAPIENTRY
-internal_gluTessEndContour( GLUtesselator *tess )
+gluTessEndContour( GLUtesselator *tess )
{
RequireState( tess, T_IN_CONTOUR );
tess->state = T_IN_POLYGON;
}
void GLAPIENTRY
-internal_gluTessEndPolygon( GLUtesselator *tess )
+gluTessEndPolygon( GLUtesselator *tess )
{
GLUmesh *mesh;
Modified: trunk/Source/ThirdParty/glu/libtess/tess.h (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/tess.h 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/tess.h 2011-05-24 18:50:48 UTC (rev 87178)
@@ -42,13 +42,12 @@
#ifndef __tess_h_
#define __tess_h_
+#include <internal_glu.h>
#include <setjmp.h>
+#include "mesh.h"
+#include "dict.h"
+#include "priorityq.h"
-#include "ThirdParty/glu/internal_glu.h"
-#include "ThirdParty/glu/libtess/dict.h"
-#include "ThirdParty/glu/libtess/mesh.h"
-#include "ThirdParty/glu/libtess/priorityq.h"
-
/* The begin/end calls must be properly nested. We keep track of
* the current state to enforce the ordering.
*/
Modified: trunk/Source/ThirdParty/glu/libtess/tessmono.c (87177 => 87178)
--- trunk/Source/ThirdParty/glu/libtess/tessmono.c 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Source/ThirdParty/glu/libtess/tessmono.c 2011-05-24 18:50:48 UTC (rev 87178)
@@ -39,14 +39,13 @@
** $Header: //depot/main/gfx/lib/glu/libtess/tessmono.c#5 $
*/
-#include <assert.h>
+#include "gluos.h"
#include <stdlib.h>
+#include "geom.h"
+#include "mesh.h"
+#include "tessmono.h"
+#include <assert.h>
-#include "ThirdParty/glu/gluos.h"
-#include "ThirdParty/glu/libtess/geom.h"
-#include "ThirdParty/glu/libtess/mesh.h"
-#include "ThirdParty/glu/libtess/tessmono.h"
-
#define AddWinding(eDst,eSrc) (eDst->winding += eSrc->winding, \
eDst->Sym->winding += eSrc->Sym->winding)
Modified: trunk/Tools/ChangeLog (87177 => 87178)
--- trunk/Tools/ChangeLog 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Tools/ChangeLog 2011-05-24 18:50:48 UTC (rev 87178)
@@ -1,3 +1,13 @@
+2011-05-24 Stephen White <senorbla...@chromium.org>
+
+ Reviewed by Kenneth Russell.
+
+ Remove most style checks on Source/ThirdParty/glu, since it doesn't
+ follow WebKit style.
+ https://bugs.webkit.org/show_bug.cgi?id=61365
+
+ * Scripts/webkitpy/style/checker.py:
+
2011-05-24 Adam Roben <aro...@apple.com>
Don't allow forcing builds through the build.webkit.org web interface
Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (87177 => 87178)
--- trunk/Tools/Scripts/webkitpy/style/checker.py 2011-05-24 18:49:18 UTC (rev 87177)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2011-05-24 18:50:48 UTC (rev 87178)
@@ -206,6 +206,13 @@
["-readability/naming",
"-build/header_guard",
"-build/include_order"]),
+
+ ([# glu's libtess is third-party code, and doesn't follow WebKit style.
+ "Source/ThirdParty/glu"],
+ ["-readability",
+ "-whitespace",
+ "-build/header_guard",
+ "-build/include_order"]),
]