Title: [177726] trunk/Source/WebCore
- Revision
- 177726
- Author
- [email protected]
- Date
- 2014-12-24 16:21:52 -0800 (Wed, 24 Dec 2014)
Log Message
[Cocoa] WebCoreSystemInterface.h declares two unused symbols
https://bugs.webkit.org/show_bug.cgi?id=139937
Reviewed by Tim Horton.
* platform/graphics/FontPlatformData.h: Removed unused typedefs.
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::createFontCustomPlatformData): Stop passing always-zero containerRef parameter to
FontCustomPlatformData constructor.
* platform/graphics/mac/FontCustomPlatformData.h: Removed unused typedefs.
(WebCore::FontCustomPlatformData::FontCustomPlatformData): Removed unused container
parameter and m_atsContainer member variable.
* platform/mac/WebCoreSystemInterface.h: Removed unused typedefs and symbols.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (177725 => 177726)
--- trunk/Source/WebCore/ChangeLog 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/ChangeLog 2014-12-25 00:21:52 UTC (rev 177726)
@@ -1,3 +1,22 @@
+2014-12-24 Dan Bernstein <[email protected]>
+
+ [Cocoa] WebCoreSystemInterface.h declares two unused symbols
+ https://bugs.webkit.org/show_bug.cgi?id=139937
+
+ Reviewed by Tim Horton.
+
+ * platform/graphics/FontPlatformData.h: Removed unused typedefs.
+
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::createFontCustomPlatformData): Stop passing always-zero containerRef parameter to
+ FontCustomPlatformData constructor.
+
+ * platform/graphics/mac/FontCustomPlatformData.h: Removed unused typedefs.
+ (WebCore::FontCustomPlatformData::FontCustomPlatformData): Removed unused container
+ parameter and m_atsContainer member variable.
+
+ * platform/mac/WebCoreSystemInterface.h: Removed unused typedefs and symbols.
+
2014-12-23 Chris Dumez <[email protected]>
Simplify RenderStyle::invalidColor() function
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (177725 => 177726)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2014-12-25 00:21:52 UTC (rev 177726)
@@ -51,9 +51,6 @@
#endif
typedef const struct __CTFont* CTFontRef;
-typedef UInt32 FMFont;
-typedef FMFont ATSUFontID;
-typedef UInt32 ATSFontRef;
#endif
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (177725 => 177726)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2014-12-25 00:21:52 UTC (rev 177726)
@@ -38,8 +38,6 @@
std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer& buffer)
{
- ATSFontContainerRef containerRef = 0;
-
RetainPtr<CFDataRef> bufferData = buffer.createCFData();
RetainPtr<CGDataProviderRef> dataProvider = adoptCF(CGDataProviderCreateWithCFData(bufferData.get()));
@@ -47,7 +45,7 @@
if (!cgFontRef)
return nullptr;
- return std::make_unique<FontCustomPlatformData>(containerRef, cgFontRef.get());
+ return std::make_unique<FontCustomPlatformData>(cgFontRef.get());
}
bool FontCustomPlatformData::supportsFormat(const String& format)
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h (177725 => 177726)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2014-12-25 00:21:52 UTC (rev 177726)
@@ -30,8 +30,6 @@
#include <wtf/RetainPtr.h>
typedef struct CGFont* CGFontRef;
-typedef UInt32 ATSFontContainerRef;
-typedef UInt32 ATSFontRef;
namespace WebCore {
@@ -41,9 +39,8 @@
struct FontCustomPlatformData {
WTF_MAKE_NONCOPYABLE(FontCustomPlatformData);
public:
- FontCustomPlatformData(ATSFontContainerRef container, CGFontRef cgFont)
- : m_atsContainer(container)
- , m_cgFont(cgFont)
+ explicit FontCustomPlatformData(CGFontRef cgFont)
+ : m_cgFont(cgFont)
{
}
@@ -53,7 +50,6 @@
static bool supportsFormat(const String&);
- ATSFontContainerRef m_atsContainer;
RetainPtr<CGFontRef> m_cgFont;
};
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (177725 => 177726)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-12-24 23:21:34 UTC (rev 177725)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-12-25 00:21:52 UTC (rev 177726)
@@ -59,10 +59,6 @@
#if !PLATFORM(IOS)
typedef struct _NSRange NSRange;
typedef double NSTimeInterval;
-
-typedef UInt32 FMFont;
-typedef FMFont ATSUFontID;
-typedef UInt16 ATSGlyphRef;
#endif
#if PLATFORM(COCOA) && USE(CA)
@@ -157,7 +153,6 @@
extern CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
#endif
#if !PLATFORM(IOS)
-extern ATSUFontID (*wkGetNSFontATSUFontId)(NSFont*);
extern double (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
#endif
extern NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
@@ -222,8 +217,6 @@
extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
-extern BOOL (*wkUseSharedMediaUI)();
-
#if !PLATFORM(IOS)
extern void* wkGetHyphenationLocationBeforeIndex;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
