Title: [141025] trunk/Source
- Revision
- 141025
- Author
- psola...@apple.com
- Date
- 2013-01-28 16:18:29 -0800 (Mon, 28 Jan 2013)
Log Message
PLATFORM(IOS) should come before __MAC_OS_X_VERSION_MIN_REQUIRED
https://bugs.webkit.org/show_bug.cgi?id=108101
Reviewed by Benjamin Poulain.
Since iOS does not define __MAC_OS_X_VERSION_MIN_REQUIRED, any usage of
__MAC_OS_X_VERSION_MIN_REQUIRED should be after a PLATFORM(IOS) check.
Source/WebCore:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
Source/WebKit/mac:
* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
Source/WebKit2:
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (141024 => 141025)
--- trunk/Source/WebCore/ChangeLog 2013-01-29 00:08:21 UTC (rev 141024)
+++ trunk/Source/WebCore/ChangeLog 2013-01-29 00:18:29 UTC (rev 141025)
@@ -1,3 +1,16 @@
+2013-01-28 Pratik Solanki <psola...@apple.com>
+
+ PLATFORM(IOS) should come before __MAC_OS_X_VERSION_MIN_REQUIRED
+ https://bugs.webkit.org/show_bug.cgi?id=108101
+
+ Reviewed by Benjamin Poulain.
+
+ Since iOS does not define __MAC_OS_X_VERSION_MIN_REQUIRED, any usage of
+ __MAC_OS_X_VERSION_MIN_REQUIRED should be after a PLATFORM(IOS) check.
+
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
2013-01-28 Kalev Lember <kalevlem...@gmail.com>
[GTK] Pass ICU cppflags to libWebCoreSVG.la build
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (141024 => 141025)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-01-29 00:08:21 UTC (rev 141024)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-01-29 00:18:29 UTC (rev 141025)
@@ -345,7 +345,7 @@
extern NSData *(*wkFilterDataComplete)(WebFilterEvaluator *);
#endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(IOS)
+#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
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 (141024 => 141025)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-01-29 00:08:21 UTC (rev 141024)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-01-29 00:18:29 UTC (rev 141025)
@@ -217,7 +217,7 @@
NSData *(*wkFilterDataComplete)(WebFilterEvaluator *);
#endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(IOS)
+#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
Modified: trunk/Source/WebKit/mac/ChangeLog (141024 => 141025)
--- trunk/Source/WebKit/mac/ChangeLog 2013-01-29 00:08:21 UTC (rev 141024)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-01-29 00:18:29 UTC (rev 141025)
@@ -1,3 +1,16 @@
+2013-01-28 Pratik Solanki <psola...@apple.com>
+
+ PLATFORM(IOS) should come before __MAC_OS_X_VERSION_MIN_REQUIRED
+ https://bugs.webkit.org/show_bug.cgi?id=108101
+
+ Reviewed by Benjamin Poulain.
+
+ Since iOS does not define __MAC_OS_X_VERSION_MIN_REQUIRED, any usage of
+ __MAC_OS_X_VERSION_MIN_REQUIRED should be after a PLATFORM(IOS) check.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2013-01-28 Joseph Pecoraro <pecor...@apple.com>
[Mac] Update PageVisibilityState when WebView is hidden / visible
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (141024 => 141025)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-01-29 00:08:21 UTC (rev 141024)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-01-29 00:18:29 UTC (rev 141025)
@@ -214,7 +214,7 @@
INIT(FilterDataComplete);
#endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(IOS)
+#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
INIT(NSElasticDeltaForTimeDelta);
INIT(NSElasticDeltaForReboundDelta);
INIT(NSReboundDeltaForElasticDelta);
Modified: trunk/Source/WebKit2/ChangeLog (141024 => 141025)
--- trunk/Source/WebKit2/ChangeLog 2013-01-29 00:08:21 UTC (rev 141024)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-29 00:18:29 UTC (rev 141025)
@@ -1,3 +1,16 @@
+2013-01-28 Pratik Solanki <psola...@apple.com>
+
+ PLATFORM(IOS) should come before __MAC_OS_X_VERSION_MIN_REQUIRED
+ https://bugs.webkit.org/show_bug.cgi?id=108101
+
+ Reviewed by Benjamin Poulain.
+
+ Since iOS does not define __MAC_OS_X_VERSION_MIN_REQUIRED, any usage of
+ __MAC_OS_X_VERSION_MIN_REQUIRED should be after a PLATFORM(IOS) check.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2013-01-28 Anders Carlsson <ander...@apple.com>
Add StorageManager class
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (141024 => 141025)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-01-29 00:08:21 UTC (rev 141024)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-01-29 00:18:29 UTC (rev 141025)
@@ -177,7 +177,7 @@
INIT(FilterDataComplete);
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(IOS)
+#if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
INIT(NSElasticDeltaForTimeDelta);
INIT(NSElasticDeltaForReboundDelta);
INIT(NSReboundDeltaForElasticDelta);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
