Move libtess from WebCore/thirdparty to ThirdParty
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Apr 2011 21:34:16 +0000 (21:34 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Apr 2011 21:34:16 +0000 (21:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=57288

Reviewed by Kenneth Russell.

We're putting third party code in Source/ThirdParty these days.

* Source/ThirdParty/glu: Copied from Source/WebCore/thirdparty/glu.
* Source/ThirdParty/glu/glu.gyp: Added.

Source/WebCore:

* WebCore.gyp/WebCore.gyp:
    - Add libtess as a legit dependency.
* WebCore.gypi:
    - Remove libtess files from the gypi.
* thirdparty/glu: Removed.

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

41 files changed:
ChangeLog
Source/ThirdParty/glu/LICENSE.txt [moved from Source/WebCore/thirdparty/glu/LICENSE.txt with 100% similarity]
Source/ThirdParty/glu/README.webkit [moved from Source/WebCore/thirdparty/glu/README.webkit with 94% similarity]
Source/ThirdParty/glu/glu.gyp [new file with mode: 0644]
Source/ThirdParty/glu/gluos.h [moved from Source/WebCore/thirdparty/glu/gluos.h with 100% similarity]
Source/ThirdParty/glu/internal_glu.h [moved from Source/WebCore/thirdparty/glu/internal_glu.h with 99% similarity]
Source/ThirdParty/glu/libtess/GNUmakefile [moved from Source/WebCore/thirdparty/glu/libtess/GNUmakefile with 100% similarity]
Source/ThirdParty/glu/libtess/Imakefile [moved from Source/WebCore/thirdparty/glu/libtess/Imakefile with 100% similarity]
Source/ThirdParty/glu/libtess/README [moved from Source/WebCore/thirdparty/glu/libtess/README with 100% similarity]
Source/ThirdParty/glu/libtess/alg-outline [moved from Source/WebCore/thirdparty/glu/libtess/alg-outline with 100% similarity]
Source/ThirdParty/glu/libtess/dict-list.h [moved from Source/WebCore/thirdparty/glu/libtess/dict-list.h with 100% similarity]
Source/ThirdParty/glu/libtess/dict.c [moved from Source/WebCore/thirdparty/glu/libtess/dict.c with 97% similarity]
Source/ThirdParty/glu/libtess/dict.h [moved from Source/WebCore/thirdparty/glu/libtess/dict.h with 100% similarity]
Source/ThirdParty/glu/libtess/geom.c [moved from Source/WebCore/thirdparty/glu/libtess/geom.c with 98% similarity]
Source/ThirdParty/glu/libtess/geom.h [moved from Source/WebCore/thirdparty/glu/libtess/geom.h with 98% similarity]
Source/ThirdParty/glu/libtess/memalloc.c [moved from Source/WebCore/thirdparty/glu/libtess/memalloc.c with 98% similarity]
Source/ThirdParty/glu/libtess/memalloc.h [moved from Source/WebCore/thirdparty/glu/libtess/memalloc.h with 100% similarity]
Source/ThirdParty/glu/libtess/mesh.c [moved from Source/WebCore/thirdparty/glu/libtess/mesh.c with 99% similarity]
Source/ThirdParty/glu/libtess/mesh.h [moved from Source/WebCore/thirdparty/glu/libtess/mesh.h with 99% similarity]
Source/ThirdParty/glu/libtess/normal.c [moved from Source/WebCore/thirdparty/glu/libtess/normal.c with 98% similarity]
Source/ThirdParty/glu/libtess/normal.h [moved from Source/WebCore/thirdparty/glu/libtess/normal.h with 98% similarity]
Source/ThirdParty/glu/libtess/priorityq-heap.c [moved from Source/WebCore/thirdparty/glu/libtess/priorityq-heap.c with 98% similarity]
Source/ThirdParty/glu/libtess/priorityq-heap.h [moved from Source/WebCore/thirdparty/glu/libtess/priorityq-heap.h with 100% similarity]
Source/ThirdParty/glu/libtess/priorityq-sort.h [moved from Source/WebCore/thirdparty/glu/libtess/priorityq-sort.h with 98% similarity]
Source/ThirdParty/glu/libtess/priorityq.c [moved from Source/WebCore/thirdparty/glu/libtess/priorityq.c with 97% similarity]
Source/ThirdParty/glu/libtess/priorityq.h [moved from Source/WebCore/thirdparty/glu/libtess/priorityq.h with 98% similarity]
Source/ThirdParty/glu/libtess/render.c [moved from Source/WebCore/thirdparty/glu/libtess/render.c with 99% similarity]
Source/ThirdParty/glu/libtess/render.h [moved from Source/WebCore/thirdparty/glu/libtess/render.h with 98% similarity]
Source/ThirdParty/glu/libtess/sweep.c [moved from Source/WebCore/thirdparty/glu/libtess/sweep.c with 99% similarity]
Source/ThirdParty/glu/libtess/sweep.h [moved from Source/WebCore/thirdparty/glu/libtess/sweep.h with 98% similarity]
Source/ThirdParty/glu/libtess/tess.c [moved from Source/WebCore/thirdparty/glu/libtess/tess.c with 98% similarity]
Source/ThirdParty/glu/libtess/tess.h [moved from Source/WebCore/thirdparty/glu/libtess/tess.h with 97% similarity]
Source/ThirdParty/glu/libtess/tessmono.c [moved from Source/WebCore/thirdparty/glu/libtess/tessmono.c with 97% similarity]
Source/ThirdParty/glu/libtess/tessmono.h [moved from Source/WebCore/thirdparty/glu/libtess/tessmono.h with 100% similarity]
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gypi
Source/WebCore/thirdparty/README.txt [deleted file]
Source/WebKit/chromium/public/WebSettings.h
Source/WebKit/chromium/src/WebSettingsImpl.cpp
Source/WebKit/chromium/src/WebSettingsImpl.h

index 48027e53782b6ce3d218938525310b7528738be0..3108246c339b1c6476d9585e1023d536a75ef5f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-28  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Kenneth Russell.
+
+        Move libtess from WebCore/thirdparty to ThirdParty
+        https://bugs.webkit.org/show_bug.cgi?id=57288
+
+        We're putting third party code in Source/ThirdParty these days.
+
+        * Source/ThirdParty/glu: Copied from Source/WebCore/thirdparty/glu.
+        * Source/ThirdParty/glu/glu.gyp: Added.
+
 2011-04-12  Thouraya ANDOLSI  <thouraya.andolsi@st.com>
 
         Reviewed by Eric Seidel.
similarity index 94%
rename from Source/WebCore/thirdparty/glu/README.webkit
rename to Source/ThirdParty/glu/README.webkit
index 57c47725f5ca33a90cccf08c80e4447e9494fd37..5941f4bc30ed8106feb01d5cecd2b7a83aee01a7 100644 (file)
@@ -13,8 +13,8 @@ The following changes were made in order to incorporate this code:
   - 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/.
+  - 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.
diff --git a/Source/ThirdParty/glu/glu.gyp b/Source/ThirdParty/glu/glu.gyp
new file mode 100644 (file)
index 0000000..c9ddb77
--- /dev/null
@@ -0,0 +1,36 @@
+{
+  'targets': [{
+    'target_name': 'libtess',
+    'type': '<(library)',
+    'include_dirs': [
+      '../..',
+    ],
+    'sources': [
+      'gluos.h',
+      'internal_glu.h',
+      'libtess/dict-list.h',
+      'libtess/dict.c',
+      'libtess/dict.h',
+      'libtess/geom.c',
+      'libtess/geom.h',
+      'libtess/memalloc.c',
+      'libtess/memalloc.h',
+      'libtess/mesh.c',
+      'libtess/mesh.h',
+      'libtess/normal.c',
+      'libtess/normal.h',
+      'libtess/priorityq-heap.h',
+      'libtess/priorityq-sort.h',
+      'libtess/priorityq.c',
+      'libtess/priorityq.h',
+      'libtess/render.c',
+      'libtess/render.h',
+      'libtess/sweep.c',
+      'libtess/sweep.h',
+      'libtess/tess.c',
+      'libtess/tess.h',
+      'libtess/tessmono.c',
+      'libtess/tessmono.h',
+    ],
+  }],
+}
similarity index 99%
rename from Source/WebCore/thirdparty/glu/internal_glu.h
rename to Source/ThirdParty/glu/internal_glu.h
index d695b0b336de614d434e8ef7071e7ee764903820..4c0e863e065e62ffd5990fe119c83a352a464052 100644 (file)
@@ -36,7 +36,7 @@
 #ifndef INTERNAL_GLU_H_
 #define INTERNAL_GLU_H_
 
-#include "thirdparty/glu/gluos.h"
+#include "ThirdParty/glu/gluos.h"
 
 /* Primitives */
 #define GL_LINE_LOOP                            0x0002
similarity index 97%
rename from Source/WebCore/thirdparty/glu/libtess/dict.c
rename to Source/ThirdParty/glu/libtess/dict.c
index 6c3b27a2f5c3bb3031fd6e3ad34127fd831c8614..bbae1f2605bc20cf4c15ab982d602cceaf5b84a6 100644 (file)
@@ -40,8 +40,8 @@
 */
 
 #include <stddef.h>
-#include "thirdparty/glu/libtess/dict-list.h"
-#include "thirdparty/glu/libtess/memalloc.h"
+#include "ThirdParty/glu/libtess/dict-list.h"
+#include "ThirdParty/glu/libtess/memalloc.h"
 
 /* really __gl_dictListNewDict */
 Dict *dictNewDict( void *frame,
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/geom.c
rename to Source/ThirdParty/glu/libtess/geom.c
index ce578ddf5c22aa455f533a5063d26e150583a2c9..c404202311f1411bcf0a1fc7a7162c1cc9a96fc7 100644 (file)
@@ -40,9 +40,9 @@
 */
 
 #include <assert.h>
-#include "thirdparty/glu/gluos.h"
-#include "thirdparty/glu/libtess/mesh.h"
-#include "thirdparty/glu/libtess/geom.h"
+#include "ThirdParty/glu/gluos.h"
+#include "ThirdParty/glu/libtess/mesh.h"
+#include "ThirdParty/glu/libtess/geom.h"
 
 int __gl_vertLeq( GLUvertex *u, GLUvertex *v )
 {
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/geom.h
rename to Source/ThirdParty/glu/libtess/geom.h
index 97b7b3035a5d872239926f6e7431b783d25d23c2..d6c8497c4c2f4c39104534b5b9414a3108c6459a 100644 (file)
@@ -42,7 +42,7 @@
 #ifndef __geom_h_
 #define __geom_h_
 
-#include "thirdparty/glu/libtess/mesh.h"
+#include "ThirdParty/glu/libtess/mesh.h"
 
 #ifdef NO_BRANCH_CONDITIONS
 /* MIPS architecture has special instructions to evaluate boolean
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/memalloc.c
rename to Source/ThirdParty/glu/libtess/memalloc.c
index b422b66e71e7222daf2aafe022b39199f9165d1c..530646f8df7b736745c15ff0a361c6a5c932a51d 100644 (file)
@@ -40,7 +40,7 @@
 */
 
 #include "string.h"
-#include "thirdparty/glu/libtess/memalloc.h"
+#include "ThirdParty/glu/libtess/memalloc.h"
 
 int __gl_memInit( size_t maxFast )
 {
similarity index 99%
rename from Source/WebCore/thirdparty/glu/libtess/mesh.c
rename to Source/ThirdParty/glu/libtess/mesh.c
index 62ff469eaf19ba7b781075f87e0b0e37330bc651..096f898bff582a4b8774d64b23fbb9ca7d27c581 100644 (file)
@@ -41,9 +41,9 @@
 
 #include <assert.h>
 #include <stddef.h>
-#include "thirdparty/glu/gluos.h"
-#include "thirdparty/glu/libtess/memalloc.h"
-#include "thirdparty/glu/libtess/mesh.h"
+#include "ThirdParty/glu/gluos.h"
+#include "ThirdParty/glu/libtess/memalloc.h"
+#include "ThirdParty/glu/libtess/mesh.h"
 
 #define TRUE 1
 #define FALSE 0
similarity index 99%
rename from Source/WebCore/thirdparty/glu/libtess/mesh.h
rename to Source/ThirdParty/glu/libtess/mesh.h
index 4d2bcd101dbe779eeea05fc453019cfe70ed4d60..b83641184bc6ce25b361f80860278b882066e2da 100644 (file)
@@ -42,7 +42,7 @@
 #ifndef __mesh_h_
 #define __mesh_h_
 
-#include "thirdparty/glu/internal_glu.h"
+#include "ThirdParty/glu/internal_glu.h"
 
 typedef struct GLUmesh GLUmesh; 
 
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/normal.c
rename to Source/ThirdParty/glu/libtess/normal.c
index 18fd6ac3a2c3e6fd00083365ef2e8c10fa8874c8..bbe57fd773a510d900ef7f468f52b9bf5d132875 100644 (file)
 
 #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"
+#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
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/normal.h
rename to Source/ThirdParty/glu/libtess/normal.h
index 5e74db2f7e127d9b075877531580de1ec0ff904d..f52bd0904e8b292afb9f6f64314b6498f22e8e31 100644 (file)
@@ -42,7 +42,7 @@
 #ifndef __normal_h_
 #define __normal_h_
 
-#include "thirdparty/glu/libtess/tess.h"
+#include "ThirdParty/glu/libtess/tess.h"
 
 /* __gl_projectPolygon( tess ) determines the polygon normal
  * and project vertices onto the plane of the polygon.
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/priorityq-heap.c
rename to Source/ThirdParty/glu/libtess/priorityq-heap.c
index 5d60ae74f9e7441c9a570d0da30e0765187ba2a0..43af72727abba1625568cee5d174ac772029e659 100644 (file)
@@ -42,8 +42,8 @@
 #include <assert.h>
 #include <limits.h>
 #include <stddef.h>
-#include "thirdparty/glu/libtess/memalloc.h"
-#include "thirdparty/glu/libtess/priorityq-heap.h"
+#include "ThirdParty/glu/libtess/memalloc.h"
+#include "ThirdParty/glu/libtess/priorityq-heap.h"
 
 #define INIT_SIZE      32
 
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/priorityq-sort.h
rename to Source/ThirdParty/glu/libtess/priorityq-sort.h
index fc289d6dfe85f97437a564ea7a5e040778451621..2a5e71c16c639de6e5cfbd5e1cf7269c72baf003 100644 (file)
@@ -42,7 +42,7 @@
 #ifndef __priorityq_sort_h_
 #define __priorityq_sort_h_
 
-#include "thirdparty/glu/libtess/priorityq-heap.h"
+#include "ThirdParty/glu/libtess/priorityq-heap.h"
 
 #undef PQkey
 #undef PQhandle
similarity index 97%
rename from Source/WebCore/thirdparty/glu/libtess/priorityq.c
rename to Source/ThirdParty/glu/libtess/priorityq.c
index 6614db01489fb70ac21240caaf890fff6433fe92..93f4179ad7c8b171980cf01112a0e63491e583cc 100644 (file)
 #include <assert.h>
 #include <limits.h>            /* LONG_MAX */
 #include <stddef.h>
-#include "thirdparty/glu/gluos.h"
-#include "thirdparty/glu/libtess/memalloc.h"
+#include "ThirdParty/glu/gluos.h"
+#include "ThirdParty/glu/libtess/memalloc.h"
 
 /* Include all the code for the regular heap-based queue here. */
 
-#include "thirdparty/glu/libtess/priorityq-heap.c"
+#include "ThirdParty/glu/libtess/priorityq-heap.c"
 
 /* Now redefine all the function names to map to their "Sort" versions. */
 
-#include "thirdparty/glu/libtess/priorityq-sort.h"
+#include "ThirdParty/glu/libtess/priorityq-sort.h"
 
 /* really __gl_pqSortNewPriorityQ */
 PriorityQ *pqNewPriorityQ( int (*leq)(PQkey key1, PQkey key2) )
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/priorityq.h
rename to Source/ThirdParty/glu/libtess/priorityq.h
index 77aa70bb83a8af6a9b26e7934dc8e85ced9e2c4d..69af1886ff3d38b95f04c0c6480bf45f1a615f10 100644 (file)
@@ -42,7 +42,7 @@
 #ifndef __priorityq_sort_h_
 #define __priorityq_sort_h_
 
-#include "thirdparty/glu/libtess/priorityq-heap.h"
+#include "ThirdParty/glu/libtess/priorityq-heap.h"
 
 #undef PQkey
 #undef PQhandle
similarity index 99%
rename from Source/WebCore/thirdparty/glu/libtess/render.c
rename to Source/ThirdParty/glu/libtess/render.c
index 79386e8cbacc2647f1df47394748ff8160654ed1..e7534f55e4742f1c254a7498e8279e2a0b6b02d5 100644 (file)
 
 #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 "ThirdParty/glu/gluos.h"
+#include "ThirdParty/glu/libtess/mesh.h"
+#include "ThirdParty/glu/libtess/render.h"
+#include "ThirdParty/glu/libtess/tess.h"
 
 #define TRUE 1
 #define FALSE 0
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/render.h
rename to Source/ThirdParty/glu/libtess/render.h
index d8ef914055b61c22f6c5afbd244d3ae839e57aff..5f3e06c5e717c709c6a48d485a5541efdfc55cce 100644 (file)
@@ -42,7 +42,7 @@
 #ifndef __render_h_
 #define __render_h_
 
-#include "thirdparty/glu/libtess/mesh.h"
+#include "ThirdParty/glu/libtess/mesh.h"
 
 /* __gl_renderMesh( tess, mesh ) takes a mesh and breaks it into triangle
  * fans, strips, and separate triangles.  A substantial effort is made
similarity index 99%
rename from Source/WebCore/thirdparty/glu/libtess/sweep.c
rename to Source/ThirdParty/glu/libtess/sweep.c
index 233b2da00fc1b1a261ce05d55e294dc957bdd613..415f592c016fe7a45957fdb71eb6fdf82ec5a139 100644 (file)
 #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 "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"
 
 #define TRUE 1
 #define FALSE 0
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/sweep.h
rename to Source/ThirdParty/glu/libtess/sweep.h
index c0994500f8d4ef664680f7c184296aefe362b394..931a59a50b83cbc99580b621996a975d5959ba79 100644 (file)
@@ -42,7 +42,7 @@
 #ifndef __sweep_h_
 #define __sweep_h_
 
-#include "thirdparty/glu/libtess/mesh.h"
+#include "ThirdParty/glu/libtess/mesh.h"
 
 /* __gl_computeInterior( tess ) computes the planar arrangement specified
  * by the given contours, and further subdivides this arrangement
similarity index 98%
rename from Source/WebCore/thirdparty/glu/libtess/tess.c
rename to Source/ThirdParty/glu/libtess/tess.c
index 5cba586f42be6a7c0f8081e23344d50cab3c0650..0a639533f26b83087142581294a96ec912e4fd8b 100644 (file)
 #include <setjmp.h>
 #include <stddef.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"
+#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)          */
similarity index 97%
rename from Source/WebCore/thirdparty/glu/libtess/tess.h
rename to Source/ThirdParty/glu/libtess/tess.h
index 82152230e76e94c534e7424aa1628cd0c39c986f..f837b90baee327a8cb95cf4309776fe44a8655a3 100644 (file)
 
 #include <setjmp.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"
+#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.
similarity index 97%
rename from Source/WebCore/thirdparty/glu/libtess/tessmono.c
rename to Source/ThirdParty/glu/libtess/tessmono.c
index 3aaaaa1f1c4068c244d3e0e79dec8687909ad573..68fbe6818e1637d98497ef19232ae255e07ff3f2 100644 (file)
 #include <assert.h>
 #include <stdlib.h>
 
-#include "thirdparty/glu/gluos.h"
-#include "thirdparty/glu/libtess/geom.h"
-#include "thirdparty/glu/libtess/mesh.h"
-#include "thirdparty/glu/libtess/tessmono.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)
index 91ed1d30e91c48cb0a7c2c91aa189b3f7dd08e81..cb43c6a419d07fec47a6700f6dfc32e86f2d7e7e 100644 (file)
@@ -1,3 +1,16 @@
+2011-03-28  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Kenneth Russell.
+
+        Move libtess from WebCore/thirdparty to ThirdParty
+        https://bugs.webkit.org/show_bug.cgi?id=57288
+
+        * WebCore.gyp/WebCore.gyp:
+            - Add libtess as a legit dependency.
+        * WebCore.gypi:
+            - Remove libtess files from the gypi.
+        * thirdparty/glu: Removed.
+
 2011-04-12  Ryosuke Niwa  <rniwa@webkit.org>
 
         Reviewed by David Hyatt.
index 5ed101580329782eaccd30783d9734de2753fab9..62adf8f58f0cde0910619109aa568c9034c48bdf 100644 (file)
 
     'webcore_include_dirs': [
       '../',
+      '../..',
       '../accessibility',
       '../accessibility/chromium',
       '../bindings',
       '../svg/graphics',
       '../svg/graphics/filters',
       '../svg/properties',
-      '../thirdparty/glu',
+      '../../ThirdParty/glu',
       '../webaudio',
       '../websockets',
       '../workers',
       'type': 'none',
       'dependencies': [
         'webcore_bindings',
+        '../../ThirdParty/glu/glu.gyp:libtess',
         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:yarr',
         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         ['exclude', 'platform/sql/SQLiteFileSystem\\.cpp$'],
         ['exclude', 'platform/text/LocalizedNumberNone\\.cpp$'],
         ['exclude', 'platform/text/TextEncodingDetectorNone\\.cpp$'],
-
-        ['include', 'thirdparty/glu/libtess/'],
       ],
       'conditions': [
         ['OS=="linux" or OS=="freebsd"', {
index 3c1592a0f76e43cdf4b3fe14cca980993698241b..32459f810338a391adfcb776535255fde1aee07b 100644 (file)
             'svg/graphics/filters/SVGFilterBuilder.h',
             'svg/properties/SVGAnimatedPathSegListPropertyTearOff.h',
             'svg/properties/SVGPathSegListPropertyTearOff.cpp',
-            'thirdparty/glu/gluos.h',
-            'thirdparty/glu/internal_glu.h',
-            'thirdparty/glu/libtess/dict-list.h',
-            'thirdparty/glu/libtess/dict.c',
-            'thirdparty/glu/libtess/dict.h',
-            'thirdparty/glu/libtess/geom.c',
-            'thirdparty/glu/libtess/geom.h',
-            'thirdparty/glu/libtess/memalloc.c',
-            'thirdparty/glu/libtess/memalloc.h',
-            'thirdparty/glu/libtess/mesh.c',
-            'thirdparty/glu/libtess/mesh.h',
-            'thirdparty/glu/libtess/normal.c',
-            'thirdparty/glu/libtess/normal.h',
-            'thirdparty/glu/libtess/priorityq-heap.h',
-            'thirdparty/glu/libtess/priorityq-sort.h',
-            'thirdparty/glu/libtess/priorityq.c',
-            'thirdparty/glu/libtess/priorityq.h',
-            'thirdparty/glu/libtess/render.c',
-            'thirdparty/glu/libtess/render.h',
-            'thirdparty/glu/libtess/sweep.c',
-            'thirdparty/glu/libtess/sweep.h',
-            'thirdparty/glu/libtess/tess.c',
-            'thirdparty/glu/libtess/tess.h',
-            'thirdparty/glu/libtess/tessmono.c',
-            'thirdparty/glu/libtess/tessmono.h',
             'webaudio/AudioBasicProcessorNode.cpp',
             'webaudio/AudioBasicProcessorNode.h',
             'webaudio/AudioBuffer.cpp',
diff --git a/Source/WebCore/thirdparty/README.txt b/Source/WebCore/thirdparty/README.txt
deleted file mode 100644 (file)
index 311e10a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory is intended to contain copies of third-party libraries used
-by WebCore, in particular those which may require some modification in
-order to incorporate.
-
-The current convention is to fully scope the include paths of headers, in
-order to avoid collisions with other WebCore headers. For example, a file
-in WebCore using the GLU tessellator sources would use
-
-#include "thirdparty/glu/internal_glu.h"
-
-Header references in source files in this directory need to be similarly
-modified.
index 56032c1532aa21aeaa777d94c64efb01193cff17..083d0e1a127cb0e49b34c341ba06bb863db621ae 100644 (file)
@@ -89,6 +89,7 @@ public:
     virtual void setShouldPaintCustomScrollbars(bool) = 0;
     virtual void setAllowUniversalAccessFromFileURLs(bool) = 0;
     virtual void setAllowFileAccessFromFileURLs(bool) = 0;
+    virtual void setAllowRunningInsecureContent(bool) = 0;
     virtual void setTextDirectionSubmenuInclusionBehaviorNeverIncluded() = 0;
     virtual void setOfflineWebApplicationCacheEnabled(bool) = 0;
     virtual void setWebAudioEnabled(bool) = 0;
index 73cc7c54fb11dcb03811adde363afb7e81efbd4d..231a9cf67e2e8e9dba4abc2f8e87e6f60805fe5c 100644 (file)
@@ -255,6 +255,11 @@ void WebSettingsImpl::setAllowFileAccessFromFileURLs(bool allow)
     m_settings->setAllowFileAccessFromFileURLs(allow);
 }
 
+void WebSettingsImpl::setAllowRunningInsecureContent(bool allow)
+{
+    m_settings->setAllowRunningInsecureContent(allow);
+}
+
 void WebSettingsImpl::setTextDirectionSubmenuInclusionBehaviorNeverIncluded()
 {
     // FIXME: If you ever need more behaviors than this, then we should probably
index 798a78fc04ffab83f8da5d7803c3633f4656fff0..5bff8e0954f85ea3de51606e15bb2bd873c0703d 100644 (file)
@@ -82,6 +82,7 @@ public:
     virtual void setShouldPaintCustomScrollbars(bool);
     virtual void setAllowUniversalAccessFromFileURLs(bool);
     virtual void setAllowFileAccessFromFileURLs(bool);
+    virtual void setAllowRunningInsecureContent(bool);
     virtual void setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
     virtual void setOfflineWebApplicationCacheEnabled(bool);
     virtual void setWebAudioEnabled(bool);