[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 02:09:20 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b25a569038478a1be1290a0bf45f6123ff8f20b4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 4 08:51:15 2010 +0000
2010-03-04 Leandro Pereira <leandro at profusion.mobi>
Reviewed by Gustavo Noronha Silva.
Move Cairo-related font code from platform/graphics/gtk to
platform/graphics/cairo, so other ports may use them.
http://webkit.org/b/35539
* GNUmakefile.am:
* platform/graphics/cairo/FontCacheCairo.cpp: Copied from WebCore/platform/graphics/gtk/FontCacheGtk.cpp.
* platform/graphics/cairo/FontCustomPlatformData.cpp: Copied from WebCore/platform/graphics/gtk/FontCustomPlatformData.cpp.
* platform/graphics/cairo/FontCustomPlatformData.h: Copied from WebCore/platform/graphics/gtk/FontCustomPlatformData.h.
* platform/graphics/cairo/FontPlatformData.h: Copied from WebCore/platform/graphics/gtk/FontPlatformData.h.
* platform/graphics/cairo/FontPlatformDataCairo.cpp: Copied from WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp.
* platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp: Copied from WebCore/platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp.
* platform/graphics/cairo/SimpleFontDataCairo.cpp: Copied from WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp.
* platform/graphics/gtk/FontCacheGtk.cpp: Removed.
* platform/graphics/gtk/FontCustomPlatformData.cpp: Removed.
* platform/graphics/gtk/FontCustomPlatformData.h: Removed.
* platform/graphics/gtk/FontPlatformData.h: Removed.
* platform/graphics/gtk/FontPlatformDataGtk.cpp: Removed.
* platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp: Removed.
* platform/graphics/gtk/SimpleFontDataGtk.cpp: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55510 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4074789..bc7484a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2010-03-04 Leandro Pereira <leandro at profusion.mobi>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Move Cairo-related font code from platform/graphics/gtk to
+ platform/graphics/cairo, so other ports may use them.
+ http://webkit.org/b/35539
+
+ * GNUmakefile.am:
+ * platform/graphics/cairo/FontCacheCairo.cpp: Copied from WebCore/platform/graphics/gtk/FontCacheGtk.cpp.
+ * platform/graphics/cairo/FontCustomPlatformData.cpp: Copied from WebCore/platform/graphics/gtk/FontCustomPlatformData.cpp.
+ * platform/graphics/cairo/FontCustomPlatformData.h: Copied from WebCore/platform/graphics/gtk/FontCustomPlatformData.h.
+ * platform/graphics/cairo/FontPlatformData.h: Copied from WebCore/platform/graphics/gtk/FontPlatformData.h.
+ * platform/graphics/cairo/FontPlatformDataCairo.cpp: Copied from WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp.
+ * platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp: Copied from WebCore/platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp.
+ * platform/graphics/cairo/SimpleFontDataCairo.cpp: Copied from WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp.
+ * platform/graphics/gtk/FontCacheGtk.cpp: Removed.
+ * platform/graphics/gtk/FontCustomPlatformData.cpp: Removed.
+ * platform/graphics/gtk/FontCustomPlatformData.h: Removed.
+ * platform/graphics/gtk/FontPlatformData.h: Removed.
+ * platform/graphics/gtk/FontPlatformDataGtk.cpp: Removed.
+ * platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp: Removed.
+ * platform/graphics/gtk/SimpleFontDataGtk.cpp: Removed.
+
2010-03-04 Evan Stade <estade at chromium.org>
Reviewed by David Levin.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 584132d..f7bb217 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2003,11 +2003,11 @@ webcoregtk_sources += \
WebCore/platform/graphics/cairo/PathCairo.cpp \
WebCore/platform/graphics/cairo/PatternCairo.cpp \
WebCore/platform/graphics/cairo/TransformationMatrixCairo.cpp \
+ WebCore/platform/graphics/cairo/FontCacheCairo.cpp \
+ WebCore/platform/graphics/cairo/FontCustomPlatformData.h \
+ WebCore/platform/graphics/cairo/FontPlatformData.h \
WebCore/platform/graphics/gtk/ColorGtk.cpp \
- WebCore/platform/graphics/gtk/FontCacheGtk.cpp \
- WebCore/platform/graphics/gtk/FontCustomPlatformData.h \
WebCore/platform/graphics/gtk/FontGtk.cpp \
- WebCore/platform/graphics/gtk/FontPlatformData.h \
WebCore/platform/graphics/gtk/IconGtk.cpp \
WebCore/platform/graphics/gtk/ImageGtk.cpp \
WebCore/platform/graphics/gtk/IntPointGtk.cpp \
@@ -2129,10 +2129,10 @@ webcoregtk_cppflags += \
-DUSE_FREETYPE=1
webcoregtk_sources += \
- WebCore/platform/graphics/gtk/FontCustomPlatformData.cpp \
- WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp \
- WebCore/platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp \
- WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp
+ WebCore/platform/graphics/cairo/FontCustomPlatformData.cpp \
+ WebCore/platform/graphics/cairo/FontPlatformDataCairo.cpp \
+ WebCore/platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp \
+ WebCore/platform/graphics/cairo/SimpleFontDataCairo.cpp
endif # END USE_FREETYPE
# ---
diff --git a/WebCore/platform/graphics/gtk/FontCacheGtk.cpp b/WebCore/platform/graphics/cairo/FontCacheCairo.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontCacheGtk.cpp
rename to WebCore/platform/graphics/cairo/FontCacheCairo.cpp
diff --git a/WebCore/platform/graphics/gtk/FontCustomPlatformData.cpp b/WebCore/platform/graphics/cairo/FontCustomPlatformData.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontCustomPlatformData.cpp
rename to WebCore/platform/graphics/cairo/FontCustomPlatformData.cpp
diff --git a/WebCore/platform/graphics/gtk/FontCustomPlatformData.h b/WebCore/platform/graphics/cairo/FontCustomPlatformData.h
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontCustomPlatformData.h
rename to WebCore/platform/graphics/cairo/FontCustomPlatformData.h
diff --git a/WebCore/platform/graphics/gtk/FontPlatformData.h b/WebCore/platform/graphics/cairo/FontPlatformData.h
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontPlatformData.h
rename to WebCore/platform/graphics/cairo/FontPlatformData.h
diff --git a/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp b/WebCore/platform/graphics/cairo/FontPlatformDataCairo.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp
rename to WebCore/platform/graphics/cairo/FontPlatformDataCairo.cpp
diff --git a/WebCore/platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp b/WebCore/platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp
rename to WebCore/platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp
diff --git a/WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp b/WebCore/platform/graphics/cairo/SimpleFontDataCairo.cpp
similarity index 100%
rename from WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp
rename to WebCore/platform/graphics/cairo/SimpleFontDataCairo.cpp
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list