[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mitz at apple.com
mitz at apple.com
Wed Dec 22 11:48:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5139b589dcaa035b943a9d70cc64b72ccfc468c0
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Aug 7 19:18:30 2010 +0000
Build fix
* platform/graphics/SimpleFontData.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64916 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 06b30da..b3014d6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
2010-08-07 Dan Bernstein <mitz at apple.com>
+ Build fix
+
+ * platform/graphics/SimpleFontData.h:
+
+2010-08-07 Dan Bernstein <mitz at apple.com>
+
Reviewed by Anders Carlsson.
Created a separate SimpleFontData constructor exclusively for SVG fonts and moved the CTFontRef
diff --git a/WebCore/platform/graphics/SimpleFontData.h b/WebCore/platform/graphics/SimpleFontData.h
index 62b9b40..535554f 100644
--- a/WebCore/platform/graphics/SimpleFontData.h
+++ b/WebCore/platform/graphics/SimpleFontData.h
@@ -32,12 +32,15 @@
#include "TypesettingFeatures.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
-#include <wtf/RetainPtr.h>
#if USE(ATSUI)
typedef struct OpaqueATSUStyle* ATSUStyle;
#endif
+#if USE(CORE_TEXT)
+#include <wtf/RetainPtr.h>
+#endif
+
#if (PLATFORM(WIN) && !OS(WINCE)) \
|| (OS(WINDOWS) && PLATFORM(WX))
#include <usp10.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list