Build fix.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 03:48:52 +0000 (03:48 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 03:48:52 +0000 (03:48 +0000)
        * platform/graphics/qt/FontCustomPlatformData.cpp:
        (WebCore::FontCustomPlatformData::~FontCustomPlatformData): Added.
        Calls QFontDatabase::removeApplicationFont().
        * platform/graphics/qt/FontCustomPlatformData.h:
        * platform/graphics/qt/GlyphPageTreeNodeQt.cpp:
        (WebCore::GlyphPageTreeNode::pruneTreeCustomFontData): Removed the
        implementation because Qt does not use the WebCore glyph cache.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29283 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/graphics/qt/FontCustomPlatformData.cpp
WebCore/platform/graphics/qt/FontCustomPlatformData.h
WebCore/platform/graphics/qt/GlyphPageTreeNodeQt.cpp

index c87f269ea14dff9eb987e75467687f4fa5f168a9..7a4686ba030755ab76ddd4fb10a07ad0479c0a0d 100644 (file)
@@ -1,3 +1,15 @@
+2008-01-07  Dan Bernstein  <mitz@apple.com>
+
+        Build fix.
+
+        * platform/graphics/qt/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::~FontCustomPlatformData): Added.
+        Calls QFontDatabase::removeApplicationFont().
+        * platform/graphics/qt/FontCustomPlatformData.h:
+        * platform/graphics/qt/GlyphPageTreeNodeQt.cpp:
+        (WebCore::GlyphPageTreeNode::pruneTreeCustomFontData): Removed the
+        implementation because Qt does not use the WebCore glyph cache.
+
 2008-01-07  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Oliver Hunt.
index d3a32f3d3440e17c780ab8e646fb04a1792f63ca..3e219cd2b69017c94a3a1c23cde8662a679b1a8f 100644 (file)
 
 namespace WebCore {
 
+FontCustomPlatformData::~FontCustomPlatformData()
+{
+    QFontDatabase::removeApplicationFont(handle);
+}
+
 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic)
 {
     FontPlatformData result;
index 928bd79b4c44955eb1b1aa7abd7fbb9e9f028b07..b7a2b15cbd0d5a6a19b0896b8b10c2175ac3f00e 100644 (file)
@@ -30,6 +30,8 @@ class SharedBuffer;
 class FontPlatformData;
 
 struct FontCustomPlatformData : Noncopyable {
+    ~FontCustomPlatformData();
+
     int handle; // for use with QFontDatabase::addApplicationFont/removeApplicationFont
 
     FontPlatformData fontPlatformData(int size, bool bold, bool italic);
index 1fd179388a9fbb3ab250453e69eb732b71b0912e..220807ea3e1901f4927a518b18529daccf214835 100644 (file)
 #include "config.h"
 #include "GlyphPageTreeNode.h"
 
-#include "FontPlatformData.h"
-#include "SimpleFontData.h"
-#include <QFontDatabase>
-
 namespace WebCore {
 
 void GlyphPageTreeNode::pruneTreeCustomFontData(const FontData* fontData)
 {
-    QFontDatabase::removeApplicationFont(fontData->platformData().handle);
 }
 
 }