<!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>[171615] trunk/Source</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/171615">171615</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-07-25 14:31:07 -0700 (Fri, 25 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Yosemite version number is 101000
https://bugs.webkit.org/show_bug.cgi?id=135301
Reviewed by Sam Weinig.
Source/WebCore:
* WebCore.exp.in:
* platform/ContentFilter.h:
* platform/mac/ScrollViewMac.mm:
(WebCore::ScrollView::platformVisibleContentRect):
* platform/mac/ThemeMac.mm:
(WebCore::updateStates):
(WebCore::paintToggleButton):
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::copyCookiesForURLWithFirstPartyURL):
* platform/network/cf/ResourceRequest.h:
(WebCore::ResourceRequest::resourcePrioritiesEnabled):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::search):
Source/WebKit2:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::connectToService):
* WebProcess/com.apple.WebProcess.sb.in:
Source/WTF:
* wtf/FeatureDefines.h:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<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="#trunkSourceWebCoreplatformContentFilterh">trunk/Source/WebCore/platform/ContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollViewMacmm">trunk/Source/WebCore/platform/mac/ScrollViewMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMacmm">trunk/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp">trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequesth">trunk/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscomappleWebProcesssbin">trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WTF/ChangeLog 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-25 Gavin Barraclough <baraclough@apple.com>
+
+ Yosemite version number is 101000
+ https://bugs.webkit.org/show_bug.cgi?id=135301
+
+ Reviewed by Sam Weinig.
+
+ * wtf/FeatureDefines.h:
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2014-07-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Use NO_RETURN_DUE_TO_CRASH on Windows.
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> #define ENABLE_FULLSCREEN_API 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> #if !defined(ENABLE_REMOTE_INSPECTOR)
</span><span class="cx"> #define ENABLE_REMOTE_INSPECTOR 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WTF/wtf/Platform.h 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -1003,7 +1003,7 @@
</span><span class="cx"> #define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> #define WTF_USE_INSERTION_UNDO_GROUPING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1039,7 +1039,7 @@
</span><span class="cx"> #define HAVE_NS_ACTIVITY 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> #define WTF_USE_ASYNC_NSTEXTINPUTCLIENT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebCore/ChangeLog 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-07-25 Gavin Barraclough <baraclough@apple.com>
+
+ Yosemite version number is 101000
+ https://bugs.webkit.org/show_bug.cgi?id=135301
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ * platform/ContentFilter.h:
+ * platform/mac/ScrollViewMac.mm:
+ (WebCore::ScrollView::platformVisibleContentRect):
+ * platform/mac/ThemeMac.mm:
+ (WebCore::updateStates):
+ (WebCore::paintToggleButton):
+ * platform/network/cf/CookieJarCFNet.cpp:
+ (WebCore::copyCookiesForURLWithFirstPartyURL):
+ * platform/network/cf/ResourceRequest.h:
+ (WebCore::ResourceRequest::resourcePrioritiesEnabled):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::search):
+
</ins><span class="cx"> 2014-07-25 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] RenderViews paginated as RL or LR don't handle percentage widths correctly.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -2428,7 +2428,7 @@
</span><span class="cx"> __ZNK7WebCore7IntSizecv7_NSSizeEv
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> __ZN7WebCore32shouldRegisterInsertionUndoGroupEP18NSAttributedString
</span><span class="cx"> __ZN7WebCore44registerInsertionUndoGroupingWithUndoManagerEP13NSUndoManager
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContentFilter.h (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContentFilter.h 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebCore/platform/ContentFilter.h 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> OBJC_CLASS WebFilterEvaluator;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define HAVE_NE_FILTER_SOURCE TARGET_OS_EMBEDDED || (!TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100)
</del><ins>+#define HAVE_NE_FILTER_SOURCE TARGET_OS_EMBEDDED || (!TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx">
</span><span class="cx"> #if HAVE(NE_FILTER_SOURCE)
</span><span class="cx"> #import <dispatch/dispatch.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollViewMac.mm (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -113,14 +113,14 @@
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> IntRect visibleContentRect = enclosingIntRect([scrollView() documentVisibleRect]);
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> visibleContentRect.move(scrollView().contentInsets.left, scrollView().contentInsets.top);
</span><span class="cx"> visibleContentRect.contract(scrollView().contentInsets.left + scrollView().contentInsets.right, scrollView().contentInsets.top + scrollView().contentInsets.bottom);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (includeScrollbars) {
</span><span class="cx"> IntSize frameSize = IntSize([scrollView() frame].size);
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> frameSize.contract(scrollView().contentInsets.left + scrollView().contentInsets.right, scrollView().contentInsets.top + scrollView().contentInsets.bottom);
</span><span class="cx"> #endif
</span><span class="cx"> visibleContentRect.setSize(frameSize);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #import <Carbon/Carbon.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> @interface NSButtonCell(Details)
</span><span class="cx"> - (void)_setState:(NSInteger)value animated:(BOOL)animated;
</span><span class="cx"> - (void)_setHighlighted:(BOOL)flag animated:(BOOL)animated;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">
</span><span class="cx"> static void updateStates(NSCell* cell, const ControlStates* controlStates, bool useAnimation = false)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</ins><span class="cx"> UNUSED_PARAM(useAnimation);
</span><span class="cx"> #endif
</span><span class="cx"> ControlStates::States states = controlStates->states();
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> bool oldPressed = [cell isHighlighted];
</span><span class="cx"> bool pressed = states & ControlStates::PressedState;
</span><span class="cx"> if (pressed != oldPressed) {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> [(NSButtonCell*)cell _setHighlighted:pressed animated:useAnimation];
</span><span class="cx"> #else
</span><span class="cx"> [cell setHighlighted:pressed];
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> bool oldChecked = [cell state] == NSOnState;
</span><span class="cx"> if (oldIndeterminate != indeterminate || checked != oldChecked) {
</span><span class="cx"> NSCellStateValue newState = indeterminate ? NSMixedState : (checked ? NSOnState : NSOffState);
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> [(NSButtonCell*)cell _setState:newState animated:useAnimation];
</span><span class="cx"> #else
</span><span class="cx"> [cell setState:newState];
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> bool isAnimating = false;
</span><span class="cx"> bool needsRepaint = false;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> if ([toggleButtonCell _stateAnimationRunning]) {
</span><span class="cx"> // AppKit's drawWithFrame appears to render the cell centered in the
</span><span class="cx"> // provided rectangle/frame, so we need to manually position the
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> needsRepaint = drawCellFocusRing(toggleButtonCell, inflatedRect, view);
</span><span class="cx"> [toggleButtonCell setControlView:nil];
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> needsRepaint |= [toggleButtonCell _stateAnimationRunning];
</span><span class="cx"> #endif
</span><span class="cx"> controlStates->setNeedsRepaint(needsRepaint);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool secure = url.protocolIs("https");
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100)
</del><ins>+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));
</span><span class="cx"> #else
</span><span class="cx"> // _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL is not available on other platforms.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -159,9 +159,9 @@
</span><span class="cx">
</span><span class="cx"> inline bool ResourceRequest::resourcePrioritiesEnabled()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> return true;
</span><del>-#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 10100
</del><ins>+#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</ins><span class="cx"> // See <rdar://problem/16518595>, <rdar://problem/17168793> for issues we had before OS X 10.10.
</span><span class="cx"> // HTTP Pipelining could be enabled for experiments, but there is no point in doing so on old OS versions,
</span><span class="cx"> // and that can't work well because of the above issues.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> @implementation WebCoreRenderThemeBundle
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> @interface NSSearchFieldCell(Details)
</span><span class="cx"> @property (getter=isCenteredLook) BOOL centeredLook;
</span><span class="cx"> @end
</span><span class="lines">@@ -1947,7 +1947,7 @@
</span><span class="cx"> [m_search.get() setBezeled:YES];
</span><span class="cx"> [m_search.get() setEditable:YES];
</span><span class="cx"> [m_search.get() setFocusRingType:NSFocusRingTypeExterior];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> [m_search.get() setCenteredLook:NO];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-07-25 Gavin Barraclough <baraclough@apple.com>
+
+ Yosemite version number is 101000
+ https://bugs.webkit.org/show_bug.cgi?id=135301
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::connectToService):
+ * WebProcess/com.apple.WebProcess.sb.in:
+
</ins><span class="cx"> 2014-07-24 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Do not try to hit test a null mainFrameRenderView on dynamicViewportSizeUpdate()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> extern "C" void xpc_connection_set_instance(xpc_connection_t, uuid_t);
</span><span class="cx"> extern "C" void xpc_dictionary_set_mach_send(xpc_object_t, const char*, mach_port_t);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> extern "C" void xpc_connection_set_bootstrap(xpc_connection_t connection, xpc_object_t bootstrap);
</span><span class="cx">
</span><span class="cx"> // FIXME: Soft linking is temporary, make this into a regular function call once this function is available everywhere we need.
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> auto connection = IPC::adoptXPC(xpc_connection_create(serviceName(launchOptions, forDevelopment), 0));
</span><span class="cx"> xpc_connection_set_instance(connection.get(), instanceUUID->uuid);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> // Inherit UI process localization. It can be different from child process default localization:
</span><span class="cx"> // 1. When the application and system frameworks simply have different localized resources available, we should match the application.
</span><span class="cx"> // 1.1. An important case is WebKitTestRunner, where we should use English localizations for all system frameworks.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (171614 => 171615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2014-07-25 21:26:20 UTC (rev 171614)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2014-07-25 21:31:07 UTC (rev 171615)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> (global-name "com.apple.coreservices.launchservicesd")
</span><span class="cx"> #endif
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> (global-name "com.apple.iconservices")
</span><span class="cx"> (global-name "com.apple.iconservices.store")
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>