Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (166380 => 166381)
--- trunk/Source/WebCore/CMakeLists.txt 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-03-27 23:23:37 UTC (rev 166381)
@@ -1949,8 +1949,6 @@
platform/graphics/filters/SourceGraphic.cpp
platform/graphics/filters/SpotLightSource.cpp
- platform/graphics/opentype/OpenTypeMathData.cpp
-
platform/graphics/texmap/TextureMapper.cpp
platform/graphics/texmap/TextureMapperBackingStore.cpp
platform/graphics/texmap/TextureMapperFPSCounter.cpp
Modified: trunk/Source/WebCore/ChangeLog (166380 => 166381)
--- trunk/Source/WebCore/ChangeLog 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/ChangeLog 2014-03-27 23:23:37 UTC (rev 166381)
@@ -1,3 +1,16 @@
+2014-03-27 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r166364.
+ https://bugs.webkit.org/show_bug.cgi?id=130872
+
+ Caused a test assertion (Requested by smfr 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/166364
+
2014-03-27 Benjamin Poulain <bpoul...@apple.com>
[iOS][WK2] Compute a good exposed rect when scaling WKContentView
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (166380 => 166381)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-27 23:23:37 UTC (rev 166381)
@@ -7949,7 +7949,6 @@
<ClCompile Include="..\platform\graphics\win\IntRectWin.cpp" />
<ClCompile Include="..\platform\graphics\win\IntSizeWin.cpp" />
<ClCompile Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.cpp" />
- <ClCompile Include="..\platform\graphics\opentype\OpenTypeMathData.cpp" />
<ClCompile Include="..\platform\graphics\opentype\OpenTypeUtilities.cpp" />
<ClCompile Include="..\platform\graphics\opentype\OpenTypeVerticalData.cpp" />
<ClCompile Include="..\platform\graphics\win\SimpleFontDataCairoWin.cpp">
@@ -19373,7 +19372,6 @@
<ClInclude Include="..\platform\graphics\win\FullScreenControllerClient.h" />
<ClInclude Include="..\platform\graphics\win\LocalWindowsContext.h" />
<CustomBuildStep Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.h" />
- <ClInclude Include="..\platform\graphics\opentype\OpenTypeMathData.h" />
<ClInclude Include="..\platform\graphics\opentype\OpenTypeTypes.h" />
<ClInclude Include="..\platform\graphics\opentype\OpenTypeUtilities.h" />
<ClInclude Include="..\platform\graphics\opentype\OpenTypeVerticalData.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (166380 => 166381)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-03-27 23:23:37 UTC (rev 166381)
@@ -1476,9 +1476,6 @@
<ClCompile Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.cpp">
<Filter>platform\graphics\win</Filter>
</ClCompile>
- <ClCompile Include="..\platform\graphics\opentype\OpenTypeMathData.cpp">
- <Filter>platform\graphics\win</Filter>
- </ClCompile>
<ClCompile Include="..\platform\graphics\opentype\OpenTypeUtilities.cpp">
<Filter>platform\graphics\win</Filter>
</ClCompile>
@@ -8434,9 +8431,6 @@
<ClInclude Include="..\platform\graphics\win\LocalWindowsContext.h">
<Filter>platform\graphics\win</Filter>
</ClInclude>
- <ClInclude Include="..\platform\graphics\opentype\OpenTypeMathData.h">
- <Filter>platform\graphics\win</Filter>
- </ClInclude>
<ClInclude Include="..\platform\graphics\opentype\OpenTypeTypes.h">
<Filter>platform\graphics\win</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (166380 => 166381)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-27 23:23:37 UTC (rev 166381)
@@ -4593,8 +4593,6 @@
B2C3DA630D006CD600EF6F26 /* FontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA520D006CD600EF6F26 /* FontCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
B2C3DA640D006CD600EF6F26 /* SimpleFontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */; };
B2C3DA650D006CD600EF6F26 /* SimpleFontData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */; settings = {ATTRIBUTES = (Private, ); }; };
- B2D3DA640D006CD600EF6F27 /* OpenTypeMathData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */; };
- B2D3DA650D006CD600EF6F27 /* OpenTypeMathData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */; settings = {ATTRIBUTES = (Private, ); }; };
B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA550D006CD600EF6F26 /* FontDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
B2C3DA670D006CD600EF6F26 /* FontGlyphs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA560D006CD600EF6F26 /* FontGlyphs.cpp */; };
B2C3DA680D006CD600EF6F26 /* FontGlyphs.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA570D006CD600EF6F26 /* FontGlyphs.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -11843,8 +11841,6 @@
B2C3DA520D006CD600EF6F26 /* FontCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontCache.h; sourceTree = "<group>"; };
B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleFontData.cpp; sourceTree = "<group>"; };
B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SimpleFontData.h; sourceTree = "<group>"; };
- B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = opentype/OpenTypeMathData.cpp; sourceTree = "<group>"; };
- B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = opentype/OpenTypeMathData.h; sourceTree = "<group>"; };
B2C3DA550D006CD600EF6F26 /* FontDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontDescription.h; sourceTree = "<group>"; };
B2C3DA560D006CD600EF6F26 /* FontGlyphs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontGlyphs.cpp; sourceTree = "<group>"; };
B2C3DA570D006CD600EF6F26 /* FontGlyphs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontGlyphs.h; sourceTree = "<group>"; };
@@ -20133,8 +20129,6 @@
0F3DD44E12F5EA1B000D9190 /* ShadowBlur.h */,
B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */,
B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */,
- B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */,
- B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */,
CD641EB21818F5ED00EE4C41 /* SourceBufferPrivate.h */,
CDC61DA0180867D8004B913F /* SourceBufferPrivate.h */,
CDC8B5AC1804AE5D0016E685 /* SourceBufferPrivateClient.h */,
@@ -25475,7 +25469,6 @@
E1B7839C163740A70007B692 /* SharedWorkerStrategy.h in Headers */,
41D168EE10226E89009BC827 /* SharedWorkerThread.h in Headers */,
B2C3DA650D006CD600EF6F26 /* SimpleFontData.h in Headers */,
- B2D3DA650D006CD600EF6F27 /* OpenTypeMathData.h in Headers */,
E48944A3180B57D800F165D8 /* SimpleLineLayout.h in Headers */,
E4E9B11D1814569C003ACCDF /* SimpleLineLayoutFunctions.h in Headers */,
E4E9B1191810916F003ACCDF /* SimpleLineLayoutResolver.h in Headers */,
@@ -28839,7 +28832,6 @@
E1B784201639CBBE0007B692 /* SharedWorkerRepository.cpp in Sources */,
41D168ED10226E89009BC827 /* SharedWorkerThread.cpp in Sources */,
B2C3DA640D006CD600EF6F26 /* SimpleFontData.cpp in Sources */,
- B2D3DA640D006CD600EF6F27 /* OpenTypeMathData.cpp in Sources */,
163E88F7118A39D200ED9231 /* SimpleFontDataCoreText.cpp in Sources */,
37E65950163B10C200EB4574 /* SimpleFontDataIOS.mm in Sources */,
B2AFFC7F0D00A5C10030074D /* SimpleFontDataMac.mm in Sources */,
Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (166380 => 166381)
--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2014-03-27 23:23:37 UTC (rev 166381)
@@ -34,7 +34,6 @@
#include "FontGlyphs.h"
#include "FontPlatformData.h"
#include "FontSelector.h"
-#include "OpenTypeMathData.h"
#include "WebKitFontFamilyNames.h"
#include <wtf/HashMap.h>
#include <wtf/ListHashSet.h>
@@ -267,7 +266,8 @@
return it->value.get();
}
-struct FontFileCacheKeyHash {
+#if ENABLE(OPENTYPE_VERTICAL)
+struct FontVerticalDataCacheKeyHash {
static unsigned hash(const FontCache::FontFileKey& fontFileKey)
{
return PtrHash<const FontCache::FontFileKey*>::hash(&fontFileKey);
@@ -281,7 +281,7 @@
static const bool safeToCompareToEmptyOrDeleted = true;
};
-struct FontFileCacheKeyTraits : WTF::GenericHashTraits<FontCache::FontFileKey> {
+struct FontVerticalDataCacheKeyTraits : WTF::GenericHashTraits<FontCache::FontFileKey> {
static const bool emptyValueIsZero = true;
static const bool needsDestruction = true;
static const FontCache::FontFileKey& emptyValue()
@@ -299,33 +299,10 @@
}
};
-typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeMathData>, FontFileCacheKeyHash, FontFileCacheKeyTraits> FontMathDataCache;
+typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, FontVerticalDataCacheKeyHash, FontVerticalDataCacheKeyTraits> FontVerticalDataCache;
-static FontMathDataCache& fontMathDataCacheInstance()
+FontVerticalDataCache& fontVerticalDataCacheInstance()
{
- static NeverDestroyed<FontMathDataCache> fontMathDataCache;
- return fontMathDataCache;
-}
-
-PassRefPtr<OpenTypeMathData> FontCache::getMathData(const FontFileKey& key, const FontPlatformData& fontData)
-{
- FontMathDataCache& fontMathDataCache = fontMathDataCacheInstance();
- FontMathDataCache::iterator result = fontMathDataCache.find(key);
- if (result != fontMathDataCache.end())
- return result.get()->value;
-
- RefPtr<OpenTypeMathData> mathData = OpenTypeMathData::create(fontData);
- if (!mathData->hasMathData())
- mathData.clear();
- fontMathDataCache.set(key, mathData);
- return mathData;
-}
-
-#if ENABLE(OPENTYPE_VERTICAL)
-typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, FontFileCacheKeyHash, FontFileCacheKeyTraits> FontVerticalDataCache;
-
-static FontVerticalDataCache& fontVerticalDataCacheInstance()
-{
static NeverDestroyed<FontVerticalDataCache> fontVerticalDataCache;
return fontVerticalDataCache;
}
Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (166380 => 166381)
--- trunk/Source/WebCore/platform/graphics/FontCache.h 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2014-03-27 23:23:37 UTC (rev 166381)
@@ -54,7 +54,6 @@
class FontPlatformData;
class FontData;
class FontSelector;
-class OpenTypeMathData;
class OpenTypeVerticalData;
class SimpleFontData;
@@ -152,9 +151,8 @@
PassRefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT&, AtomicString& outFontFamilyName);
#endif
- typedef AtomicString FontFileKey;
- PassRefPtr<OpenTypeMathData> getMathData(const FontFileKey&, const FontPlatformData&);
#if ENABLE(OPENTYPE_VERTICAL)
+ typedef AtomicString FontFileKey;
PassRefPtr<OpenTypeVerticalData> getVerticalData(const FontFileKey&, const FontPlatformData&);
#endif
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp (166380 => 166381)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2014-03-27 23:23:37 UTC (rev 166381)
@@ -27,11 +27,6 @@
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
-#if OS(DARWIN) && USE(CG)
-#include "SharedBuffer.h"
-#include <CoreGraphics/CGFont.h>
-#endif
-
namespace WebCore {
FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
@@ -174,14 +169,4 @@
return platformDataAssign(other);
}
-#if OS(DARWIN) && USE(CG)
-PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
-{
- if (CFDataRef data = "" table))
- return SharedBuffer::wrapCFData(data);
-
- return nullptr;
}
-#endif
-
-}
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (166380 => 166381)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-03-27 23:23:37 UTC (rev 166381)
@@ -216,7 +216,7 @@
#endif
}
-#if (OS(DARWIN) && USE(CG)) || (PLATFORM(WIN) && (USE(CG) || USE(CAIRO)))
+#if PLATFORM(WIN) && (USE(CG) || USE(CAIRO))
PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp (166380 => 166381)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2014-03-27 23:23:37 UTC (rev 166381)
@@ -32,7 +32,6 @@
#include "Font.h"
#include "FontCache.h"
-#include "OpenTypeMathData.h"
#include <wtf/MathExtras.h>
#if ENABLE(OPENTYPE_VERTICAL)
@@ -53,7 +52,6 @@
, m_isLoading(isLoading)
, m_isTextOrientationFallback(isTextOrientationFallback)
, m_isBrokenIdeographFallback(false)
- , m_mathData(nullptr)
#if ENABLE(OPENTYPE_VERTICAL)
, m_verticalData(0)
#endif
@@ -62,18 +60,6 @@
platformInit();
platformGlyphInit();
platformCharWidthInit();
-
- bool tryMathData = false;
-#if PLATFORM(WIN) && (USE(CG) || USE(CAIRO))
- tryMathData = platformData.hfont();
-#elif OS(DARWIN) && USE(CG)
- tryMathData = platformData.font();
-#elif USE(FREETYPE)
- tryMathData = platformData.hash();
-#endif
- if (tryMathData)
- m_mathData = fontCache()->getMathData(String::number(platformData.hash()), platformData);
-
#if ENABLE(OPENTYPE_VERTICAL)
if (platformData.orientation() == Vertical && !isTextOrientationFallback) {
m_verticalData = platformData.verticalData();
@@ -90,7 +76,6 @@
, m_isLoading(false)
, m_isTextOrientationFallback(false)
, m_isBrokenIdeographFallback(false)
- , m_mathData(nullptr)
#if ENABLE(OPENTYPE_VERTICAL)
, m_verticalData(0)
#endif
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (166380 => 166381)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-03-27 23:23:37 UTC (rev 166381)
@@ -32,7 +32,6 @@
#include "GlyphBuffer.h"
#include "GlyphMetricsMap.h"
#include "GlyphPageTreeNode.h"
-#include "OpenTypeMathData.h"
#if ENABLE(OPENTYPE_VERTICAL)
#include "OpenTypeVerticalData.h"
#endif
@@ -93,7 +92,6 @@
static const SimpleFontData* systemFallback() { return reinterpret_cast<const SimpleFontData*>(-1); }
const FontPlatformData& platformData() const { return m_platformData; }
- const OpenTypeMathData* mathData() const { return m_mathData ? m_mathData.get() : nullptr; }
#if ENABLE(OPENTYPE_VERTICAL)
const OpenTypeVerticalData* verticalData() const { return m_verticalData.get(); }
#endif
@@ -261,7 +259,6 @@
bool m_isTextOrientationFallback;
bool m_isBrokenIdeographFallback;
- RefPtr<OpenTypeMathData> m_mathData;
#if ENABLE(OPENTYPE_VERTICAL)
RefPtr<OpenTypeVerticalData> m_verticalData;
#endif
Deleted: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp (166380 => 166381)
--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp 2014-03-27 23:23:37 UTC (rev 166381)
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2014 Frederic Wang (fred.w...@free.fr). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "OpenTypeMathData.h"
-
-#include "FontPlatformData.h"
-
-using namespace std;
-
-namespace WebCore {
-
-OpenTypeMathData::OpenTypeMathData(const FontPlatformData&)
-{
- // FIXME: We should read the data from the MATH table (https://bugs.webkit.org/show_bug.cgi?id=130324).
- m_mathBuffer = nullptr;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.h (166380 => 166381)
--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.h 2014-03-27 23:22:55 UTC (rev 166380)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.h 2014-03-27 23:23:37 UTC (rev 166381)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2014 Frederic Wang (fred.w...@free.fr). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef OpenTypeMathData_h
-#define OpenTypeMathData_h
-
-#include "SharedBuffer.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class FontPlatformData;
-
-class OpenTypeMathData : public RefCounted<OpenTypeMathData> {
-public:
- static PassRefPtr<OpenTypeMathData> create(const FontPlatformData& fontData)
- {
- return adoptRef(new OpenTypeMathData(fontData));
- }
-
- bool hasMathData() const { return m_mathBuffer; }
-
-private:
- explicit OpenTypeMathData(const FontPlatformData&);
- RefPtr<SharedBuffer> m_mathBuffer;
-};
-
-} // namespace WebCore
-
-#endif // OpenTypeMathData_h
