From e4fc5ced45c8fcfbe2487ec64eab036bc7d57602 Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Fri, 19 Dec 2014 14:29:17 -0800 Subject: Update freetype to 2.5.4. Put freetype into third_party directory, cleaning up header files. Previously freetype header files are in core/src/fxge/freetype and core/include/thirdparties. There were also multiple fx_freetype.h. This patch removes the additional Foxit wrapper to make further update easier. Notice, for original freetype source code, the following files are modified and need to be updated accordingly in future update: third_party/freetype/include/config/ftmodule.h third_party/freetype/include/config/ftoption.h BUG=407341 R=thestig@chromium.org Review URL: https://codereview.chromium.org/815103002 --- core/src/fxge/fx_freetype/include/fxft_cffobjs.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_cfftypes.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_freetype.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_ft2build.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_ftmm.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_ftobjs.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_ftotval.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_ftoutln.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_ftstream.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_tttables.h | 10 ---------- core/src/fxge/fx_freetype/include/fxft_tttypes.h | 10 ---------- 11 files changed, 110 deletions(-) delete mode 100644 core/src/fxge/fx_freetype/include/fxft_cffobjs.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_cfftypes.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_freetype.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_ft2build.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_ftmm.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_ftobjs.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_ftotval.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_ftoutln.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_ftstream.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_tttables.h delete mode 100644 core/src/fxge/fx_freetype/include/fxft_tttypes.h (limited to 'core/src/fxge/fx_freetype/include') diff --git a/core/src/fxge/fx_freetype/include/fxft_cffobjs.h b/core/src/fxge/fx_freetype/include/fxft_cffobjs.h deleted file mode 100644 index c15e0755b3..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_cffobjs.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_CFFOBJS_H_ -#define _FXFT_CFFOBJS_H_ -#include "../fxft2.5.01/src/cff/cffobjs.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_cfftypes.h b/core/src/fxge/fx_freetype/include/fxft_cfftypes.h deleted file mode 100644 index 9fbb7a31f6..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_cfftypes.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FREETYPE_H_ -#define _FXFT_FREETYPE_H_ -#include "../fxft2.5.01/src/cff/cfftypes.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_freetype.h b/core/src/fxge/fx_freetype/include/fxft_freetype.h deleted file mode 100644 index 92ffde0d79..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_freetype.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FREETYPE_H_ -#define _FXFT_FREETYPE_H_ -#include "../fxft2.5.01/include/freetype/freetype.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_ft2build.h b/core/src/fxge/fx_freetype/include/fxft_ft2build.h deleted file mode 100644 index f3438d4b24..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_ft2build.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FT2BUILD_H_ -#define _FXFT_FT2BUILD_H_ -#include "../fxft2.5.01/include/ft2build.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_ftmm.h b/core/src/fxge/fx_freetype/include/fxft_ftmm.h deleted file mode 100644 index 4b36ef7058..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_ftmm.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FTMM_H_ -#define _FXFT_FTMM_H_ -#include "../fxft2.5.01/include/freetype/ftmm.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_ftobjs.h b/core/src/fxge/fx_freetype/include/fxft_ftobjs.h deleted file mode 100644 index 40d7eaaccd..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_ftobjs.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FTOBJS_H_ -#define _FXFT_FTOBJS_H_ -#include "../fxft2.5.01/include/freetype/internal/ftobjs.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_ftotval.h b/core/src/fxge/fx_freetype/include/fxft_ftotval.h deleted file mode 100644 index f613aa7454..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_ftotval.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FTOTVAL_H_ -#define _FXFT_FTOTVAL_H_ -#include "../fxft2.5.01/include/freetype/ftotval.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_ftoutln.h b/core/src/fxge/fx_freetype/include/fxft_ftoutln.h deleted file mode 100644 index 14396d8404..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_ftoutln.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FTOUTLN_H_ -#define _FXFT_FTOUTLN_H_ -#include "../fxft2.5.01/include/freetype/ftoutln.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_ftstream.h b/core/src/fxge/fx_freetype/include/fxft_ftstream.h deleted file mode 100644 index ff6a4220fa..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_ftstream.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FTSTREAM_H_ -#define _FXFT_FTSTREAM_H_ -#include "../fxft2.5.01/include/freetype/internal/ftstream.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_tttables.h b/core/src/fxge/fx_freetype/include/fxft_tttables.h deleted file mode 100644 index 3b44fff44c..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_tttables.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_TTTABLES_H_ -#define _FXFT_TTTABLES_H_ -#include "../fxft2.5.01/include/freetype/tttables.h" -#endif diff --git a/core/src/fxge/fx_freetype/include/fxft_tttypes.h b/core/src/fxge/fx_freetype/include/fxft_tttypes.h deleted file mode 100644 index 06128debdb..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_tttypes.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_TTTYPES_H_ -#define _FXFT_TTTYPES_H_ -#include "../fxft2.5.01/include/freetype/internal/tttypes.h" -#endif -- cgit v1.2.3