Title: [233300] trunk/Source
- Revision
- 233300
- Author
- [email protected]
- Date
- 2018-06-27 21:25:05 -0700 (Wed, 27 Jun 2018)
Log Message
Don't expose new semantic -apple-system color keywords on iOS.
https://bugs.webkit.org/show_bug.cgi?id=187080
rdar://problem/41505699
Reviewed by Tim Horton.
* DerivedSources.make: Use gnu++14, since gnu++17 is giving errors on macOS 10.12.
Source/WebCore:
* css/CSSValueKeywords.in: Define new semantic colors only on macOS.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (233299 => 233300)
--- trunk/Source/WebCore/ChangeLog 2018-06-28 04:19:32 UTC (rev 233299)
+++ trunk/Source/WebCore/ChangeLog 2018-06-28 04:25:05 UTC (rev 233300)
@@ -1,3 +1,14 @@
+2018-06-27 Timothy Hatcher <[email protected]>
+
+ Don't expose new semantic -apple-system color keywords on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=187080
+ rdar://problem/41505699
+
+ Reviewed by Tim Horton.
+
+ * DerivedSources.make: Use gnu++14, since gnu++17 is giving errors on macOS 10.12.
+ * css/CSSValueKeywords.in: Define new semantic colors only on macOS.
+
2018-06-27 Zalan Bujtas <[email protected]>
[LFC] Compute both the collapsed and the non-collapsed margin values.
Modified: trunk/Source/WebCore/DerivedSources.make (233299 => 233300)
--- trunk/Source/WebCore/DerivedSources.make 2018-06-28 04:19:32 UTC (rev 233299)
+++ trunk/Source/WebCore/DerivedSources.make 2018-06-28 04:25:05 UTC (rev 233300)
@@ -1017,25 +1017,25 @@
TARGET_TRIPLE_FLAGS=-target $(CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS ' | cut -d' ' -f3), 1)
WTF_PLATFORM_IOS = 1
else
WTF_PLATFORM_IOS = 0
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
WTF_PLATFORM_MAC = 1
else
WTF_PLATFORM_MAC = 0
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
USE_APPLE_INTERNAL_SDK = 1
else
USE_APPLE_INTERNAL_SDK = 0
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
ENABLE_ORIENTATION_EVENTS = 1
endif
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (233299 => 233300)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2018-06-28 04:19:32 UTC (rev 233299)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2018-06-28 04:25:05 UTC (rev 233300)
@@ -222,6 +222,7 @@
window
windowframe
windowtext
+#if defined(WTF_PLATFORM_MAC) && WTF_PLATFORM_MAC
-apple-system-header-text
-apple-system-text-background
-apple-system-control-background
@@ -243,6 +244,7 @@
-apple-system-quaternary-label
-apple-system-grid
-apple-system-separator
+#endif
-apple-wireless-playback-target-active
-apple-system-blue
-apple-system-brown
Modified: trunk/Source/WebKit/ChangeLog (233299 => 233300)
--- trunk/Source/WebKit/ChangeLog 2018-06-28 04:19:32 UTC (rev 233299)
+++ trunk/Source/WebKit/ChangeLog 2018-06-28 04:25:05 UTC (rev 233300)
@@ -1,3 +1,13 @@
+2018-06-27 Timothy Hatcher <[email protected]>
+
+ Don't expose new semantic -apple-system color keywords on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=187080
+ rdar://problem/41505699
+
+ Reviewed by Tim Horton.
+
+ * DerivedSources.make: Use gnu++14, since gnu++17 is giving errors on macOS 10.12.
+
2018-06-27 Megan Gardner <[email protected]>
Fix IBeam issues with iPad apps on Mac
Modified: trunk/Source/WebKit/DerivedSources.make (233299 => 233300)
--- trunk/Source/WebKit/DerivedSources.make 2018-06-28 04:19:32 UTC (rev 233299)
+++ trunk/Source/WebKit/DerivedSources.make 2018-06-28 04:25:05 UTC (rev 233300)
@@ -268,7 +268,7 @@
#
ifeq ($(OS),MACOS)
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS ' | cut -d' ' -f3), 1)
AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform iOS
else
AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform macOS
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
