From: Russell Brenner <russellbrenner@google.com>
Date: Wed, 9 Nov 2011 23:23:16 +0000 (-0800)
Subject: Merge "Fix font size handling for harfbuzz hack" into ics-mr1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5d8f08b924be7ee27891cda15c51ed2b5e20753c;p=android-x86%2Fexternal-webkit.git

Merge "Fix font size handling for harfbuzz hack" into ics-mr1
---

5d8f08b924be7ee27891cda15c51ed2b5e20753c
diff --cc Source/WebCore/platform/graphics/android/FontAndroid.cpp
index 795111dd3,1e648732d..81dbdaeba
--- a/Source/WebCore/platform/graphics/android/FontAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
@@@ -504,18 -504,13 +506,15 @@@ private
  
  // Indexed using enum CustomScript
  const char* TextRunWalker::paths[] = {
 +    "/system/fonts/Lohit-Bengali.ttf",
      "/system/fonts/Lohit-Devanagari.ttf",
 -    "/system/fonts/DroidSansThai.ttf",
 -    "/system/fonts/DroidNaskh-Regular.ttf",
      "/system/fonts/DroidSansHebrew-Regular.ttf",
 -    "/system/fonts/DroidSansHebrew-Bold.ttf"
 +    "/system/fonts/DroidSansHebrew-Bold.ttf",
 +    "/system/fonts/DroidNaskh-Regular.ttf",
 +    "/system/fonts/Lohit-Tamil.ttf",
 +    "/system/fonts/DroidSansThai.ttf"
  };
  
- // Indexed using enum CustomScript
- const FontPlatformData* TextRunWalker::s_fallbackPlatformData[] = {};
- 
  TextRunWalker::TextRunWalker(const TextRun& run, unsigned startingX, const Font* font)
      : m_font(font)
      , m_startingX(startingX)