Changeset 24332 in webkit

Timestamp:

Jul 16, 2007, 3:09:05 PM (18 years ago)

Author:

hyatt

Message:

Added a manual test to test calling window.print on a subframe.

Reviewed by Darin.

• manual-tests/resources/print-subframe.html: Added.
• manual-tests/window-print-subframe.html: Added.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/FontCacheWin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ -53 +53 @@
         ditto.  We already had checks to prevent drawing the text that considered the option's style too, but if visibility: hidden
         was just set on the listbox then a lot of extra work was being done, and the scrollbar was drawing too.  This change fixes that.
+
+2007-07-16  David Hyatt  <hyatt@apple.com>
+
+        Fix for 5335829, avoid creating a pathological # of FontData objects
+        on Windows.  The MLang service actually caches and reuses HFONTs, which
+        means it is safe to use our FontPlatformData -> FontData cache.
+
+        Reviewed by olliej
+
+        * platform/win/FontCacheWin.cpp:
+        (WebCore::FontCache::getFontDataForCharacters):
 
 2007-07-16  David Hyatt  <hyatt@apple.com>

trunk/WebCore/platform/win/FontCacheWin.cpp

@@ -85 +85 @@
         HFONT result;
         if (langFontLink->MapFont(hdc, actualCodePages, characters[0], &result) == S_OK) {
-            fontData = new FontData(FontPlatformData(result, font.fontDescription().computedPixelSize(), font.fontDescription().bold(), font.fontDescription().italic()));
+            // MLang has an internal cache, which means it really will hand back the same HFONT pointer if it can.  We can
+            // therefore safely use our hash on HFONT pointers (FontPlatformData -> FontData) and actually expect it to work.
+            FontPlatformData platformData(result, font.fontDescription().computedPixelSize(), font.fontDescription().bold(), font.fontDescription().italic());
+            fontData = getCachedFontData(&platformData);
             fontData->setIsMLangFont();
         }