Changeset 88691 in webkit

Timestamp:

Jun 13, 2011 2:08:34 PM (13 years ago)

Author:

msaboff@apple.com

Message:

2011-06-13 Michael Saboff <​msaboff@apple.com>

Reviewed by Oliver Hunt.

Additional FontCache::FontCachePurgePreventer instances needed
​https://bugs.webkit.org/show_bug.cgi?id=62498

Added some needed and speculative FontCachePurgePreventer objects.
Built and ran Safari with debug version of webkit that purges all
purgeable fonts in FontCache::purgeInactiveFontDataIfNeeded in order
to find system fallback fonts access via code paths that aren't
protected with FontCachePurgePreventer objects. Also examined
platform specific code that calls either Font::drawText() or
Canvas::drawText(). For those methods that may be called from currently
unprotected paths, added FontCachePurgePreventer objects.

No new functionality so no new tests.

• inspector/DOMNodeHighlighter.cpp:
• platform/graphics/ca/win/PlatformCALayerWinInternal.cpp: (PlatformCALayerWinInternal::displayCallback):
• platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp: (WebCore::CCHeadsUpDisplay::drawHudContents):
• platform/mac/DragImageMac.mm: (WebCore::widthWithFont): (WebCore::drawAtPoint):
• rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::updateOptionsWidth):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/DOMNodeHighlighter.cpp (modified) (2 diffs)
• platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (modified) (2 diffs)
• platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp (modified) (2 diffs)
• platform/mac/DragImageMac.mm (modified) (3 diffs)
• rendering/RenderMenuList.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-13  Michael Saboff  <msaboff@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Additional FontCache::FontCachePurgePreventer instances needed
+        https://bugs.webkit.org/show_bug.cgi?id=62498
+
+        Added some needed and speculative FontCachePurgePreventer objects.
+        Built and ran Safari with debug version of webkit that purges all
+        purgeable fonts in FontCache::purgeInactiveFontDataIfNeeded in order
+        to find system fallback fonts access via code paths that aren't
+        protected with FontCachePurgePreventer objects.  Also examined
+        platform specific code that calls either Font::drawText() or
+        Canvas::drawText().  For those methods that may be called from currently
+        unprotected paths, added FontCachePurgePreventer objects.
+
+        No new functionality so no new tests.
+
+        * inspector/DOMNodeHighlighter.cpp:
+        * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+        (PlatformCALayerWinInternal::displayCallback):
+        * platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:
+        (WebCore::CCHeadsUpDisplay::drawHudContents):
+        * platform/mac/DragImageMac.mm:
+        (WebCore::widthWithFont):
+        (WebCore::drawAtPoint):
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::updateOptionsWidth):
+
 2011-06-13  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp

@@ -33 +33 @@
 
 #include "Element.h"
+#include "FontCache.h"
 #include "Frame.h"
 #include "FrameView.h"
@@ -140 +141 @@
     static const Color tooltipBorderColor(Color::black);
     static const Color tooltipFontColor(Color::black);
+    FontCachePurgePreventer fontCachePurgePreventer;
 
     Element* element = static_cast<Element*>(node);

trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp

@@ -31 +31 @@
 
 #include "Font.h"
+#include "FontCache.h"
 #include "PlatformCALayer.h"
 #include "TextRun.h"
@@ -94 +95 @@
 
     if (owner()->owner()->platformCALayerShowRepaintCounter()) {
+        FontCachePurgePreventer fontCachePurgePreventer;
+
         String text = String::number(owner()->owner()->platformCALayerIncrementRepaintCount());
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp

@@ -30 +30 @@
 #include "Extensions3DChromium.h"
 #include "Font.h"
+#include "FontCache.h"
 #include "FontDescription.h"
 #include "GraphicsContext3D.h"
@@ -146 +147 @@
 void CCHeadsUpDisplay::drawHudContents(GraphicsContext* ctx, const IntSize& hudSize)
 {
+    FontCachePurgePreventer fontCachePurgePreventer;
+
     if (m_showPlatformLayerTree) {
         ctx->setFillColor(Color(0, 0, 0, 192), ColorSpaceDeviceRGB);

trunk/Source/WebCore/platform/mac/DragImageMac.mm

@@ -30 +30 @@
 #import "CachedImage.h"
 #import "Font.h"
+#import "FontCache.h"
 #import "FontDescription.h"
 #import "FontSelector.h"
@@ -157 +158 @@
     
     if (canUseFastRenderer(buffer.data(), length)) {
+        FontCachePurgePreventer fontCachePurgePreventer;
+
         Font webCoreFont(FontPlatformData(font, [font pointSize]), ![[NSGraphicsContext currentContext] isDrawingToScreen]);
         TextRun run(buffer.data(), length);
@@ -180 +183 @@
     
     if (canUseFastRenderer(buffer.data(), length)) {
+        FontCachePurgePreventer fontCachePurgePreventer;
+
         // The following is a half-assed attempt to match AppKit's rounding rules for drawAtPoint.
         // It's probably incorrect for high DPI.

trunk/Source/WebCore/rendering/RenderMenuList.cpp

@@ -30 +30 @@
 #include "CSSStyleSelector.h"
 #include "Chrome.h"
+#include "FontCache.h"
 #include "Frame.h"
 #include "FrameView.h"
@@ -144 +145 @@
     const Vector<Element*>& listItems = toSelectElement(static_cast<Element*>(node()))->listItems();
     int size = listItems.size();    
+    FontCachePurgePreventer fontCachePurgePreventer;
+
     for (int i = 0; i < size; ++i) {
         Element* element = listItems[i];