From d1ec7b7e9b1d984795a4a86da03056870d6f3a0f Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 7 Feb 2012 20:47:53 +0000 Subject: [PATCH] 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 --- patch/patch.cfg | 5 +++++ patch/patches/webcore_graphics_chromium.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 patch/patches/webcore_graphics_chromium.patch diff --git a/patch/patch.cfg b/patch/patch.cfg index e960f7078..512e00188 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -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', diff --git a/patch/patches/webcore_graphics_chromium.patch b/patch/patches/webcore_graphics_chromium.patch new file mode 100644 index 000000000..8e81bfc46 --- /dev/null +++ b/patch/patches/webcore_graphics_chromium.patch @@ -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;