<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179283] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179283">179283</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 13:27:39 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepageAlternativeTextClienth">trunk/Source/WebCore/page/AlternativeTextClient.h</a></li>
<li><a href="#trunkSourceWebCorepagemacSettingsMacmm">trunk/Source/WebCore/page/mac/SettingsMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaSystemVersionmm">trunk/Source/WebCore/platform/cocoa/SystemVersion.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsWidthIteratorh">trunk/Source/WebCore/platform/graphics/WidthIterator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCAFiltersh">trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm">trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformEventFactoryMacmm">trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaCredentialCocoamm">trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaCoreTextSPIh">trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-01-28 Beth Dakin <bdakin@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2015-01-28 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Compile error in media player implementation.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2395,6 +2395,7 @@
</span><span class="cx"> __ZN7WebCore22contextMenuItemTagBoldEv
</span><span class="cx"> __ZN7WebCore23enableSuddenTerminationEv
</span><span class="cx"> __ZN7WebCore23eventTimeStampSince1970EP7NSEvent
</span><ins>+__ZN7WebCore24TextAlternativeWithRangeC1EP18NSTextAlternatives8_NSRange
</ins><span class="cx"> __ZN7WebCore24contextMenuItemTagItalicEv
</span><span class="cx"> __ZN7WebCore24contextMenuItemTagStylesEv
</span><span class="cx"> __ZN7WebCore24disableSuddenTerminationEv
</span><span class="lines">@@ -2409,6 +2410,11 @@
</span><span class="cx"> __ZN7WebCore26contextMenuItemTagOpenLinkEv
</span><span class="cx"> __ZN7WebCore26pdfDocumentTypeDescriptionEv
</span><span class="cx"> __ZN7WebCore26usesTestModeFocusRingColorEv
</span><ins>+__ZN7WebCore27AlternativeTextUIController15addAlternativesERKN3WTF9RetainPtrI18NSTextAlternativesEE
+__ZN7WebCore27AlternativeTextUIController16showAlternativesEP6NSViewRKNS_9FloatRectEyU13block_pointerFvP8NSStringE
+__ZN7WebCore27AlternativeTextUIController18removeAlternativesEy
+__ZN7WebCore27AlternativeTextUIController22alternativesForContextEy
+__ZN7WebCore27AlternativeTextUIController5clearEv
</ins><span class="cx"> __ZN7WebCore27contextMenuItemTagShowFontsEv
</span><span class="cx"> __ZN7WebCore27contextMenuItemTagUnderlineEv
</span><span class="cx"> __ZN7WebCore27createDragImageForSelectionERNS_5FrameEb
</span><span class="lines">@@ -2431,6 +2437,7 @@
</span><span class="cx"> __ZN7WebCore31contextMenuItemTagMakeUpperCaseEv
</span><span class="cx"> __ZN7WebCore31contextMenuItemTagStartSpeakingEv
</span><span class="cx"> __ZN7WebCore32applicationIsAOLInstantMessengerEv
</span><ins>+__ZN7WebCore32collectDictationTextAlternativesEP18NSAttributedStringRN3WTF6VectorINS_24TextAlternativeWithRangeELm0ENS2_15CrashOnOverflowEEE
</ins><span class="cx"> __ZN7WebCore32contextMenuItemTagInspectElementEv
</span><span class="cx"> __ZN7WebCore32contextMenuItemTagSmartCopyPasteEv
</span><span class="cx"> __ZN7WebCore32editingAttributedStringFromRangeERNS_5RangeENS_31IncludeImagesInAttributedStringE
</span><span class="lines">@@ -2489,6 +2496,7 @@
</span><span class="cx"> _stringEncodingForResource
</span><span class="cx"> _wkAccessibilityHandleFocusChanged
</span><span class="cx"> _wkAdvanceDefaultButtonPulseAnimation
</span><ins>+_wkCGContextDrawsWithCorrectShadowOffsets
</ins><span class="cx"> _wkCopyAXTextMarkerRangeEnd
</span><span class="cx"> _wkCopyAXTextMarkerRangeStart
</span><span class="cx"> _wkCopyDefaultSearchProviderDisplayName
</span><span class="lines">@@ -2508,6 +2516,7 @@
</span><span class="cx"> _wkDrawFocusRingAtTime
</span><span class="cx"> _wkDrawMediaSliderTrack
</span><span class="cx"> _wkDrawMediaUIPart
</span><ins>+_wkExecutableWasLinkedOnOrBeforeLion
</ins><span class="cx"> _wkExecutableWasLinkedOnOrBeforeSnowLeopard
</span><span class="cx"> _wkGetAXTextMarkerRangeTypeID
</span><span class="cx"> _wkGetAXTextMarkerTypeID
</span><span class="lines">@@ -2519,6 +2528,9 @@
</span><span class="cx"> _wkGetWheelEventDeltas
</span><span class="cx"> _wkHitTestMediaUIPart
</span><span class="cx"> _wkMeasureMediaUIPart
</span><ins>+_wkNSElasticDeltaForReboundDelta
+_wkNSElasticDeltaForTimeDelta
+_wkNSReboundDeltaForElasticDelta
</ins><span class="cx"> _wkPopupMenu
</span><span class="cx"> _wkQTClearMediaDownloadCache
</span><span class="cx"> _wkQTClearMediaDownloadCacheForSite
</span><span class="lines">@@ -2557,21 +2569,6 @@
</span><span class="cx"> __ZN7WebCore44registerInsertionUndoGroupingWithUndoManagerEP13NSUndoManager
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> _wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageAlternativeTextClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/AlternativeTextClient.h (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> // Some platforms provide UI for suggesting alternative dictation text.
</span><span class="cx"> #define WTF_USE_DICTATION_ALTERNATIVES 1
</span><del>-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacSettingsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/SettingsMac.mm (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> setStandardFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
</span><span class="cx"> setSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> setFixedFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
</span><span class="cx"> setSansSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaSystemVersionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/SystemVersion.mm (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
-
</del><span class="cx"> static NSString *createSystemMarketingVersion()
</span><span class="cx"> {
</span><span class="cx"> // Can't use -[NSProcessInfo operatingSystemVersionString] because it has too much stuff we don't want.
</span><span class="lines">@@ -42,32 +40,6 @@
</span><span class="cx"> return [[systemVersionInfo objectForKey:@"ProductVersion"] copy];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> NSString *systemMarketingVersion()
</span><span class="cx"> {
</span><span class="cx"> static NSString *version = createSystemMarketingVersion();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Font.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "CoreTextSPI.h"
</span><span class="cx"> #endif
</span><span class="cx"> #include "FontCache.h"
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> {
</span><span class="cx"> // We need to handle transforms on SVG fonts internally, since they are rendered internally.
</span><span class="cx"> ASSERT(!isSVGFont());
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> CTFontTransformOptions options = (typesettingFeatures & Kerning ? kCTFontTransformApplyPositioning : 0) | (typesettingFeatures & Ligatures ? kCTFontTransformApplyShaping : 0);
</span><span class="cx"> return CTFontTransformGlyphs(m_platformData.ctFont(), glyphs, reinterpret_cast<CGSize*>(advances), glyphCount, options);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsWidthIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.h (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> static bool supportsTypesettingFeatures(const FontCascade& font)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!font.isPrinterFont())
</span><span class="cx"> return !font.typesettingFeatures();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1325,14 +1325,6 @@
</span><span class="cx">
</span><span class="cx"> MediaTime MediaPlayerPrivateAVFoundationObjC::platformMaxTimeLoaded() const
</span><span class="cx"> {
</span><del>-#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
-
</del><span class="cx"> if (!m_cachedLoadedRanges)
</span><span class="cx"> return MediaTime::zeroTime();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -269,8 +269,7 @@
</span><span class="cx">
</span><span class="cx"> static inline bool supportsAcceleratedFilterAnimations()
</span><span class="cx"> {
</span><del>-// <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)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return true;
</span><span class="cx"> #else
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCAFiltersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define USE_CA_FILTERS 1
</span><span class="cx"> #else
</span><span class="cx"> #define USE_CA_FILTERS 0
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -291,9 +291,6 @@
</span><span class="cx">
</span><span class="cx"> void FontCache::platformInit()
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
- CGFontSetShouldUseMulticache(true);
-#endif
</del><span class="cx"> CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, fontCacheRegisteredFontsChangedNotificationCallback, kCTFontManagerRegisteredFontsChangedNotification, 0, CFNotificationSuspensionBehaviorDeliverImmediately);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -84,17 +84,6 @@
</span><span class="cx"> // or if the vendor is AMD/ATI and the system is 10.7.2 and above.
</span><span class="cx">
</span><span class="cx"> bool systemSupportsMultisampling = true;
</span><del>-#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
</del><span class="cx">
</span><span class="cx"> if (m_isAMD && !systemSupportsMultisampling)
</span><span class="cx"> m_maySupportMultisampling = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformEventFactoryMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -187,10 +187,8 @@
</span><span class="cx"> phase |= PlatformWheelEventPhaseEnded;
</span><span class="cx"> if ([event phase] & NSEventPhaseCancelled)
</span><span class="cx"> phase |= PlatformWheelEventPhaseCancelled;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> if ([event momentumPhase] & NSEventPhaseMayBegin)
</span><span class="cx"> phase |= PlatformWheelEventPhaseMayBegin;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return static_cast<PlatformWheelEventPhase>(phase);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> wkPatternTilingConstantSpacing
</span><span class="cx"> } wkPatternTiling;
</span><span class="cx"> extern void (*wkCGContextResetClip)(CGContextRef);
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> extern bool (*wkCGContextDrawsWithCorrectShadowOffsets)(CGContextRef);
</span><span class="cx"> #endif
</span><span class="cx"> extern CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> extern dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> extern bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx">
</span><span class="cx"> extern void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> extern CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
</span><span class="cx"> extern CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
</span><span class="cx"> extern CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,9 +34,7 @@
</span><span class="cx"> void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef context, void (^block)(CGRect rect));
</span><span class="cx"> BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef);
</span><span class="cx"> void (*wkCGContextResetClip)(CGContextRef);
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> bool (*wkCGContextDrawsWithCorrectShadowOffsets)(CGContextRef);
</span><del>-#endif
</del><span class="cx"> CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
</span><span class="cx"> NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
</span><span class="cx"> CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
</span><span class="lines">@@ -157,15 +155,13 @@
</span><span class="cx"> dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
</span><span class="cx">
</span><span class="cx"> void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
</span><span class="cx"> CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
</span><span class="cx"> CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC)
</ins><span class="cx"> extern "C" const CFStringRef _kCFStreamSocketSetNoDelay;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> CFReadStreamRef readStream = 0;
</span><span class="cx"> CFWriteStreamRef writeStream = 0;
</span><span class="cx"> CFStreamCreatePairWithSocketToHost(0, host.get(), port(), &readStream, &writeStream);
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC)
</ins><span class="cx"> // <rdar://problem/12855587> _kCFStreamSocketSetNoDelay is not exported on Windows
</span><span class="cx"> CFWriteStreamSetProperty(writeStream, _kCFStreamSocketSetNoDelay, kCFBooleanTrue);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaCredentialCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,13 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CredentialCocoa.h"
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> @interface NSURLCredential (WebDetails)
</span><span class="cx"> - (id)_initWithCFURLCredential:(CFURLCredentialRef)credential;
</span><span class="lines">@@ -65,14 +58,7 @@
</span><span class="cx"> case NSURLCredentialPersistenceForSession:
</span><span class="cx"> return CredentialPersistenceForSession;
</span><span class="cx"> case NSURLCredentialPersistencePermanent:
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1080
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
</del><span class="cx"> case NSURLCredentialPersistenceSynchronizable:
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1080
-#pragma clang diagnostic pop
-#endif
</del><span class="cx"> return CredentialPersistencePermanent;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCoreTextSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (179282 => 179283)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> extern const CFStringRef kCTFontReferenceURLAttribute;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if !USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> typedef CF_OPTIONS(uint32_t, CTFontTransformOptions)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>