Changeset 103262 in webkit

Timestamp:

Dec 19, 2011 1:40:00 PM (12 years ago)

Author:

reed@google.com

Message:

[skia] cache typeface in FontPlatformData
​https://bugs.webkit.org/show_bug.cgi?id=74415

Reviewed by Stephen White.

No new tests. optimization only, existing tests in play

• platform/graphics/chromium/FontChromiumWin.cpp:

(WebCore::TransparencyAwareFontPainter::TransparencyAwareGlyphPainter::drawGlyphs):
(WebCore::Font::drawGlyphs):

• platform/graphics/chromium/FontPlatformDataChromiumWin.cpp:

(WebCore::CreateTypefaceFromHFont):
(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::operator=):
(WebCore::FontPlatformData::~FontPlatformData):

• platform/graphics/chromium/FontPlatformDataChromiumWin.h:

(WebCore::FontPlatformData::typeface):
(WebCore::FontPlatformData::lfQuality):
(WebCore::FontPlatformData::hash):

• platform/graphics/skia/SkiaFontWin.cpp:

(WebCore::setupPaintForFont):
(WebCore::paintSkiaText):

• platform/graphics/skia/SkiaFontWin.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontChromiumWin.cpp (modified) (3 diffs)
• platform/graphics/chromium/FontPlatformDataChromiumWin.cpp (modified) (8 diffs)
• platform/graphics/chromium/FontPlatformDataChromiumWin.h (modified) (6 diffs)
• platform/graphics/skia/SkiaFontWin.cpp (modified) (7 diffs)
• platform/graphics/skia/SkiaFontWin.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-19  Mike Reed  <reed@google.com>
+
+        [skia] cache typeface in FontPlatformData
+        https://bugs.webkit.org/show_bug.cgi?id=74415
+
+        Reviewed by Stephen White.
+
+        No new tests. optimization only, existing tests in play
+
+        * platform/graphics/chromium/FontChromiumWin.cpp:
+        (WebCore::TransparencyAwareFontPainter::TransparencyAwareGlyphPainter::drawGlyphs):
+        (WebCore::Font::drawGlyphs):
+        * platform/graphics/chromium/FontPlatformDataChromiumWin.cpp:
+        (WebCore::CreateTypefaceFromHFont):
+        (WebCore::FontPlatformData::FontPlatformData):
+        (WebCore::FontPlatformData::operator=):
+        (WebCore::FontPlatformData::~FontPlatformData):
+        * platform/graphics/chromium/FontPlatformDataChromiumWin.h:
+        (WebCore::FontPlatformData::typeface):
+        (WebCore::FontPlatformData::lfQuality):
+        (WebCore::FontPlatformData::hash):
+        * platform/graphics/skia/SkiaFontWin.cpp:
+        (WebCore::setupPaintForFont):
+        (WebCore::paintSkiaText):
+        * platform/graphics/skia/SkiaFontWin.h:
+
 2011-12-04  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp

@@ -266 +266 @@
         SkPoint origin = m_point;
         origin.fX += SkFloatToScalar(startAdvance);
-        paintSkiaText(m_graphicsContext, m_font->platformData().hfont(),
+        paintSkiaText(m_graphicsContext, m_font->platformData(),
                       numGlyphs, glyphs, advances, 0, &origin);
         return true;
@@ -394 +394 @@
     if (!alpha && graphicsContext->platformContext()->getStrokeStyle() == NoStroke && !graphicsContext->hasShadow())
         return;
-
-    HFONT hfont = font->platformData().hfont();
 
     // We draw the glyphs in chunks to avoid having to do a heap allocation for
@@ -437 +435 @@
         SkPoint origin = point;
         origin.fX += SkFloatToScalar(horizontalOffset - point.x() - currentWidth);
-        paintSkiaText(graphicsContext, hfont, curLen, &glyphs[0], &advances[0], 0, &origin);
+        paintSkiaText(graphicsContext, font->platformData(), curLen, &glyphs[0], &advances[0], 0, &origin);
     }
 }

trunk/Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp

@@ -38 +38 @@
 
 #include "PlatformSupport.h"
