Changeset 94323 in webkit

Timestamp:

Sep 1, 2011 11:41:37 AM (13 years ago)

Author:

tonyg@chromium.org

Message:

[chromium] Fonts returned by FontCache::getFontDataForCharacters() are never released
​https://bugs.webkit.org/show_bug.cgi?id=66673

Reviewed by James Robinson.

This was fixed for other ports in ​http://trac.webkit.org/changeset/88260.
However, it was missed in FontCacheLinux likely due to similar param in the nested call to getCachedFontPlatformData().

No new tests because no directly observable change in behavior.

• platform/graphics/chromium/FontCacheLinux.cpp:

(WebCore::FontCache::getFontDataForCharacters):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/FontCacheLinux.cpp (modified) (1 diff)
• WebKit/chromium/src/WebFontImpl.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-01  Tony Gentilcore  <tonyg@chromium.org>
+
+        [chromium] Fonts returned by FontCache::getFontDataForCharacters() are never released
+        https://bugs.webkit.org/show_bug.cgi?id=66673
+
+        Reviewed by James Robinson.
+
+        This was fixed for other ports in http://trac.webkit.org/changeset/88260.
+        However, it was missed in FontCacheLinux likely due to similar param in the nested call to getCachedFontPlatformData().
+
+        No new tests because no directly observable change in behavior.
+
+        * platform/graphics/chromium/FontCacheLinux.cpp:
+        (WebCore::FontCache::getFontDataForCharacters):
+
 2011-08-31  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/FontCacheLinux.cpp

@@ -65 +65 @@
 
     AtomicString atomicFamily(family);
-    return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, DoNotRetain));
+    return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, DoNotRetain), DoNotRetain);
 }
 

trunk/Source/WebKit/chromium/src/WebFontImpl.cpp

@@ -33 +33 @@
 
 #include "Font.h"
+#include "FontCache.h"
 #include "FontDescription.h"
 #include "GraphicsContext.h"
@@ -94 +95 @@
                            int from, int to) const
 {
+    FontCachePurgePreventer fontCachePurgePreventer;
+
     GraphicsContextBuilder builder(canvas);
     GraphicsContext& gc = builder.context();