Commit 86868cc4 authored by abarth@webkit.org's avatar abarth@webkit.org

Move libtess from WebCore/thirdparty to ThirdParty

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: http://svn.webkit.org/repository/webkit/trunk@83641 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 58925e8e
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.
......
......@@ -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.
......
{
'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',
],
}],
}
......@@ -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
......
......@@ -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,
......
......@@ -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 )
{
......
......@@ -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
......
......@@ -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 )
{
......
......@@ -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
......
......@@ -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;
......
......@@ -41,10 +41,10 @@
#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
......
......@@ -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.
......
......@@ -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
......
......@@ -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
......
......@@ -42,16 +42,16 @@
#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) )
......
......@@ -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
......
......@@ -41,10 +41,10 @@
#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
......
......@@ -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
......
......@@ -44,14 +44,14 @@
#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
......
......@@ -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
......
......@@ -43,14 +43,14 @@
#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) */
......
......@@ -44,10 +44,10 @@
#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.
......
......@@ -42,10 +42,10 @@
#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)
......
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.
......@@ -130,6 +130,7 @@
'webcore_include_dirs': [
'../',
'../..',
'../accessibility',
'../accessibility/chromium',
'../bindings',
......@@ -201,7 +202,7 @@
'../svg/graphics',
'../svg/graphics/filters',
'../svg/properties',
'../thirdparty/glu',
'../../ThirdParty/glu',
'../webaudio',
'../websockets',
'../workers',
......@@ -979,6 +980,7 @@
'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',
......@@ -1272,8 +1274,6 @@
['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"', {
......
......@@ -5852,31 +5852,6 @@
'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',
......
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.
......@@ -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;
......
......@@ -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
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment