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