Changeset 88081 in webkit

Timestamp:

Jun 3, 2011 5:22:09 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-03 Cary Clark <​caryclark@google.com>

Reviewed by Eric Seidel.

Support FontCustomPlatformData on Skia-Mac-Chrome variant
​https://bugs.webkit.org/show_bug.cgi?id=62040

Canvas text is only recognized by Skia if it is registered
by creating a new SkTypeface. Skia uses CGFont to measure
and render the glyphs, then takes care of managing the glyph
cache.

Skia on Mac Chrome is not yet enabled, so this change
does not affect existing code, and requires no new tests.

• platform/graphics/mac/FontCustomPlatformData.cpp: (WebCore::RemoteFontStream::RemoteFontStream): (WebCore::RemoteFontStream::~RemoteFontStream): (WebCore::RemoteFontStream::rewind): (WebCore::RemoteFontStream::read): Turn the buffer into a stream. This is identical to the implementation in skia/FontCustomPlatformData.cpp. While that file could be modified instead of this one, it was simpler to add SkTypeface streaming to this instead of adding all CGFont support to the skia platform file.

(WebCore::FontCustomPlatformData::~FontCustomPlatformData):
Release the SkTypeface reference.

(WebCore::createFontCustomPlatformData):
Associate the buffer stream with a SkTypeface so Skia
can find the custom font data.

• platform/graphics/mac/FontCustomPlatformData.h: (WebCore::FontCustomPlatformData::FontCustomPlatformData): Add a slot to hold the SkTypeface.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/FontCustomPlatformData.cpp (modified) (3 diffs)
• platform/graphics/mac/FontCustomPlatformData.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-03  Cary Clark  <caryclark@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Support FontCustomPlatformData on Skia-Mac-Chrome variant
+        https://bugs.webkit.org/show_bug.cgi?id=62040
+
+        Canvas text is only recognized by Skia if it is registered
+        by creating a new SkTypeface. Skia uses CGFont to measure
+        and render the glyphs, then takes care of managing the glyph
+        cache.
+
+        Skia on Mac Chrome is not yet enabled, so this change
+        does not affect existing code, and requires no new tests.
+
+        * platform/graphics/mac/FontCustomPlatformData.cpp:
+        (WebCore::RemoteFontStream::RemoteFontStream):
+        (WebCore::RemoteFontStream::~RemoteFontStream):
+        (WebCore::RemoteFontStream::rewind):
+        (WebCore::RemoteFontStream::read):
+        Turn the buffer into a stream. This is identical to
+        the implementation in skia/FontCustomPlatformData.cpp.
+        While that file could be modified instead of this one,
+        it was simpler to add SkTypeface streaming to this instead
+        of adding all CGFont support to the skia platform file.
+
+        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
+        Release the SkTypeface reference.
+
+        (WebCore::createFontCustomPlatformData):
+        Associate the buffer stream with a SkTypeface so Skia
+        can find the custom font data.
+
+        * platform/graphics/mac/FontCustomPlatformData.h:
+        (WebCore::FontCustomPlatformData::FontCustomPlatformData):
+        Add a slot to hold the SkTypeface.
+
 2011-06-03  Steve Falkenburg  <sfalken@apple.com>
 

trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp

@@ -28 +28 @@
 #include <ApplicationServices/ApplicationServices.h>
 
+#if USE(SKIA_ON_MAC_CHROME)
+#include "SkStream.h"
+#include "SkTypeface.h"
+#endif
+
 namespace WebCore {
+
+#if USE(SKIA_ON_MAC_CHROME)
+class RemoteFontStream : public SkStream {
+public:
+    explicit RemoteFontStream(PassRefPtr<SharedBuffer> buffer)
+        : m_buffer(buffer)
+        , m_offset(0)
+    {
+    }
+
+    virtual ~RemoteFontStream()
+    {
+    }
+
+    virtual bool rewind()
+    {
+        m_offset = 0;
+        return true;
+    }
+
+    virtual size_t read(void* buffer, size_t size)
+    {
+        if (!buffer && !size) {
+            // This is request for the length of the stream.
+            return m_buffer->size();
+        }
+        // This is a request to read bytes or skip bytes (when buffer is 0).
+        if (!m_buffer->data() || !m_buffer->size())
+            return 0;
+        size_t left = m_buffer->size() - m_offset;
+        size_t bytesToConsume = std::min(left, size);
+        if (buffer)
+            std::memcpy(buffer, m_buffer->data() + m_offset, bytesToConsume);
+        m_offset += bytesToConsume;
+        return bytesToConsume;
+    }
+
+private:
+    RefPtr<SharedBuffer> m_buffer;
+    size_t m_offset;
+};
+#endif
 
 FontCustomPlatformData::~FontCustomPlatformData()
@@ -35 +82 @@
     if (m_atsContainer)
         ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault);
+#endif
+#if USE(SKIA_ON_MAC_CHROME)
+    SkSafeUnref(m_typeface);
 #endif
     CGFontRelease(m_cgFont);
@@ -110 +160 @@
 #endif // !defined(BUILDING_ON_LEOPARD)
 
-    return new FontCustomPlatformData(containerRef, cgFontRef.releaseRef());
+    FontCustomPlatformData* fontCustomPlatformData = new FontCustomPlatformData(containerRef, cgFontRef.releaseRef());
+#if USE(SKIA_ON_MAC_CHROME)
+    RemoteFontStream* stream = new RemoteFontStream(buffer);
+    fontCustomPlatformData->m_typeface = SkTypeface::CreateFromStream(stream);
+#endif
+    return fontCustomPlatformData;
 }
 

trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h

@@ -34 +34 @@
 typedef UInt32 ATSFontRef;
 
+#if USE(SKIA_ON_MAC_CHROME)
+struct SkTypeface;
+#endif
+
 namespace WebCore {
 
@@ -45 +49 @@
         : m_atsContainer(container)
         , m_cgFont(cgFont)
+#if USE(SKIA_ON_MAC_CHROME)
+        , m_typeface(0)
+#endif
     {
     }
@@ -56 +63 @@
     ATSFontContainerRef m_atsContainer;
     CGFontRef m_cgFont;
+#if USE(SKIA_ON_MAC_CHROME)
+    SkTypeface* m_typeface;
+#endif
 };