Diff
Modified: trunk/Source/WebCore/ChangeLog (179282 => 179283)
--- trunk/Source/WebCore/ChangeLog 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 21:27:39 UTC (rev 179283)
@@ -1,3 +1,40 @@
+2015-01-28 Beth Dakin <[email protected]>
+
+ Remove Mountain Lion code from WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=141007
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ * page/AlternativeTextClient.h:
+ * page/mac/SettingsMac.mm:
+ (WebCore::Settings::initializeDefaultFontFamilies):
+ * platform/cocoa/SystemVersion.mm:
+ (WebCore::callGestalt): Deleted.
+ (WebCore::createSystemMarketingVersion): Deleted.
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::applyTransforms):
+ * platform/graphics/WidthIterator.h:
+ (WebCore::WidthIterator::supportsTypesettingFeatures):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeLoaded):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::supportsAcceleratedFilterAnimations):
+ * platform/graphics/ca/PlatformCAFilters.h:
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::FontCache::platformInit):
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ (WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
+ * platform/mac/PlatformEventFactoryMac.mm:
+ (WebCore::phaseForEvent):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::SocketStreamHandle::createStreams):
+ * platform/network/cocoa/CredentialCocoa.mm:
+ (WebCore::toCredentialPersistence):
+ * platform/spi/cocoa/CoreTextSPI.h:
+
2015-01-28 [email protected] <[email protected]>
[WinCairo] Compile error in media player implementation.
Modified: trunk/Source/WebCore/WebCore.exp.in (179282 => 179283)
--- trunk/Source/WebCore/WebCore.exp.in 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-28 21:27:39 UTC (rev 179283)
@@ -2395,6 +2395,7 @@
__ZN7WebCore22contextMenuItemTagBoldEv
__ZN7WebCore23enableSuddenTerminationEv
__ZN7WebCore23eventTimeStampSince1970EP7NSEvent
+__ZN7WebCore24TextAlternativeWithRangeC1EP18NSTextAlternatives8_NSRange
__ZN7WebCore24contextMenuItemTagItalicEv
__ZN7WebCore24contextMenuItemTagStylesEv
__ZN7WebCore24disableSuddenTerminationEv
@@ -2409,6 +2410,11 @@
__ZN7WebCore26contextMenuItemTagOpenLinkEv
__ZN7WebCore26pdfDocumentTypeDescriptionEv
__ZN7WebCore26usesTestModeFocusRingColorEv
+__ZN7WebCore27AlternativeTextUIController15addAlternativesERKN3WTF9RetainPtrI18NSTextAlternativesEE
+__ZN7WebCore27AlternativeTextUIController16showAlternativesEP6NSViewRKNS_9FloatRectEyU13block_pointerFvP8NSStringE
+__ZN7WebCore27AlternativeTextUIController18removeAlternativesEy
+__ZN7WebCore27AlternativeTextUIController22alternativesForContextEy
+__ZN7WebCore27AlternativeTextUIController5clearEv
__ZN7WebCore27contextMenuItemTagShowFontsEv
__ZN7WebCore27contextMenuItemTagUnderlineEv
__ZN7WebCore27createDragImageForSelectionERNS_5FrameEb
@@ -2431,6 +2437,7 @@
__ZN7WebCore31contextMenuItemTagMakeUpperCaseEv
__ZN7WebCore31contextMenuItemTagStartSpeakingEv
__ZN7WebCore32applicationIsAOLInstantMessengerEv
+__ZN7WebCore32collectDictationTextAlternativesEP18NSAttributedStringRN3WTF6VectorINS_24TextAlternativeWithRangeELm0ENS2_15CrashOnOverflowEEE
__ZN7WebCore32contextMenuItemTagInspectElementEv
__ZN7WebCore32contextMenuItemTagSmartCopyPasteEv
__ZN7WebCore32editingAttributedStringFromRangeERNS_5RangeENS_31IncludeImagesInAttributedStringE
@@ -2489,6 +2496,7 @@
_stringEncodingForResource
_wkAccessibilityHandleFocusChanged
_wkAdvanceDefaultButtonPulseAnimation
+_wkCGContextDrawsWithCorrectShadowOffsets
_wkCopyAXTextMarkerRangeEnd
_wkCopyAXTextMarkerRangeStart
_wkCopyDefaultSearchProviderDisplayName
@@ -2508,6 +2516,7 @@
_wkDrawFocusRingAtTime
_wkDrawMediaSliderTrack
_wkDrawMediaUIPart
+_wkExecutableWasLinkedOnOrBeforeLion
_wkExecutableWasLinkedOnOrBeforeSnowLeopard
_wkGetAXTextMarkerRangeTypeID
_wkGetAXTextMarkerTypeID
@@ -2519,6 +2528,9 @@
_wkGetWheelEventDeltas
_wkHitTestMediaUIPart
_wkMeasureMediaUIPart
+_wkNSElasticDeltaForReboundDelta
+_wkNSElasticDeltaForTimeDelta
+_wkNSReboundDeltaForElasticDelta
_wkPopupMenu
_wkQTClearMediaDownloadCache
_wkQTClearMediaDownloadCacheForSite
@@ -2557,21 +2569,6 @@
__ZN7WebCore44registerInsertionUndoGroupingWithUndoManagerEP13NSUndoManager
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
-__ZN7WebCore24TextAlternativeWithRangeC1EP18NSTextAlternatives8_NSRange
-__ZN7WebCore27AlternativeTextUIController15addAlternativesERKN3WTF9RetainPtrI18NSTextAlternativesEE
-__ZN7WebCore27AlternativeTextUIController16showAlternativesEP6NSViewRKNS_9FloatRectEyU13block_pointerFvP8NSStringE
-__ZN7WebCore27AlternativeTextUIController18removeAlternativesEy
-__ZN7WebCore27AlternativeTextUIController22alternativesForContextEy
-__ZN7WebCore27AlternativeTextUIController5clearEv
-__ZN7WebCore32collectDictationTextAlternativesEP18NSAttributedStringRN3WTF6VectorINS_24TextAlternativeWithRangeELm0ENS2_15CrashOnOverflowEEE
-_wkCGContextDrawsWithCorrectShadowOffsets
-_wkExecutableWasLinkedOnOrBeforeLion
-_wkNSElasticDeltaForReboundDelta
-_wkNSElasticDeltaForTimeDelta
-_wkNSReboundDeltaForElasticDelta
-#endif
-
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
_wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
#endif
Modified: trunk/Source/WebCore/page/AlternativeTextClient.h (179282 => 179283)
--- trunk/Source/WebCore/page/AlternativeTextClient.h 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/page/AlternativeTextClient.h 2015-01-28 21:27:39 UTC (rev 179283)
@@ -31,10 +31,10 @@
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(MAC)
// Some platforms provide UI for suggesting alternative dictation text.
#define WTF_USE_DICTATION_ALTERNATIVES 1
-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#endif // PLATFORM(MAC)
namespace WebCore {
Modified: trunk/Source/WebCore/page/mac/SettingsMac.mm (179282 => 179283)
--- trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-01-28 21:27:39 UTC (rev 179283)
@@ -88,7 +88,7 @@
setStandardFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
setSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
#endif
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(COCOA)
setFixedFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
setSansSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
#else
Modified: trunk/Source/WebCore/platform/cocoa/SystemVersion.mm (179282 => 179283)
--- trunk/Source/WebCore/platform/cocoa/SystemVersion.mm 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/cocoa/SystemVersion.mm 2015-01-28 21:27:39 UTC (rev 179283)
@@ -27,8 +27,6 @@
namespace WebCore {
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
-
static NSString *createSystemMarketingVersion()
{
// Can't use -[NSProcessInfo operatingSystemVersionString] because it has too much stuff we don't want.
@@ -42,32 +40,6 @@
return [[systemVersionInfo objectForKey:@"ProductVersion"] copy];
}
-#else
-
-static inline int callGestalt(OSType selector)
-{
- SInt32 value = 0;
- Gestalt(selector, &value);
- return value;
-}
-
-static NSString *createSystemMarketingVersion()
-{
- // Can't use -[NSProcessInfo operatingSystemVersionString] because it has too much stuff we don't want.
- int major = callGestalt(gestaltSystemVersionMajor);
- ASSERT(major);
-
- int minor = callGestalt(gestaltSystemVersionMinor);
- int bugFix = callGestalt(gestaltSystemVersionBugFix);
- if (bugFix)
- return [[NSString alloc] initWithFormat:@"%d.%d.%d", major, minor, bugFix];
- if (minor)
- return [[NSString alloc] initWithFormat:@"%d.%d", major, minor];
- return [[NSString alloc] initWithFormat:@"%d", major];
-}
-
-#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
-
NSString *systemMarketingVersion()
{
static NSString *version = createSystemMarketingVersion();
Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (179282 => 179283)
--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-01-28 21:27:39 UTC (rev 179283)
@@ -30,7 +30,7 @@
#include "config.h"
#include "Font.h"
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
+#if PLATFORM(COCOA)
#include "CoreTextSPI.h"
#endif
#include "FontCache.h"
@@ -384,7 +384,7 @@
{
// We need to handle transforms on SVG fonts internally, since they are rendered internally.
ASSERT(!isSVGFont());
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
+#if PLATFORM(COCOA)
CTFontTransformOptions options = (typesettingFeatures & Kerning ? kCTFontTransformApplyPositioning : 0) | (typesettingFeatures & Ligatures ? kCTFontTransformApplyShaping : 0);
return CTFontTransformGlyphs(m_platformData.ctFont(), glyphs, reinterpret_cast<CGSize*>(advances), glyphCount, options);
#else
Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.h (179282 => 179283)
--- trunk/Source/WebCore/platform/graphics/WidthIterator.h 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.h 2015-01-28 21:27:39 UTC (rev 179283)
@@ -60,7 +60,7 @@
static bool supportsTypesettingFeatures(const FontCascade& font)
{
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
+#if PLATFORM(COCOA)
if (!font.isPrinterFont())
return !font.typesettingFeatures();
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (179282 => 179283)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-01-28 21:27:39 UTC (rev 179283)
@@ -1325,14 +1325,6 @@
MediaTime MediaPlayerPrivateAVFoundationObjC::platformMaxTimeLoaded() const
{
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
- // AVFoundation on Mountain Lion will occasionally not send a KVO notification
- // when loadedTimeRanges changes when there is no video output. In that case
- // update the cached value explicitly.
- if (!hasLayerRenderer() && !hasContextRenderer())
- m_cachedLoadedRanges = [m_avPlayerItem loadedTimeRanges];
-#endif
-
if (!m_cachedLoadedRanges)
return MediaTime::zeroTime();
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (179282 => 179283)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-01-28 21:27:39 UTC (rev 179283)
@@ -269,8 +269,7 @@
static inline bool supportsAcceleratedFilterAnimations()
{
-// <rdar://problem/10907251> - WebKit2 doesn't support CA animations of CI filters on Lion and below
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
+#if PLATFORM(COCOA)
return true;
#else
return false;
Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h (179282 => 179283)
--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2015-01-28 21:27:39 UTC (rev 179283)
@@ -31,7 +31,7 @@
#include "PlatformLayer.h"
#include <wtf/RetainPtr.h>
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(COCOA)
#define USE_CA_FILTERS 1
#else
#define USE_CA_FILTERS 0
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (179282 => 179283)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-01-28 21:27:39 UTC (rev 179283)
@@ -291,9 +291,6 @@
void FontCache::platformInit()
{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
- CGFontSetShouldUseMulticache(true);
-#endif
CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, fontCacheRegisteredFontsChangedNotificationCallback, kCTFontManagerRegisteredFontsChangedNotification, 0, CFNotificationSuspensionBehaviorDeliverImmediately);
}
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (179282 => 179283)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2015-01-28 21:27:39 UTC (rev 179283)
@@ -84,17 +84,6 @@
// or if the vendor is AMD/ATI and the system is 10.7.2 and above.
bool systemSupportsMultisampling = true;
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1080
- ASSERT(isMainThread());
- static SInt32 version;
- if (!version) {
- if (Gestalt(gestaltSystemVersion, &version) != noErr)
- systemSupportsMultisampling = false;
- }
- // See https://bugs.webkit.org/show_bug.cgi?id=77922 for more details
- if (systemSupportsMultisampling)
- systemSupportsMultisampling = version >= 0x1072;
-#endif // SNOW_LEOPARD and LION
if (m_isAMD && !systemSupportsMultisampling)
m_maySupportMultisampling = false;
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (179282 => 179283)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2015-01-28 21:27:39 UTC (rev 179283)
@@ -187,10 +187,8 @@
phase |= PlatformWheelEventPhaseEnded;
if ([event phase] & NSEventPhaseCancelled)
phase |= PlatformWheelEventPhaseCancelled;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
if ([event momentumPhase] & NSEventPhaseMayBegin)
phase |= PlatformWheelEventPhaseMayBegin;
-#endif
return static_cast<PlatformWheelEventPhase>(phase);
}
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (179282 => 179283)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-01-28 21:27:39 UTC (rev 179283)
@@ -132,7 +132,7 @@
wkPatternTilingConstantSpacing
} wkPatternTiling;
extern void (*wkCGContextResetClip)(CGContextRef);
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if !PLATFORM(IOS)
extern bool (*wkCGContextDrawsWithCorrectShadowOffsets)(CGContextRef);
#endif
extern CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
@@ -301,7 +301,7 @@
extern dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
#endif
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if !PLATFORM(IOS)
extern bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
#endif
@@ -309,7 +309,7 @@
extern void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if !PLATFORM(IOS)
extern CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
extern CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
extern CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (179282 => 179283)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-01-28 21:27:39 UTC (rev 179283)
@@ -34,9 +34,7 @@
void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef context, void (^block)(CGRect rect));
BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef);
void (*wkCGContextResetClip)(CGContextRef);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
bool (*wkCGContextDrawsWithCorrectShadowOffsets)(CGContextRef);
-#endif
CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
@@ -157,15 +155,13 @@
dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
#endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
-#endif
void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if !PLATFORM(IOS)
CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (179282 => 179283)
--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2015-01-28 21:27:39 UTC (rev 179283)
@@ -55,7 +55,7 @@
#include "WebCoreSystemInterface.h"
#endif
-#if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
+#if PLATFORM(IOS) || PLATFORM(MAC)
extern "C" const CFStringRef _kCFStreamSocketSetNoDelay;
#endif
@@ -294,7 +294,7 @@
CFReadStreamRef readStream = 0;
CFWriteStreamRef writeStream = 0;
CFStreamCreatePairWithSocketToHost(0, host.get(), port(), &readStream, &writeStream);
-#if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
+#if PLATFORM(IOS) || PLATFORM(MAC)
// <rdar://problem/12855587> _kCFStreamSocketSetNoDelay is not exported on Windows
CFWriteStreamSetProperty(writeStream, _kCFStreamSocketSetNoDelay, kCFBooleanTrue);
#endif
Modified: trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm (179282 => 179283)
--- trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm 2015-01-28 21:27:39 UTC (rev 179283)
@@ -26,13 +26,6 @@
#import "config.h"
#import "CredentialCocoa.h"
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1080
-// This value is available in OS X 10.8 but only appeared in the OS X 10.9 SDK.
-enum {
- NSURLCredentialPersistenceSynchronizable = 3
-};
-#endif
-
#if USE(CFNETWORK)
@interface NSURLCredential (WebDetails)
- (id)_initWithCFURLCredential:(CFURLCredentialRef)credential;
@@ -65,14 +58,7 @@
case NSURLCredentialPersistenceForSession:
return CredentialPersistenceForSession;
case NSURLCredentialPersistencePermanent:
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1080
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
case NSURLCredentialPersistenceSynchronizable:
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1080
-#pragma clang diagnostic pop
-#endif
return CredentialPersistencePermanent;
}
Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (179282 => 179283)
--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-01-28 21:24:13 UTC (rev 179282)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-01-28 21:27:39 UTC (rev 179283)
@@ -50,7 +50,7 @@
extern const CFStringRef kCTFontReferenceURLAttribute;
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
+#if PLATFORM(COCOA)
#if !USE(APPLE_INTERNAL_SDK)
typedef CF_OPTIONS(uint32_t, CTFontTransformOptions)
{
