Title: [94323] trunk/Source
- Revision
- 94323
- Author
- [email protected]
- Date
- 2011-09-01 11:41:37 -0700 (Thu, 01 Sep 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94322 => 94323)
--- trunk/Source/WebCore/ChangeLog 2011-09-01 18:39:51 UTC (rev 94322)
+++ trunk/Source/WebCore/ChangeLog 2011-09-01 18:41:37 UTC (rev 94323)
@@ -1,3 +1,18 @@
+2011-09-01 Tony Gentilcore <[email protected]>
+
+ [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 <[email protected]>
Web Inspector: [Chromium] Perform a more effective JS GC
Modified: trunk/Source/WebCore/platform/graphics/chromium/FontCacheLinux.cpp (94322 => 94323)
--- trunk/Source/WebCore/platform/graphics/chromium/FontCacheLinux.cpp 2011-09-01 18:39:51 UTC (rev 94322)
+++ trunk/Source/WebCore/platform/graphics/chromium/FontCacheLinux.cpp 2011-09-01 18:41:37 UTC (rev 94323)
@@ -64,7 +64,7 @@
return 0;
AtomicString atomicFamily(family);
- return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, DoNotRetain));
+ return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, DoNotRetain), DoNotRetain);
}
SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font)
Modified: trunk/Source/WebKit/chromium/src/WebFontImpl.cpp (94322 => 94323)
--- trunk/Source/WebKit/chromium/src/WebFontImpl.cpp 2011-09-01 18:39:51 UTC (rev 94322)
+++ trunk/Source/WebKit/chromium/src/WebFontImpl.cpp 2011-09-01 18:41:37 UTC (rev 94323)
@@ -32,6 +32,7 @@
#include "WebFontImpl.h"
#include "Font.h"
+#include "FontCache.h"
#include "FontDescription.h"
#include "GraphicsContext.h"
#include "painting/GraphicsContextBuilder.h"
@@ -93,6 +94,8 @@
WebColor color, const WebRect& clip, bool canvasIsOpaque,
int from, int to) const
{
+ FontCachePurgePreventer fontCachePurgePreventer;
+
GraphicsContextBuilder builder(canvas);
GraphicsContext& gc = builder.context();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
