Changeset 166179 in webkit


Ignore:
Timestamp:
Mar 24, 2014 10:37:54 AM (10 years ago)
Author:
fred.wang@free.fr
Message:

Unreviewed, rolling out r166169.
​https://bugs.webkit.org/show_bug.cgi?id=130682

This patch broke tests on Apple Mavericks (Requested by fredw
on #webkit).

Reverted changeset:

"Operator stretching: expose a math data API"
​https://bugs.webkit.org/show_bug.cgi?id=130572
​http://trac.webkit.org/changeset/166169

Patch by Commit Queue <​commit-queue@webkit.org> on 2014-03-24

Location:
trunk/Source/WebCore
Files:
5 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r166169 r166179  
    19471947    platform/graphics/filters/SourceGraphic.cpp
    19481948    platform/graphics/filters/SpotLightSource.cpp
    1949 
    1950     platform/graphics/opentype/OpenTypeMathData.cpp
    19511949
    19521950    platform/graphics/texmap/TextureMapper.cpp

  • trunk/Source/WebCore/ChangeLog

    r166176 r166179  
     12014-03-24  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r166169.
     4        https://bugs.webkit.org/show_bug.cgi?id=130682
     5
     6        This patch broke tests on Apple Mavericks (Requested by fredw
     7        on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Operator stretching: expose a math data API"
     12        https://bugs.webkit.org/show_bug.cgi?id=130572
     13        http://trac.webkit.org/changeset/166169
     14
    1152014-03-24  Martin Hodovan  <mhodovan@inf.u-szeged.hu>
    216

  • trunk/Source/WebCore/GNUmakefile.list.am

    r166169 r166179  
    53625362        Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp \
    53635363        Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.h \
    5364         Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp \
    5365         Source/WebCore/platform/graphics/opentype/OpenTypeMathData.h \
    53665364        Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp \
    53675365        Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h \

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r166169 r166179  
    79467946    <ClCompile Include="..\platform\graphics\win\IntSizeWin.cpp" />
    79477947    <ClCompile Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.cpp" />
    7948     <ClCompile Include="..\platform\graphics\opentype\OpenTypeMathData.cpp" />
    79497948    <ClCompile Include="..\platform\graphics\opentype\OpenTypeUtilities.cpp" />
    79507949    <ClCompile Include="..\platform\graphics\opentype\OpenTypeVerticalData.cpp" />
    … …  
    1930719306    <ClInclude Include="..\platform\graphics\win\LocalWindowsContext.h" />
    1930819307    <CustomBuildStep Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.h" />
    19309     <ClInclude Include="..\platform\graphics\opentype\OpenTypeMathData.h" />
    1931019308    <ClInclude Include="..\platform\graphics\opentype\OpenTypeTypes.h" />
    1931119309    <ClInclude Include="..\platform\graphics\opentype\OpenTypeUtilities.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r166169 r166179  
    14771477      <Filter>platform\graphics\win</Filter>
    14781478    </ClCompile>
    1479     <ClCompile Include="..\platform\graphics\opentype\OpenTypeMathData.cpp">
    1480       <Filter>platform\graphics\win</Filter>
    1481     </ClCompile>
    14821479    <ClCompile Include="..\platform\graphics\opentype\OpenTypeUtilities.cpp">
    14831480      <Filter>platform\graphics\win</Filter>
    … …  
    84278424    </ClInclude>
    84288425    <ClInclude Include="..\platform\graphics\win\LocalWindowsContext.h">
    8429       <Filter>platform\graphics\win</Filter>
    8430     </ClInclude>
    8431     <ClInclude Include="..\platform\graphics\opentype\OpenTypeMathData.h">
    84328426      <Filter>platform\graphics\win</Filter>
    84338427    </ClInclude>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r166169 r166179  
    45944594                B2C3DA640D006CD600EF6F26 /* SimpleFontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */; };
    45954595                B2C3DA650D006CD600EF6F26 /* SimpleFontData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */; settings = {ATTRIBUTES = (Private, ); }; };
    4596                 B2D3DA640D006CD600EF6F27 /* OpenTypeMathData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */; };
    4597                 B2D3DA650D006CD600EF6F27 /* OpenTypeMathData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */; settings = {ATTRIBUTES = (Private, ); }; };
    45984596                B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA550D006CD600EF6F26 /* FontDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
    45994597                B2C3DA670D006CD600EF6F26 /* FontGlyphs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA560D006CD600EF6F26 /* FontGlyphs.cpp */; };
    … …  
    1184011838                B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleFontData.cpp; sourceTree = "<group>"; };
    1184111839                B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SimpleFontData.h; sourceTree = "<group>"; };
    11842                 B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = opentype/OpenTypeMathData.cpp; sourceTree = "<group>"; };
    11843                 B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = opentype/OpenTypeMathData.h; sourceTree = "<group>"; };
    1184411840                B2C3DA550D006CD600EF6F26 /* FontDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontDescription.h; sourceTree = "<group>"; };
    1184511841                B2C3DA560D006CD600EF6F26 /* FontGlyphs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontGlyphs.cpp; sourceTree = "<group>"; };
    … …  
    2012420120                                B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */,
    2012520121                                B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */,
    20126                                 B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */,
    20127                                 B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */,
    2012820122                                CD641EB21818F5ED00EE4C41 /* SourceBufferPrivate.h */,
    2012920123                                CDC61DA0180867D8004B913F /* SourceBufferPrivate.h */,
    … …  
    2546425458                                41D168EE10226E89009BC827 /* SharedWorkerThread.h in Headers */,
    2546525459                                B2C3DA650D006CD600EF6F26 /* SimpleFontData.h in Headers */,
    25466                                 B2D3DA650D006CD600EF6F27 /* OpenTypeMathData.h in Headers */,
    2546725460                                E48944A3180B57D800F165D8 /* SimpleLineLayout.h in Headers */,
    2546825461                                E4E9B11D1814569C003ACCDF /* SimpleLineLayoutFunctions.h in Headers */,
    … …  
    2882528818                                41D168ED10226E89009BC827 /* SharedWorkerThread.cpp in Sources */,
    2882628819                                B2C3DA640D006CD600EF6F26 /* SimpleFontData.cpp in Sources */,
    28827                                 B2D3DA640D006CD600EF6F27 /* OpenTypeMathData.cpp in Sources */,
    2882828820                                163E88F7118A39D200ED9231 /* SimpleFontDataCoreText.cpp in Sources */,
    2882928821                                37E65950163B10C200EB4574 /* SimpleFontDataIOS.mm in Sources */,

  • trunk/Source/WebCore/platform/graphics/FontCache.cpp

    r166169 r166179  
    3535#include "FontPlatformData.h"
    3636#include "FontSelector.h"
    37 #include "OpenTypeMathData.h"
    3837#include "WebKitFontFamilyNames.h"
    3938#include <wtf/HashMap.h>
    … …  
    268267}
    269268
    270 struct FontFileCacheKeyHash {
     269#if ENABLE(OPENTYPE_VERTICAL)
     270struct FontVerticalDataCacheKeyHash {
    271271    static unsigned hash(const FontCache::FontFileKey& fontFileKey)
    272272    {
    … …  
    282282};
    283283
    284 struct FontFileCacheKeyTraits : WTF::GenericHashTraits<FontCache::FontFileKey> {
     284struct FontVerticalDataCacheKeyTraits : WTF::GenericHashTraits<FontCache::FontFileKey> {
    285285    static const bool emptyValueIsZero = true;
    286286    static const bool needsDestruction = true;
    … …  
    300300};
    301301
    302 typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeMathData>, FontFileCacheKeyHash, FontFileCacheKeyTraits> FontMathDataCache;
    303 
    304 static FontMathDataCache& fontMathDataCacheInstance()
    305 {
    306     static NeverDestroyed<FontMathDataCache> fontMathDataCache;
    307     return fontMathDataCache;
    308 }
    309 
    310 PassRefPtr<OpenTypeMathData> FontCache::getMathData(const FontFileKey& key, const FontPlatformData& fontData)
    311 {
    312     FontMathDataCache& fontMathDataCache = fontMathDataCacheInstance();
    313     FontMathDataCache::iterator result = fontMathDataCache.find(key);
    314     if (result != fontMathDataCache.end())
    315         return result.get()->value;
    316 
    317     RefPtr<OpenTypeMathData> mathData = OpenTypeMathData::create(fontData);
    318     if (!mathData->hasMathData())
    319         mathData.clear();
    320     fontMathDataCache.set(key, mathData);
    321     return mathData;
    322 }
    323 
    324 #if ENABLE(OPENTYPE_VERTICAL)
    325 typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, FontFileCacheKeyHash, FontFileCacheKeyTraits> FontVerticalDataCache;
    326 
    327 static FontVerticalDataCache& fontVerticalDataCacheInstance()
     302typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, FontVerticalDataCacheKeyHash, FontVerticalDataCacheKeyTraits> FontVerticalDataCache;
     303
     304FontVerticalDataCache& fontVerticalDataCacheInstance()
    328305{
    329306    static NeverDestroyed<FontVerticalDataCache> fontVerticalDataCache;

  • trunk/Source/WebCore/platform/graphics/FontCache.h

    r166169 r166179  
    5555class FontData;
    5656class FontSelector;
    57 class OpenTypeMathData;
    5857class OpenTypeVerticalData;
    5958class SimpleFontData;
    … …  
    153152#endif
    154153
     154#if ENABLE(OPENTYPE_VERTICAL)
    155155    typedef AtomicString FontFileKey;
    156     PassRefPtr<OpenTypeMathData> getMathData(const FontFileKey&, const FontPlatformData&);
    157 #if ENABLE(OPENTYPE_VERTICAL)
    158156    PassRefPtr<OpenTypeVerticalData> getVerticalData(const FontFileKey&, const FontPlatformData&);
    159157#endif

  • trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp

    r166169 r166179  
    2727#include <wtf/text/StringHash.h>
    2828#include <wtf/text/WTFString.h>
    29 
    30 #if OS(DARWIN)
    31 #include "SharedBuffer.h"
    32 #include <CoreGraphics/CGFont.h>
    33 #endif
    3429
    3530namespace WebCore {
    … …  
    175170}
    176171
    177 #if OS(DARWIN)
    178 PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
    179 {
    180     if (CFDataRef data = CGFontCopyTableForTag(cgFont(), table))
    181         return SharedBuffer::wrapCFData(data);
    182    
    183     return nullptr;
    184172}
    185 #endif
    186 
    187 }

  • trunk/Source/WebCore/platform/graphics/FontPlatformData.h

    r166169 r166179  
    217217    }
    218218
    219 #if OS(DARWIN) || (PLATFORM(WIN) && (USE(CG) || USE(CAIRO)))
     219#if PLATFORM(WIN) && (USE(CG) || USE(CAIRO))
    220220    PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
    221221#endif

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp

    r166169 r166179  
    3333#include "Font.h"
    3434#include "FontCache.h"
    35 #include "OpenTypeMathData.h"
    3635#include <wtf/MathExtras.h>
    3736
    … …  
    5453    , m_isTextOrientationFallback(isTextOrientationFallback)
    5554    , m_isBrokenIdeographFallback(false)
    56     , m_mathData(nullptr)
    5755#if ENABLE(OPENTYPE_VERTICAL)
    5856    , m_verticalData(0)
    … …  
    6361    platformGlyphInit();
    6462    platformCharWidthInit();
    65     m_mathData = fontCache()->getMathData(String::number(platformData.hash()), platformData);
    6663#if ENABLE(OPENTYPE_VERTICAL)
    6764    if (platformData.orientation() == Vertical && !isTextOrientationFallback) {
    … …  
    8077    , m_isTextOrientationFallback(false)
    8178    , m_isBrokenIdeographFallback(false)
    82     , m_mathData(nullptr)
    8379#if ENABLE(OPENTYPE_VERTICAL)
    8480    , m_verticalData(0)

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.h

    r166169 r166179  
    3333#include "GlyphMetricsMap.h"
    3434#include "GlyphPageTreeNode.h"
    35 #include "OpenTypeMathData.h"
    3635#if ENABLE(OPENTYPE_VERTICAL)
    3736#include "OpenTypeVerticalData.h"
    … …  
    9493
    9594    const FontPlatformData& platformData() const { return m_platformData; }
    96     const OpenTypeMathData* mathData() const { return m_mathData.get(); }
    9795#if ENABLE(OPENTYPE_VERTICAL)
    9896    const OpenTypeVerticalData* verticalData() const { return m_verticalData.get(); }
    … …  
    262260    bool m_isTextOrientationFallback;
    263261    bool m_isBrokenIdeographFallback;
    264     RefPtr<OpenTypeMathData> m_mathData;
    265262#if ENABLE(OPENTYPE_VERTICAL)
    266263    RefPtr<OpenTypeVerticalData> m_verticalData;
Note: See TracChangeset for help on using the changeset viewer.