+#include "SkTypeface_win.h"
 #include "SkiaFontWin.h"
 #include "StdLibExtras.h"
 
 namespace WebCore {
+
+SkTypeface* CreateTypefaceFromHFont(HFONT hfont, int* size, int* lfQuality)
+{
+    LOGFONT info;
+    GetObject(hfont, sizeof(info), &info);
+    if (size) {
+        int height = info.lfHeight;
+        if (height < 0)
+            height = -height;
+        *size = height;
+    }
+    if (lfQuality)
+        *lfQuality = info.lfQuality;
+    return SkCreateTypefaceFromLOGFONT(info);
+}
 
 FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
@@ -48 +64 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
+    , m_typeface(0)
+    , m_lfQuality(DEFAULT_QUALITY)
 {
 }
@@ -56 +74 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
+    , m_typeface(0)
+    , m_lfQuality(DEFAULT_QUALITY)
 {
 }
@@ -64 +84 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
+    , m_typeface(CreateTypefaceFromHFont(font, 0, &m_lfQuality))
 {
 }
@@ -73 +94 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
+    , m_typeface(0)
+    , m_lfQuality(DEFAULT_QUALITY)
 {
 }
@@ -81 +104 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
+    , m_typeface(data.m_typeface)
+    , m_lfQuality(data.m_lfQuality)
 {
+    SkSafeRef(m_typeface);
 }
 
@@ -89 +115 @@
         m_font = data.m_font;
         m_size = data.m_size;
+        SkRefCnt_SafeAssign(m_typeface, data.m_typeface);
+        m_lfQuality = data.m_lfQuality;
 
         // The following fields will get re-computed if necessary.
@@ -102 +130 @@
 FontPlatformData::~FontPlatformData()
 {
+    SkSafeUnref(m_typeface);
+
     ScriptFreeCache(&m_scriptCache);
     m_scriptCache = 0;

trunk/Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.h

@@ -36 +36 @@
 
 #include "FontOrientation.h"
+#include "SkTypeface.h"
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
@@ -46 +47 @@
 
 namespace WebCore {
+
+// Return a typeface associated with the hfont, and return its size and
+// lfQuality from the hfont's LOGFONT. The caller is now an owner of the
+// typeface.
+SkTypeface* CreateTypefaceFromHFont(HFONT, int* size, int* lfQuality);
 
 class FontDescription;
@@ -58 +64 @@
     FontPlatformData(WTF::HashTableDeletedValueType);
     FontPlatformData();
+    // This constructor takes ownership of the HFONT
     FontPlatformData(HFONT, float size);
     FontPlatformData(float size, bool bold, bool oblique);
@@ -70 +77 @@
     HFONT hfont() const { return m_font ? m_font->hfont() : 0; }
     float size() const { return m_size; }
+    SkTypeface* typeface() const { return m_typeface; }
+    int lfQuality() const { return m_lfQuality; }
 
     FontOrientation orientation() const { return Horizontal; } // FIXME: Implement.
@@ -75 +84 @@
 
     unsigned hash() const
-    { 
+    {
         return m_font ? m_font->hash() : NULL;
     }
@@ -130 +139 @@
     float m_size;  // Point size of the font in pixels.
 
+    SkTypeface* m_typeface; // cached from m_font
+    int m_lfQuality; // cached from m_font
+
     mutable SCRIPT_CACHE m_scriptCache;
     mutable SCRIPT_FONTPROPERTIES* m_scriptFontProperties;

trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp

@@ -33 +33 @@
 
 #include "AffineTransform.h"
+#include "Gradient.h"
+#include "Pattern.h"
 #include "PlatformContextSkia.h"
 #include "PlatformSupport.h"
-#include "Gradient.h"
-#include "Pattern.h"
+#include "SimpleFontData.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
@@ -42 +43 @@
 #include "SkShader.h"
 #include "SkTemplates.h"
-#include "SkTypeface_win.h"
 
 namespace WebCore {
@@ -180 +180 @@
 }
 
-static void setupPaintForFont(HFONT hfont, SkPaint* paint, PlatformContextSkia* pcs)
-{
-    //  FIXME:
-    //  Much of this logic could also happen in
-    //  FontCustomPlatformData::fontPlatformData and be cached,
-    //  allowing us to avoid talking to GDI at this point.
-    //
-    LOGFONT info;
-    GetObject(hfont, sizeof(info), &info);
-    int size = info.lfHeight;
-    if (size < 0)
-        size = -size; // We don't let GDI dpi-scale us (see SkFontHost_win.cpp).
-    paint->setTextSize(SkIntToScalar(size));
-
-    SkTypeface* face = SkCreateTypefaceFromLOGFONT(info);
+static void setupPaintForFont(SkPaint* paint, PlatformContextSkia* pcs,
+                              SkTypeface* face, float size, int quality)
+{
+    paint->setTextSize(SkFloatToScalar(size));
     paint->setTypeface(face);
-    SkSafeUnref(face);
-
-    // turn lfQuality into text flags
+
+    // turn quality into text flags
     uint32_t textFlags;
-    switch (info.lfQuality) {
+    switch (quality) {
     case NONANTIALIASED_QUALITY:
         textFlags = 0;
@@ -228 +216 @@
 }
 
-void paintSkiaText(GraphicsContext* context,
-                   HFONT hfont,
-                   int numGlyphs,
-                   const WORD* glyphs,
-                   const int* advances,
-                   const GOFFSET* offsets,
-                   const SkPoint* origin)
+static void paintSkiaText(GraphicsContext* context, HFONT hfont,
+                          SkTypeface* face, float size, int quality,
+                          int numGlyphs,
+                          const WORD* glyphs,
+                          const int* advances,
+                          const GOFFSET* offsets,
+                          const SkPoint* origin)
 {
     PlatformContextSkia* platformContext = context->platformContext();
@@ -247 +235 @@
     platformContext->setupPaintForFilling(&paint);
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-    setupPaintForFont(hfont, &paint, platformContext);
+    setupPaintForFont(&paint, platformContext, face, size, quality);
 
     bool didFill = false;
@@ -264 +252 @@
         platformContext->setupPaintForStroking(&paint, 0, 0);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-        setupPaintForFont(hfont, &paint, platformContext);
+        setupPaintForFont(&paint, platformContext, face, size, quality);
 
         if (didFill) {
@@ -283 +271 @@
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+void paintSkiaText(GraphicsContext* context,
+                   const FontPlatformData& data,
+                   int numGlyphs,
+                   const WORD* glyphs,
+                   const int* advances,
+                   const GOFFSET* offsets,
+                   const SkPoint* origin)
+{
+    paintSkiaText(context, data.hfont(), data.typeface(), data.size(), data.lfQuality(),
+                  numGlyphs, glyphs, advances, offsets, origin);
+}
+
+void paintSkiaText(GraphicsContext* context,
+                   HFONT hfont,
+                   int numGlyphs,
+                   const WORD* glyphs,
+                   const int* advances,
+                   const GOFFSET* offsets,
+                   const SkPoint* origin)
+{
+    int size;
+    int quality;
+    SkTypeface* face = CreateTypefaceFromHFont(hfont, &size, &quality);
+    SkAutoUnref aur(face);
+
+    paintSkiaText(context, hfont, face, size, quality, numGlyphs, glyphs, advances, offsets, origin);
+}
+
 }  // namespace WebCore

trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.h

@@ -39 +39 @@
 namespace WebCore {
 
+class FontPlatformData;
 class GraphicsContext;
 class PlatformContextSkia;
@@ -70 +71 @@
 #endif
 
-// Note that the offsets parameter is optional.  If not NULL it represents a
+// Note that the offsets parameter is optional. If not null it represents a
 // per glyph offset (such as returned by ScriptPlace Windows API function).
+void paintSkiaText(GraphicsContext*,
+                   const FontPlatformData&,
+                   int numGlyphs,
+                   const WORD* glyphs,
+                   const int* advances,
+                   const GOFFSET* offsets,
+                   const SkPoint* origin);
+
+// Note that the offsets parameter is optional. If not null it represents a
+// per glyph offset (such as returned by ScriptPlace Windows API function).
+// Note: this is less efficient than calling the version with FontPlatformData,
+// as that caches the SkTypeface object.
 void paintSkiaText(GraphicsContext*,
                    HFONT,