Merge revision 476 changes:

- Add patch to fix GDI object leak in FontCacheChromiumWin.cpp createFontIndirectAndGetWinName (issue #499).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@477 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-02-07 20:47:53 +00:00
parent 2240f2cf36
commit d1ec7b7e9b
2 changed files with 17 additions and 0 deletions

View File

@ -31,6 +31,11 @@ patches = [
'name': 'webcore_cachedresource',
'path': '../third_party/WebKit/Source/WebCore/loader/cache/',
},
{
# https://bugs.webkit.org/show_bug.cgi?id=78018
'name': 'webcore_graphics_chromium',
'path': '../third_party/WebKit/Source/WebCore/platform/graphics/chromium/',
},
{
# http://code.google.com/p/chromiumembedded/issues/detail?id=364
'name': 'spi_webcore_364',

View File

@ -0,0 +1,12 @@
Index: FontCacheChromiumWin.cpp
===================================================================
--- FontCacheChromiumWin.cpp (revision 102901)
+++ FontCacheChromiumWin.cpp (working copy)
@@ -255,6 +255,7 @@
resultLength--; // ignore the null terminator
SelectObject(dc, oldFont);
+ DeleteObject(hfont);
ReleaseDC(0, dc);
*winName = String(name, resultLength);
return hfont;