Attachment 343788 Details for Bug 187080 – Patch

[patch] Patch

bug-187080-20180627204557.patch (text/plain), 5.36 KB, created by Timothy Hatcher on 2018-06-27 20:46:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2018-06-27 20:46:01 PDT

Size: 5.36 KB

patch

obsolete

>Subversion Revision: 233297
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0c42e42b7abb6512f831cc96a94b1fa04498f4aa..4d5b27e5821b7e5105171aa8b4d0f249f5095eb3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-27  Timothy Hatcher  <timothy@apple.com>
>+
>+        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  <zalan@apple.com>
> 
>         [LFC] Align inFlowNonReplacedHeightAndMargin() style with the rest of the compute functions.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 364f1d389ede2a42519c7873734e24daca1dbdf4..01562f73fb2359755eeed4b0e60e4f9c67371a44 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-06-27  Timothy Hatcher  <timothy@apple.com>
>+
>+        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  <megan_gardner@apple.com>
> 
>         Fix IBeam issues with iPad apps on Mac
>diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
>index cddfdcd749fa709118438c9cbafec39401b80f3f..239f1ae83ebbd7c8e51ee1176d4a6ba9c2fc8842 100644
>--- a/Source/WebCore/DerivedSources.make
>+++ b/Source/WebCore/DerivedSources.make
>@@ -1017,25 +1017,25 @@ ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
> 	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
> 
>diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in
>index 0ae57ffe113263c503aa93e3a3f4301032df8831..01bdbaed347b911f010bd3ff9c52000b204c80d0 100644
>--- a/Source/WebCore/css/CSSValueKeywords.in
>+++ b/Source/WebCore/css/CSSValueKeywords.in
>@@ -222,6 +222,7 @@ threedshadow
> 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 @@ windowtext
> -apple-system-quaternary-label
> -apple-system-grid
> -apple-system-separator
>+#endif
> -apple-wireless-playback-target-active
> -apple-system-blue
> -apple-system-brown
>diff --git a/Source/WebKit/DerivedSources.make b/Source/WebKit/DerivedSources.make
>index f78d02747acb5ebdb72eb29116a8715f65817427..1e4cc51d8f90f4c33e3b8c840f653533baccbe45 100644
>--- a/Source/WebKit/DerivedSources.make
>+++ b/Source/WebKit/DerivedSources.make
>@@ -268,7 +268,7 @@ AUTOMATION_PROTOCOL_OUTPUT_FILES = \
> #
> 
> 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

Actions: View | Formatted Diff | Diff

Attachments on bug 187080: 343684 | 343788