Move SimpleFontDataSkia.cpp to Source/WebCore/platform/graphics/skia
authorbashi@chromium.org <bashi@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Jan 2012 00:27:48 +0000 (00:27 +0000)
committerbashi@chromium.org <bashi@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Jan 2012 00:27:48 +0000 (00:27 +0000)
https://bugs.webkit.org/show_bug.cgi?id=76155

Reviewed by Tony Chang.

No new tests. No behavior change.

* PlatformBlackBerry.cmake:
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* platform/graphics/skia/SimpleFontDataSkia.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/SimpleFontDataSkia.cpp.
(WebCore::SimpleFontData::platformInit):
(WebCore::SimpleFontData::platformCharWidthInit):
(WebCore::SimpleFontData::platformDestroy):
(WebCore::SimpleFontData::createScaledFontData):
(WebCore::SimpleFontData::smallCapsFontData):
(WebCore::SimpleFontData::emphasisMarkFontData):
(WebCore::SimpleFontData::containsCharacters):
(WebCore::SimpleFontData::determinePitch):
(WebCore::SimpleFontData::platformBoundsForGlyph):
(WebCore::SimpleFontData::platformWidthForGlyph):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@104876 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PlatformBlackBerry.cmake
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gypi
Source/WebCore/platform/graphics/skia/SimpleFontDataSkia.cpp [moved from Source/WebCore/platform/graphics/harfbuzz/SimpleFontDataSkia.cpp with 100% similarity]

index bd7e646ac5722be6cd7665e983e9f8230b50f4ae..ffbeb347454c9e42bd33413a0548c44141e84806 100644 (file)
@@ -1,3 +1,27 @@
+2012-01-12  Kenichi Ishibashi  <bashi@chromium.org>
+
+        Move SimpleFontDataSkia.cpp to Source/WebCore/platform/graphics/skia
+        https://bugs.webkit.org/show_bug.cgi?id=76155
+
+        Reviewed by Tony Chang.
+
+        No new tests. No behavior change.
+
+        * PlatformBlackBerry.cmake:
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * platform/graphics/skia/SimpleFontDataSkia.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/SimpleFontDataSkia.cpp.
+        (WebCore::SimpleFontData::platformInit):
+        (WebCore::SimpleFontData::platformCharWidthInit):
+        (WebCore::SimpleFontData::platformDestroy):
+        (WebCore::SimpleFontData::createScaledFontData):
+        (WebCore::SimpleFontData::smallCapsFontData):
+        (WebCore::SimpleFontData::emphasisMarkFontData):
+        (WebCore::SimpleFontData::containsCharacters):
+        (WebCore::SimpleFontData::determinePitch):
+        (WebCore::SimpleFontData::platformBoundsForGlyph):
+        (WebCore::SimpleFontData::platformWidthForGlyph):
+
 2012-01-12  Benjamin Poulain  <bpoulain@apple.com>
 
         A Frame with frame flattening can be stuck in a state in which performPostLayoutTasks() is never executed
index 68cd3ccc40a94a2564410f16f6477069bb98ffc5..cec781a42bc74e60fa8194ee6a10dbc96acd75ed 100644 (file)
@@ -46,9 +46,9 @@ LIST(APPEND WebCore_SOURCES
     platform/graphics/harfbuzz/FontHarfBuzz.cpp
     platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp
     platform/graphics/harfbuzz/HarfBuzzSkia.cpp
-    platform/graphics/harfbuzz/SimpleFontDataHarfBuzz.cpp
     platform/graphics/skia/FontCacheSkia.cpp
     platform/graphics/skia/GlyphPageTreeNodeSkia.cpp
+    platform/graphics/skia/SimpleFontDataSkia.cpp
 )
 
 # Other sources
index 5d2b95c7831f081e60453635a97179fd8812b8a3..7497cb8fbc0b64b25c9238a3f541406c510b827e 100644 (file)
             ['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'],
             ['include', 'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz\\.cpp$'],
             ['include', 'platform/graphics/harfbuzz/HarfBuzzSkia\\.cpp$'],
-            ['include', 'platform/graphics/harfbuzz/SimpleFontDataSkia\\.cpp$'],
+            ['include', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
           ],
         }, { # use_x11==0
           'sources/': [
             ['exclude', 'platform/graphics/mac/FontMac\\.mm$'],
             ['exclude', 'platform/graphics/skia/FontCacheSkia\\.cpp$'],
             ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
+            ['exclude', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
             ['exclude', 'platform/chromium/DragImageChromiumMac\\.cpp$'],
           ],
         }],
             # platform/graphics/chromium, included by regex above, instead.
             ['exclude', 'platform/graphics/skia/FontCacheSkia\\.cpp$'],
             ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
+            ['exclude', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
 
             # SystemInfo.cpp is useful and we don't want to copy it.
             ['include', 'platform/win/SystemInfo\\.cpp$'],
             ['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'],
             ['include', 'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz\\.cpp$'],
             ['include', 'platform/graphics/harfbuzz/HarfBuzzSkia\\.cpp$'],
-            ['include', 'platform/graphics/harfbuzz/SimpleFontDataSkia\\.cpp$'],
+            ['include', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
           ],
         }, { # OS!="android"
           'sources/': [
index c7d0fc7f6d18c49d6014085541feef1884abcf3d..238a5ba61addc5de9b236d1761671889e9dabf04 100644 (file)
             'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h',
             'platform/graphics/harfbuzz/HarfBuzzSkia.cpp',
             'platform/graphics/harfbuzz/HarfBuzzSkia.h',
-            'platform/graphics/harfbuzz/SimpleFontDataSkia.cpp',
             'platform/graphics/mac/ColorMac.mm',
             'platform/graphics/mac/ComplexTextController.cpp',
             'platform/graphics/mac/ComplexTextController.h',
             'platform/graphics/skia/PlatformContextSkia.cpp',
             'platform/graphics/skia/PlatformContextSkia.h',
             'platform/graphics/skia/PlatformGraphics.h',
+            'platform/graphics/skia/SimpleFontDataSkia.cpp',
             'platform/graphics/skia/SkiaFontWin.cpp',
             'platform/graphics/skia/SkiaFontWin.h',
             'platform/graphics/skia/SkiaUtils.cpp',