[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 12:57:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3fabce87a804e625a69c3001b7e500008eb14fd5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 3 01:38:51 2010 +0000
2010-09-02 Rafael Antognolli <antognolli at profusion.mobi>
Reviewed by Martin Robinson.
[Cairo] Remove glib dependency (caused by use of GOwnPtr)
https://bugs.webkit.org/show_bug.cgi?id=45053
Use OwnPtr instead of GOwnPtr to keep track of Fc* references
in FontCacheCairo.cpp.
No features added, so no new tests.
* CMakeListsEfl.txt: Updating build system to look for GOwnPtrCairo.*
* GNUmakefile.am: Ditto.
* platform/graphics/cairo/FontCacheCairo.cpp: Using OwnPtr instead of GOwnPtr.
(WebCore::FontCache::createFontPlatformData):
* platform/graphics/cairo/GOwnPtrCairo.cpp: Removed.
* platform/graphics/cairo/GOwnPtrCairo.h: Removed.
* platform/graphics/cairo/OwnPtrCairo.cpp: Added.
(WTF::FcPattern):
(WTF::FcObjectSet):
(WTF::FcFontSet):
* platform/graphics/cairo/OwnPtrCairo.h: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66700 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index 1741baa..91b6b23 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -69,7 +69,7 @@ IF (WTF_PLATFORM_CAIRO)
platform/graphics/cairo/FontCairo.cpp
platform/graphics/cairo/FontCustomPlatformData.cpp
platform/graphics/cairo/FontPlatformDataCairo.cpp
- platform/graphics/cairo/GOwnPtrCairo.cpp
+ platform/graphics/cairo/OwnPtrCairo.cpp
platform/graphics/cairo/PlatformRefPtrCairo.cpp
platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp
platform/graphics/cairo/GradientCairo.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 61a18dd..7f1fea3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2010-09-02 Rafael Antognolli <antognolli at profusion.mobi>
+
+ Reviewed by Martin Robinson.
+
+ [Cairo] Remove glib dependency (caused by use of GOwnPtr)
+ https://bugs.webkit.org/show_bug.cgi?id=45053
+
+ Use OwnPtr instead of GOwnPtr to keep track of Fc* references
+ in FontCacheCairo.cpp.
+
+ No features added, so no new tests.
+
+ * CMakeListsEfl.txt: Updating build system to look for GOwnPtrCairo.*
+ * GNUmakefile.am: Ditto.
+ * platform/graphics/cairo/FontCacheCairo.cpp: Using OwnPtr instead of GOwnPtr.
+ (WebCore::FontCache::createFontPlatformData):
+ * platform/graphics/cairo/GOwnPtrCairo.cpp: Removed.
+ * platform/graphics/cairo/GOwnPtrCairo.h: Removed.
+ * platform/graphics/cairo/OwnPtrCairo.cpp: Added.
+ (WTF::FcPattern):
+ (WTF::FcObjectSet):
+ (WTF::FcFontSet):
+ * platform/graphics/cairo/OwnPtrCairo.h: Added.
+
2010-09-02 Kinuko Yasuda <kinuko at chromium.org>
Unreviewed, updating binding-tests expectations (for changeset 66521).
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 76f8be2..9f7eef3 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2449,8 +2449,8 @@ webcoregtk_sources += \
WebCore/platform/graphics/cairo/FontCairo.cpp \
WebCore/platform/graphics/cairo/FontCustomPlatformData.h \
WebCore/platform/graphics/cairo/FontPlatformData.h \
- WebCore/platform/graphics/cairo/GOwnPtrCairo.cpp \
- WebCore/platform/graphics/cairo/GOwnPtrCairo.h \
+ WebCore/platform/graphics/cairo/OwnPtrCairo.cpp \
+ WebCore/platform/graphics/cairo/OwnPtrCairo.h \
WebCore/platform/graphics/cairo/GradientCairo.cpp \
WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp \
WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h \
diff --git a/WebCore/platform/graphics/cairo/FontCacheCairo.cpp b/WebCore/platform/graphics/cairo/FontCacheCairo.cpp
index cb54549..5d3263e 100644
--- a/WebCore/platform/graphics/cairo/FontCacheCairo.cpp
+++ b/WebCore/platform/graphics/cairo/FontCacheCairo.cpp
@@ -23,7 +23,7 @@
#include "CString.h"
#include "Font.h"
-#include "GOwnPtrCairo.h"
+#include "OwnPtrCairo.h"
#include "SimpleFontData.h"
#include <wtf/Assertions.h>
@@ -115,15 +115,15 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD
CString familyNameString = family.string().utf8();
const char* fcfamily = familyNameString.data();
- GOwnPtr<FcPattern> pattern(FcPatternCreate());
+ OwnPtr<FcPattern> pattern(FcPatternCreate());
if (!FcPatternAddString(pattern.get(), FC_FAMILY, reinterpret_cast<const FcChar8*>(fcfamily)))
return 0;
- GOwnPtr<FcObjectSet> objectSet(FcObjectSetCreate());
+ OwnPtr<FcObjectSet> objectSet(FcObjectSetCreate());
if (!FcObjectSetAdd(objectSet.get(), FC_FAMILY))
return 0;
- GOwnPtr<FcFontSet> fontSet(FcFontList(0, pattern.get(), objectSet.get()));
+ OwnPtr<FcFontSet> fontSet(FcFontList(0, pattern.get(), objectSet.get()));
if (!fontSet)
return 0;
diff --git a/WebCore/platform/graphics/cairo/GOwnPtrCairo.cpp b/WebCore/platform/graphics/cairo/GOwnPtrCairo.cpp
deleted file mode 100644
index 12df3cf..0000000
--- a/WebCore/platform/graphics/cairo/GOwnPtrCairo.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "GOwnPtrCairo.h"
-
-#if defined(USE_FREETYPE)
-#include <cairo-ft.h>
-#include <fontconfig/fcfreetype.h>
-#endif
-
-namespace WTF {
-
-#if defined(USE_FREETYPE)
-template <> void freeOwnedGPtr<FcPattern>(FcPattern* ptr)
-{
- if (ptr)
- FcPatternDestroy(ptr);
-}
-
-template <> void freeOwnedGPtr<FcObjectSet>(FcObjectSet* ptr)
-{
- if (ptr)
- FcObjectSetDestroy(ptr);
-}
-
-template <> void freeOwnedGPtr<FcFontSet>(FcFontSet* ptr)
-{
- if (ptr)
- FcFontSetDestroy(ptr);
-}
-#endif
-
-} // namespace WTF
diff --git a/WebCore/platform/graphics/cairo/GOwnPtrCairo.h b/WebCore/platform/graphics/cairo/GOwnPtrCairo.h
deleted file mode 100644
index b099707..0000000
--- a/WebCore/platform/graphics/cairo/GOwnPtrCairo.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-#ifndef GOwnPtrCairo_h
-#define GOwnPtrCairo_h
-
-#include "GOwnPtr.h"
-
-#if defined(USE_FREETYPE)
-typedef struct _FcPattern FcPattern;
-typedef struct _FcObjectSet FcObjectSet;
-typedef struct _FcFontSet FcFontSet;
-#endif
-
-namespace WTF {
-
-#if defined(USE_FREETYPE)
-template <> void freeOwnedGPtr<FcPattern>(FcPattern*);
-template <> void freeOwnedGPtr<FcObjectSet>(FcObjectSet*);
-template <> void freeOwnedGPtr<FcFontSet>(FcFontSet*);
-#endif
-
-} // namespace WTF
-
-#endif
diff --git a/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp b/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp
new file mode 100644
index 0000000..9be8670
--- /dev/null
+++ b/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2010 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "OwnPtrCairo.h"
+
+#if defined(USE_FREETYPE)
+#include <cairo-ft.h>
+#include <fontconfig/fcfreetype.h>
+#endif
+
+namespace WTF {
+
+#if defined(USE_FREETYPE)
+template <> void deleteOwnedPtr<FcPattern>(FcPattern* ptr)
+{
+ if (ptr)
+ FcPatternDestroy(ptr);
+}
+
+template <> void deleteOwnedPtr<FcObjectSet>(FcObjectSet* ptr)
+{
+ if (ptr)
+ FcObjectSetDestroy(ptr);
+}
+
+template <> void deleteOwnedPtr<FcFontSet>(FcFontSet* ptr)
+{
+ if (ptr)
+ FcFontSetDestroy(ptr);
+}
+#endif
+
+} // namespace WTF
diff --git a/WebCore/platform/graphics/cairo/OwnPtrCairo.h b/WebCore/platform/graphics/cairo/OwnPtrCairo.h
new file mode 100644
index 0000000..29f4562
--- /dev/null
+++ b/WebCore/platform/graphics/cairo/OwnPtrCairo.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+#ifndef OwnPtrCairo_h
+#define OwnPtrCairo_h
+
+#include "OwnPtr.h"
+
+#if defined(USE_FREETYPE)
+typedef struct _FcPattern FcPattern;
+typedef struct _FcObjectSet FcObjectSet;
+typedef struct _FcFontSet FcFontSet;
+#endif
+
+namespace WTF {
+
+#if defined(USE_FREETYPE)
+template <> void deleteOwnedPtr<FcPattern>(FcPattern*);
+template <> void deleteOwnedPtr<FcObjectSet>(FcObjectSet*);
+template <> void deleteOwnedPtr<FcFontSet>(FcFontSet*);
+#endif
+
+} // namespace WTF
+
+#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list