[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:44:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3b7bc3ad37b1c1eac95fc8fe1dd3a66877d872ef
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 11 14:33:29 2010 +0000
2010-11-11 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Adam Barth.
[GTK] Move font related files.
https://bugs.webkit.org/show_bug.cgi?id=48116
Move pango and freetype related files to share non-GTK+ platforms.
No new tests because this is pure refactoring.
* CMakeListsEfl.txt:
* GNUmakefile.am:
* WebCore.vcproj/WebCore.vcproj:
* platform/graphics/cairo/FontCacheFreeType.cpp: Removed.
* platform/graphics/cairo/FontCustomPlatformData.cpp: Removed.
* platform/graphics/cairo/FontPlatformData.h: Removed.
* platform/graphics/cairo/FontPlatformDataFreeType.cpp: Removed.
* platform/graphics/cairo/FontPlatformDataFreeType.h: Removed.
* platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp: Removed.
* platform/graphics/cairo/SimpleFontDataCairo.cpp: Removed.
* platform/graphics/freetype: Added.
* platform/graphics/freetype/FontCacheFreeType.cpp: Copied from WebCore/platform/graphics/cairo/FontCacheFreeType.cpp.
* platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp: Copied from WebCore/platform/graphics/cairo/FontCustomPlatformData.cpp.
* platform/graphics/freetype/FontPlatformData.h: Copied from WebCore/platform/graphics/cairo/FontPlatformDataFreeType.h.
* platform/graphics/freetype/FontPlatformDataFreeType.cpp: Copied from WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp.
* platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp: Copied from WebCore/platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp.
* platform/graphics/freetype/SimpleFontDataFreeType.cpp: Copied from WebCore/platform/graphics/cairo/SimpleFontDataCairo.cpp.
* platform/graphics/gtk/FontCachePango.cpp: Removed.
* platform/graphics/gtk/FontCustomPlatformDataPango.cpp: Removed.
* platform/graphics/gtk/FontPlatformDataPango.cpp: Removed.
* platform/graphics/gtk/FontPlatformDataPango.h: Removed.
* platform/graphics/gtk/GlyphPageTreeNodePango.cpp: Removed.
* platform/graphics/gtk/SimpleFontDataPango.cpp: Removed.
* platform/graphics/pango: Added.
* platform/graphics/pango/FontCachePango.cpp: Copied from WebCore/platform/graphics/gtk/FontCachePango.cpp.
* platform/graphics/pango/FontCustomPlatformDataPango.cpp: Copied from WebCore/platform/graphics/gtk/FontCustomPlatformDataPango.cpp.
* platform/graphics/pango/FontPlatformData.h: Copied from WebCore/platform/graphics/gtk/FontPlatformDataPango.h.
* platform/graphics/pango/FontPlatformDataPango.cpp: Copied from WebCore/platform/graphics/gtk/FontPlatformDataPango.cpp.
* platform/graphics/pango/GlyphPageTreeNodePango.cpp: Copied from WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp.
* platform/graphics/pango/SimpleFontDataPango.cpp: Copied from WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp.
* platform/graphics/win/FontPlatformData.h: Copied from WebCore/platform/graphics/win/FontPlatformDataCairoWin.h.
* platform/graphics/win/FontPlatformDataCairoWin.h: Removed.
2010-11-11 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Adam Barth.
[GTK] Move font related files.
https://bugs.webkit.org/show_bug.cgi?id=48116
Add freetype/ to include path.
* CMakeListsEfl.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71816 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index 18fedc3..a257a72 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -65,15 +65,12 @@ LIST(APPEND WebCore_SOURCES
IF (WTF_PLATFORM_CAIRO)
LIST(APPEND WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/graphics/cairo"
+ "${WEBCORE_DIR}/platform/graphics/freetype"
)
LIST(APPEND WebCore_SOURCES
platform/graphics/cairo/CairoUtilities.cpp
platform/graphics/cairo/ContextShadowCairo.cpp
- platform/graphics/cairo/FontCacheFreeType.cpp
platform/graphics/cairo/FontCairo.cpp
- platform/graphics/cairo/FontCustomPlatformData.cpp
- platform/graphics/cairo/FontPlatformDataFreeType.cpp
- platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp
platform/graphics/cairo/GradientCairo.cpp
platform/graphics/cairo/GraphicsContextCairo.cpp
platform/graphics/cairo/ImageBufferCairo.cpp
@@ -82,8 +79,12 @@ IF (WTF_PLATFORM_CAIRO)
platform/graphics/cairo/PathCairo.cpp
platform/graphics/cairo/PatternCairo.cpp
platform/graphics/cairo/RefPtrCairo.cpp
- platform/graphics/cairo/SimpleFontDataCairo.cpp
platform/graphics/cairo/TransformationMatrixCairo.cpp
+ platform/graphics/freetype/FontCacheFreeType.cpp
+ platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
+ platform/graphics/freetype/FontPlatformDataFreeType.cpp
+ platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
+ platform/graphics/freetype/SimpleFontDataFreeType.cpp
platform/image-decoders/cairo/ImageDecoderCairo.cpp
)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8895ad1..c663a1f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,47 @@
+2010-11-11 Ryuan Choi <ryuan.choi at samsung.com>
+
+ Reviewed by Adam Barth.
+
+ [GTK] Move font related files.
+ https://bugs.webkit.org/show_bug.cgi?id=48116
+
+ Move pango and freetype related files to share non-GTK+ platforms.
+
+ No new tests because this is pure refactoring.
+
+ * CMakeListsEfl.txt:
+ * GNUmakefile.am:
+ * WebCore.vcproj/WebCore.vcproj:
+ * platform/graphics/cairo/FontCacheFreeType.cpp: Removed.
+ * platform/graphics/cairo/FontCustomPlatformData.cpp: Removed.
+ * platform/graphics/cairo/FontPlatformData.h: Removed.
+ * platform/graphics/cairo/FontPlatformDataFreeType.cpp: Removed.
+ * platform/graphics/cairo/FontPlatformDataFreeType.h: Removed.
+ * platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp: Removed.
+ * platform/graphics/cairo/SimpleFontDataCairo.cpp: Removed.
+ * platform/graphics/freetype: Added.
+ * platform/graphics/freetype/FontCacheFreeType.cpp: Copied from WebCore/platform/graphics/cairo/FontCacheFreeType.cpp.
+ * platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp: Copied from WebCore/platform/graphics/cairo/FontCustomPlatformData.cpp.
+ * platform/graphics/freetype/FontPlatformData.h: Copied from WebCore/platform/graphics/cairo/FontPlatformDataFreeType.h.
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp: Copied from WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp.
+ * platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp: Copied from WebCore/platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp.
+ * platform/graphics/freetype/SimpleFontDataFreeType.cpp: Copied from WebCore/platform/graphics/cairo/SimpleFontDataCairo.cpp.
+ * platform/graphics/gtk/FontCachePango.cpp: Removed.
+ * platform/graphics/gtk/FontCustomPlatformDataPango.cpp: Removed.
+ * platform/graphics/gtk/FontPlatformDataPango.cpp: Removed.
+ * platform/graphics/gtk/FontPlatformDataPango.h: Removed.
+ * platform/graphics/gtk/GlyphPageTreeNodePango.cpp: Removed.
+ * platform/graphics/gtk/SimpleFontDataPango.cpp: Removed.
+ * platform/graphics/pango: Added.
+ * platform/graphics/pango/FontCachePango.cpp: Copied from WebCore/platform/graphics/gtk/FontCachePango.cpp.
+ * platform/graphics/pango/FontCustomPlatformDataPango.cpp: Copied from WebCore/platform/graphics/gtk/FontCustomPlatformDataPango.cpp.
+ * platform/graphics/pango/FontPlatformData.h: Copied from WebCore/platform/graphics/gtk/FontPlatformDataPango.h.
+ * platform/graphics/pango/FontPlatformDataPango.cpp: Copied from WebCore/platform/graphics/gtk/FontPlatformDataPango.cpp.
+ * platform/graphics/pango/GlyphPageTreeNodePango.cpp: Copied from WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp.
+ * platform/graphics/pango/SimpleFontDataPango.cpp: Copied from WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp.
+ * platform/graphics/win/FontPlatformData.h: Copied from WebCore/platform/graphics/win/FontPlatformDataCairoWin.h.
+ * platform/graphics/win/FontPlatformDataCairoWin.h: Removed.
+
2010-11-11 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 270b2a8..1edd953 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3540,7 +3540,6 @@ webcoregtk_sources += \
WebCore/platform/graphics/cairo/FloatRectCairo.cpp \
WebCore/platform/graphics/cairo/FontCairo.cpp \
WebCore/platform/graphics/cairo/FontCustomPlatformData.h \
- WebCore/platform/graphics/cairo/FontPlatformData.h \
WebCore/platform/graphics/cairo/GradientCairo.cpp \
WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp \
WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h \
@@ -3754,28 +3753,34 @@ endif # END ENABLE_FAST_MOBILE_SCROLLING
# FreeType font backend
# ---
if USE_FREETYPE
-webcoregtk_cppflags += -DUSE_FREETYPE=1
+webcoregtk_cppflags += \
+ -DUSE_FREETYPE=1 \
+ -I$(srcdir)/WebCore/platform/graphics/freetype
+
webcoregtk_sources += \
- WebCore/platform/graphics/cairo/FontCacheFreeType.cpp \
- WebCore/platform/graphics/cairo/FontCustomPlatformData.cpp \
- WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp \
- WebCore/platform/graphics/cairo/FontPlatformDataFreeType.h \
- WebCore/platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp \
- WebCore/platform/graphics/cairo/SimpleFontDataCairo.cpp
+ WebCore/platform/graphics/freetype/FontCacheFreeType.cpp \
+ WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp \
+ WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp \
+ WebCore/platform/graphics/freetype/FontPlatformData.h \
+ WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp \
+ WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
endif # END USE_FREETYPE
# ---
# Pango font backend
# ---
if USE_PANGO
-webcoregtk_cppflags += -DUSE_PANGO=1
+webcoregtk_cppflags += \
+ -DUSE_PANGO=1 \
+ -I$(srcdir)/WebCore/platform/graphics/pango
+
webcoregtk_sources += \
- WebCore/platform/graphics/gtk/FontCachePango.cpp \
- WebCore/platform/graphics/gtk/FontCustomPlatformDataPango.cpp \
- WebCore/platform/graphics/gtk/FontPlatformDataPango.cpp \
- WebCore/platform/graphics/gtk/FontPlatformDataPango.h \
- WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp \
- WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp
+ WebCore/platform/graphics/pango/FontCachePango.cpp \
+ WebCore/platform/graphics/pango/FontCustomPlatformDataPango.cpp \
+ WebCore/platform/graphics/pango/FontPlatformDataPango.cpp \
+ WebCore/platform/graphics/pango/FontPlatformData.h \
+ WebCore/platform/graphics/pango/GlyphPageTreeNodePango.cpp \
+ WebCore/platform/graphics/pango/SimpleFontDataPango.cpp
endif # END USE_PANGO
# ----
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 47ee579..95c53cf 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -27190,7 +27190,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\platform\graphics\cairo\FontPlatformData.h"
+ RelativePath="..\platform\graphics\win\FontPlatformData.h"
>
<FileConfiguration
Name="Debug|Win32"
diff --git a/WebCore/platform/graphics/cairo/FontPlatformData.h b/WebCore/platform/graphics/cairo/FontPlatformData.h
deleted file mode 100644
index e5ffef2..0000000
--- a/WebCore/platform/graphics/cairo/FontPlatformData.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2010 Igalia S.L.
- * All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef FontPlatformData_h
-#define FontPlatformData_h
-
-#if defined(USE_FREETYPE)
-#include "FontPlatformDataFreeType.h"
-#elif defined(USE_PANGO)
-#include "FontPlatformDataPango.h"
-#elif PLATFORM(WIN)
-#include "FontPlatformDataCairoWin.h"
-#endif
-
-#endif // FontPlatformData_h
diff --git a/WebCore/platform/graphics/cairo/FontCacheFreeType.cpp b/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp
similarity index 100%
rename from WebCore/platform/graphics/cairo/FontCacheFreeType.cpp
rename to WebCore/platform/graphics/freetype/FontCacheFreeType.cpp
diff --git a/WebCore/platform/graphics/cairo/FontCustomPlatformData.cpp b/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
similarity index 100%
rename from WebCore/platform/graphics/cairo/FontCustomPlatformData.cpp
rename to WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
diff --git a/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.h b/WebCore/platform/graphics/freetype/FontPlatformData.h
similarity index 100%
rename from WebCore/platform/graphics/cairo/FontPlatformDataFreeType.h
rename to WebCore/platform/graphics/freetype/FontPlatformData.h
diff --git a/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp b/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
similarity index 100%
rename from WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
rename to WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
diff --git a/WebCore/platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp b/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
similarity index 100%
rename from WebCore/platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp
rename to WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
diff --git a/WebCore/platform/graphics/cairo/SimpleFontDataCairo.cpp b/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
similarity index 100%
rename from WebCore/platform/graphics/cairo/SimpleFontDataCairo.cpp
rename to WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
diff --git a/WebCore/platform/graphics/gtk/FontCachePango.cpp b/WebCore/platform/graphics/pango/FontCachePango.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontCachePango.cpp
rename to WebCore/platform/graphics/pango/FontCachePango.cpp
diff --git a/WebCore/platform/graphics/gtk/FontCustomPlatformDataPango.cpp b/WebCore/platform/graphics/pango/FontCustomPlatformDataPango.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontCustomPlatformDataPango.cpp
rename to WebCore/platform/graphics/pango/FontCustomPlatformDataPango.cpp
diff --git a/WebCore/platform/graphics/gtk/FontPlatformDataPango.h b/WebCore/platform/graphics/pango/FontPlatformData.h
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontPlatformDataPango.h
rename to WebCore/platform/graphics/pango/FontPlatformData.h
diff --git a/WebCore/platform/graphics/gtk/FontPlatformDataPango.cpp b/WebCore/platform/graphics/pango/FontPlatformDataPango.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontPlatformDataPango.cpp
rename to WebCore/platform/graphics/pango/FontPlatformDataPango.cpp
diff --git a/WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp b/WebCore/platform/graphics/pango/GlyphPageTreeNodePango.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp
rename to WebCore/platform/graphics/pango/GlyphPageTreeNodePango.cpp
diff --git a/WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp b/WebCore/platform/graphics/pango/SimpleFontDataPango.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp
rename to WebCore/platform/graphics/pango/SimpleFontDataPango.cpp
diff --git a/WebCore/platform/graphics/win/FontPlatformDataCairoWin.h b/WebCore/platform/graphics/win/FontPlatformData.h
similarity index 100%
rename from WebCore/platform/graphics/win/FontPlatformDataCairoWin.h
rename to WebCore/platform/graphics/win/FontPlatformData.h
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index 1964d15..1819883 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -11,6 +11,7 @@ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBKIT_DIR}/efl/ewk"
"${WEBKIT_DIR}/efl/WebCoreSupport"
"${WEBCORE_DIR}/platform/efl"
+ "${WEBCORE_DIR}/platform/graphics/freetype"
${Cairo_INCLUDE_DIRS}
${ECORE_X_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index c7b457b..a872105 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-11 Ryuan Choi <ryuan.choi at samsung.com>
+
+ Reviewed by Adam Barth.
+
+ [GTK] Move font related files.
+ https://bugs.webkit.org/show_bug.cgi?id=48116
+
+ Add freetype/ to include path.
+
+ * CMakeListsEfl.txt:
+
2010-11-08 Rafael Antognolli <antognolli at profusion.mobi>
Reviewed by Antonio Gomes.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list