Changeset 47975 in webkit

Timestamp:

Sep 2, 2009 9:37:52 AM (15 years ago)

Author:

yong.li@torchmobile.com

Message:

2009-09-02 Yong Li <​yong.li@torchmobile.com>

Reviewed by Adam Barth.

WINCE PORT: use shared buffer for custom font data
​https://bugs.webkit.org/show_bug.cgi?id=27734

Refactored by Joe Mason <​joe.mason@torchmobile.com>

• loader/CachedFont.cpp: add WINCE to platforms using cached custom data
• platform/graphics/opentype/OpenTypeUtilities.cpp: (WebCore::renameFont): implement for WinCE
• platform/graphics/opentype/OpenTypeUtilities.h: build fixes
• platform/graphics/wince/FontCustomPlatformData.cpp: (WebCore::setCustomFontCache): add accessor (WebCore::createFontCustomPlatformData): change param to SharedBuffer
• platform/graphics/wince/FontCustomPlatformData.h: update function signatures

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/opentype/OpenTypeUtilities.cpp (modified) (5 diffs)
• platform/graphics/opentype/OpenTypeUtilities.h (modified) (2 diffs)
• platform/graphics/wince/FontCustomPlatformData.cpp (modified) (2 diffs)
• platform/graphics/wince/FontCustomPlatformData.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-02 Yong Li <yong.li@torchmobile.com>
+
+        Reviewed by Adam Barth.
+
+        WINCE PORT: use shared buffer for custom font data
+        https://bugs.webkit.org/show_bug.cgi?id=27734
+
+        Refactored by Joe Mason <joe.mason@torchmobile.com>
+
+        * loader/CachedFont.cpp:
+        add WINCE to platforms using cached custom data
+        * platform/graphics/opentype/OpenTypeUtilities.cpp:
+        (WebCore::renameFont): implement for WinCE
+        * platform/graphics/opentype/OpenTypeUtilities.h:
+        build fixes
+        * platform/graphics/wince/FontCustomPlatformData.cpp:
+        (WebCore::setCustomFontCache): add accessor
+        (WebCore::createFontCustomPlatformData): change param to SharedBuffer
+        * platform/graphics/wince/FontCustomPlatformData.h:
+        update function signatures 
+ 
 2009-09-02 Yong Li <yong.li@torchmobile.com>
 

trunk/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2008, 2009 Apple Inc.  All rights reserved.
+ * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -340 +341 @@
 }
 
-HANDLE renameAndActivateFont(SharedBuffer* fontData, const String& fontName)
+// code shared by renameFont and renameAndActivateFont
+// adds fontName to the font table in fontData, and writes the new font table to rewrittenFontTable
+// returns the size of the name table (which is used by renameAndActivateFont), or 0 on early abort
+static size_t renameFontInternal(SharedBuffer* fontData, const String& fontName, Vector<char> &rewrittenFontData)
 {
     size_t originalDataSize = fontData->size();
@@ -358 +362 @@
     size_t nameTableSize = ((offsetof(nameTable, nameRecords) + nameRecordCount * sizeof(nameRecord) + fontName.length() * sizeof(UChar)) & ~3) + 4;
 
-    Vector<char> rewrittenFontData(fontData->size() + nameTableSize);
+    rewrittenFontData.resize(fontData->size() + nameTableSize);
     char* data = rewrittenFontData.data();
     memcpy(data, fontData->data(), originalDataSize);
@@ -395 +399 @@
         rewrittenSfnt->tables[t].checkSum = rewrittenSfnt->tables[t].checkSum + reinterpret_cast<BigEndianULong*>(name)[i];
 
+    return nameTableSize;
+}
+
+#if PLATFORM(WINCE)
+// AddFontMemResourceEx does not exist on WinCE, so we must handle the font data manually
+// This function just renames the font and overwrites the old font data with the new
+bool renameFont(SharedBuffer* fontData, const String& fontName)
+{
+    // abort if the data is too small to be a font header with a "tables" entry
+    if (fontData->size() < offsetof(sfntHeader, tables))
+        return false;
+
+    // abort if the data is too small to hold all the tables specified in the header
+    const sfntHeader* header = reinterpret_cast<const sfntHeader*>(fontData->data());
+    if (fontData->size() < offsetof(sfntHeader, tables) + header->numTables * sizeof(TableDirectoryEntry))
+        return false;
+
+    Vector<char> rewrittenFontData;
+    if (!renameFontInternal(fontData, fontName, rewrittenFontData))
+        return false;
+
+    fontData->clear();
+    fontData->append(rewrittenFontData.data(), rewrittenFontData.size());
+    return true;
+}
+#else
+// Rename the font and install the new font data into the system
+HANDLE renameAndActivateFont(SharedBuffer* fontData, const String& fontName)
+{
+    Vector<char> rewrittenFontData;
+    size_t nameTableSize = renameFontInternal(fontData, fontName, rewrittenFontData);
+    if (!nameTableSize)
+        return 0;
+
     DWORD numFonts = 0;
-    HANDLE fontHandle = AddFontMemResourceEx(data, originalDataSize + nameTableSize, 0, &numFonts);
+    HANDLE fontHandle = AddFontMemResourceEx(rewrittenFontData.data(), fontData->size() + nameTableSize, 0, &numFonts);
 
     if (fontHandle && numFonts != 1) {
@@ -405 +443 @@
     return fontHandle;
 }
-
-}
+#endif
+
+}

trunk/WebCore/platform/graphics/opentype/OpenTypeUtilities.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2008, 2009 Apple Inc.  All rights reserved.
+ * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36 +37 @@
 class SharedBuffer;
 
+#if PLATFORM(WINCE)
+typedef unsigned __int8 UInt8;
+#endif
+
 struct EOTHeader {
     EOTHeader();

trunk/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp

@@ -34 +34 @@
 bool renameFont(SharedBuffer* fontData, const String& fontName);
 
+void setCustomFontCache(CustomFontCache* cache)
+{
+    g_customFontCache = cache;
+}
+
 FontCustomPlatformData::~FontCustomPlatformData()
 {
@@ -67 +72 @@
 }
 
-FontCustomPlatformData* createFontCustomPlatformData(CachedFont* cachedFont)
+FontCustomPlatformData* createFontCustomPlatformData(const SharedBuffer* buffer)
 {
-    if (g_customFontCache && cachedFont->CachedResource::data()) {
+    if (g_customFontCache) {
         String fontName = createUniqueFontName();
-        if (renameFont(cachedFont->CachedResource::data(), fontName) && g_customFontCache->registerFont(fontName, cachedFont))
+        RefPtr<SharedBuffer> localBuffer = SharedBuffer::create(buffer->data(), buffer->size());
+        if (renameFont(localBuffer.get(), fontName) && g_customFontCache->registerFont(fontName, localBuffer.get()))
             return new FontCustomPlatformData(fontName);
     }

trunk/WebCore/platform/graphics/wince/FontCustomPlatformData.h

@@ -33 +33 @@
     class CustomFontCache {
     public:
-        virtual bool registerFont(const String& fontName, CachedFont*) = 0;
+        virtual bool registerFont(const String& fontName, const SharedBuffer*) = 0;
         virtual void unregisterFont(const String& fontName) = 0;
     };
@@ -49 +49 @@
     };
 
-    FontCustomPlatformData* createFontCustomPlatformData(CachedFont*);
-
+    FontCustomPlatformData* createFontCustomPlatformData(const SharedBuffer*);
+    void setCustomFontCache(CustomFontCache*);
 }