Changeset 47974 in webkit

Timestamp:

Sep 2, 2009 9:32:55 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: font-related build fixes and minor bugfixes
​https://bugs.webkit.org/show_bug.cgi?id=27734

• platform/graphics/FontCache.h: declare functions added in ​https://bugs.webkit.org/show_bug.cgi?id=27509
• platform/graphics/GlyphPageTreeNode.cpp: (WebCore::GlyphPageTreeNode::initializePage): fix ambiguous overload error in min/max on Windows
• platform/graphics/SimpleFontData.cpp: (WebCore::SimpleFontData::SimpleFontData): initialize member vars
• platform/graphics/SimpleFontData.h: disable unused members on Wince to save space

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCache.h (modified) (2 diffs)
• platform/graphics/GlyphPageTreeNode.cpp (modified) (1 diff)
• platform/graphics/SimpleFontData.cpp (modified) (1 diff)
• platform/graphics/SimpleFontData.h (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-02 Yong Li <yong.li@torchmobile.com>
+
+        Reviewed by Adam Barth.
+
+        WINCE PORT: font-related build fixes and minor bugfixes
+        https://bugs.webkit.org/show_bug.cgi?id=27734
+
+        * platform/graphics/FontCache.h: declare functions added in https://bugs.webkit.org/show_bug.cgi?id=27509
+        * platform/graphics/GlyphPageTreeNode.cpp:
+        (WebCore::GlyphPageTreeNode::initializePage): fix ambiguous overload error in min/max on Windows
+        * platform/graphics/SimpleFontData.cpp:
+        (WebCore::SimpleFontData::SimpleFontData): initialize member vars
+        * platform/graphics/SimpleFontData.h: disable unused members on Wince to save space 
+
 2009-09-02  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/platform/graphics/FontCache.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2006, 2008 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64 +65 @@
     void platformInit();
 
-#if PLATFORM(WIN)
+#if PLATFORM(WINCE)
+#if defined(IMLANG_FONT_LINK) && (IMLANG_FONT_LINK == 2)
+    IMLangFontLink2* getFontLinkInterface();
+#else
+    IMLangFontLink* getFontLinkInterface();
+#endif
+    static void comInitialize();
+    static void comUninitialize();
+#elif PLATFORM(WIN)
     IMLangFontLink2* getFontLinkInterface();
 #endif

trunk/WebCore/platform/graphics/GlyphPageTreeNode.cpp

@@ -203 +203 @@
                 for (unsigned i = 0; i < numRanges; i++) {
                     const FontDataRange& range = segmentedFontData->rangeAt(i);
-                    int from = max(0, range.from() - static_cast<int>(start));
-                    int to = 1 + min(range.to() - static_cast<int>(start), static_cast<int>(GlyphPage::size) - 1);
+                    // all this casting is to ensure all the parameters to min and max have the same type,
+                    // to avoid ambiguous template parameter errors on Windows
+                    int from = max(0, static_cast<int>(range.from()) - static_cast<int>(start));
+                    int to = 1 + min(static_cast<int>(range.to()) - static_cast<int>(start), static_cast<int>(GlyphPage::size) - 1);
                     if (from < static_cast<int>(GlyphPage::size) && to > 0) {
                         if (haveGlyphs && !scratchPage) {

trunk/WebCore/platform/graphics/SimpleFontData.cpp

@@ -58 +58 @@
     , m_isLoading(loading)
     , m_smallCapsFontData(0)
+    , m_avgCharWidth(-1)
+    , m_maxCharWidth(-1)
 {
 #if !ENABLE(SVG_FONTS)

trunk/WebCore/platform/graphics/SimpleFontData.h

@@ -3 +3 @@
  *
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -34 +35 @@
 #endif
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && !PLATFORM(WINCE)
 #include <usp10.h>
 #endif
@@ -139 +140 @@
 #if PLATFORM(WIN)
     bool isSystemFont() const { return m_isSystemFont; }
+#if !PLATFORM(WINCE)    // disable unused members to save space
     SCRIPT_FONTPROPERTIES* scriptFontProperties() const;
     SCRIPT_CACHE* scriptCache() const { return &m_scriptCache; }
-
+#endif
     static void setShouldApplyMacAscentHack(bool);
     static bool shouldApplyMacAscentHack();
@@ -160 +162 @@
     void commonInit();
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && !PLATFORM(WINCE)
     void initGDIFont();
     void platformCommonDestroy();
@@ -225 +227 @@
 #if PLATFORM(WIN)
     bool m_isSystemFont;
+#if !PLATFORM(WINCE)    // disable unused members to save space
     mutable SCRIPT_CACHE m_scriptCache;
     mutable SCRIPT_FONTPROPERTIES* m_scriptFontProperties;
+#endif
 #endif
 };