Attachment 371704 Details for Bug 198687 – Patch

[patch] Patch

bug-198687-20190608230526.patch (text/plain), 35.98 KB, created by Timothy Hatcher on 2019-06-08 23:05:27 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2019-06-08 23:05:27 PDT

Size: 35.98 KB

patch

obsolete

>Subversion Revision: 246212
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 636232c50d989e5408aeb1487ce9fe10a4c880ce..f92be64d9c49875edb0b2a13b6e483ae6aef164e 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-07  Timothy Hatcher  <timothy@apple.com>
>+
>+        Integrate dark mode support for iOS.
>+        https://bugs.webkit.org/show_bug.cgi?id=198687
>+        rdar://problem/51545643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-06-07  Tadeu Zagallo  <tzagallo@apple.com>
> 
>         AI should get GetterSetter structure from the base's GlobalObject for GetGetterSetterByOffset
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index ab9b3920492658ff0b8b04957dffec91f6c2aa92..9e9c8c949f9e8693f5d4345252cffc50b8677f5a 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-07  Timothy Hatcher  <timothy@apple.com>
>+
>+        Integrate dark mode support for iOS.
>+        https://bugs.webkit.org/show_bug.cgi?id=198687
>+        rdar://problem/51545643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Platform.h:
>+
> 2019-06-06  Caio Lima  <ticaiolima@gmail.com>
> 
>         [JSCOnly] JSCOnly port is not building on macOS
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 733d4ade2e3b101eedaa14acb266db037ae671a9..dd66260a138ad3f3c44bc2a4e4804643b83f7967 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,26 @@
>+2019-06-07  Timothy Hatcher  <timothy@apple.com>
>+
>+        Integrate dark mode support for iOS.
>+        https://bugs.webkit.org/show_bug.cgi?id=198687
>+        rdar://problem/51545643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tests: css-dark-mode
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * SourcesCocoa.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * platform/graphics/cocoa/FontCascadeCocoa.mm:
>+        (WebCore::showLetterpressedGlyphsWithAdvances):
>+        * platform/ios/LocalCurrentTraitCollection.h: Added.
>+        * platform/ios/LocalCurrentTraitCollection.mm: Added.
>+        * platform/ios/PasteboardIOS.mm:
>+        * rendering/RenderThemeIOS.mm:
>+        (WebCore::RenderThemeIOS::systemColor const):
>+        * rendering/RenderThemeMac.mm:
>+        (WebCore::RenderThemeMac::systemColor const):
>+
> 2019-06-07  Youenn Fablet  <youenn@apple.com>
> 
>         A MediaStreamTrack cannot modify whether being a capture track or not
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index bc63a619f1841fb976ee5258d2dce0d85878590d..4e8e1e396a7383b3e3421315313cc615471ecb94 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-07  Timothy Hatcher  <timothy@apple.com>
>+
>+        Integrate dark mode support for iOS.
>+        https://bugs.webkit.org/show_bug.cgi?id=198687
>+        rdar://problem/51545643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * pal/spi/ios/UIKitSPI.h:
>+
> 2019-06-05  Alex Christensen  <achristensen@webkit.org>
> 
>         Progress towards resurrecting Mac CMake build
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1f4953a4f249882065b309a509e6765d74a26d34..082c373f617c6c45c45f98ead0ea5a2430ede590 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-06-07  Timothy Hatcher  <timothy@apple.com>
>+
>+        Integrate dark mode support for iOS.
>+        https://bugs.webkit.org/show_bug.cgi?id=198687
>+        rdar://problem/51545643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _effectiveAppearanceIsDark]):
>+        (-[WKWebView _effectiveAppearanceIsInactive]):
>+        (-[WKWebView _dynamicUserInterfaceTraitDidChange]):
>+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
>+        * UIProcess/ios/PageClientImplIOS.h:
>+        * UIProcess/ios/PageClientImplIOS.mm:
>+        (WebKit::PageClientImpl::effectiveAppearanceIsDark const):
>+        (WebKit::PageClientImpl::effectiveAppearanceIsInactive const):
>+        * UIProcess/ios/WKPasswordView.mm:
>+        (-[WKPasswordView showInScrollView:]):
>+        (configureScrollView): Deleted.
>+
> 2019-06-07  Brent Fulgham  <bfulgham@apple.com>
> 
>         [iOS] Update sandboxes to address iokit-get-property errors
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index e8d099365b10c918d5ccac368401dda01953947b..38fdd7f22b1f5a21b2d12265f72781cced506001 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1 +1,11 @@
>+2019-06-07  Timothy Hatcher  <timothy@apple.com>
>+
>+        Integrate dark mode support for iOS.
>+        https://bugs.webkit.org/show_bug.cgi?id=198687
>+        rdar://problem/51545643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> == Rolled over to ChangeLog-2019-06-05 ==
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index 62ffb4a86f5fa6fc8d7ef3a53880505487dc3f5d..5bad0f685fbcccb9adc5fa79b2f8285204658bc6 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -115,6 +115,8 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> 
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
>+ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 332eb3e7a8c223d7c091b6eabfaa1d8a8bc24c8d..83d36730df89392ed47bbee1ed2f4ef675f67091 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1431,7 +1431,7 @@
> #endif
> #endif
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(GTK)
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(GTK)
> #define HAVE_OS_DARK_MODE_SUPPORT 1
> #endif
> 
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 62ffb4a86f5fa6fc8d7ef3a53880505487dc3f5d..5bad0f685fbcccb9adc5fa79b2f8285204658bc6 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -115,6 +115,8 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> 
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
>+ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
>diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>index 62ffb4a86f5fa6fc8d7ef3a53880505487dc3f5d..5bad0f685fbcccb9adc5fa79b2f8285204658bc6 100644
>--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>@@ -115,6 +115,8 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> 
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
>+ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
>diff --git a/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h b/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>index 12f351a2155c96a3a62f18ffc645fbcb21bf94bb..03c7a723514caa5976ddec7c5b276214dde7e474 100644
>--- a/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>@@ -161,4 +161,10 @@ NS_ASSUME_NONNULL_END
> @end
> #endif
> 
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+@interface UIColor (UIColorInternal)
>++ (UIColor *)tableCellDefaultSelectionTintColor;
>+@end
>+#endif
>+
> #endif // PLATFORM(IOS_FAMILY)
>diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
>index bd29e5b48cbd60a92435f3cab1be1b7c8fafbb81..60483037d205fa32d82810e8924eeb7587fdadd7 100644
>--- a/Source/WebCore/SourcesCocoa.txt
>+++ b/Source/WebCore/SourcesCocoa.txt
>@@ -383,6 +383,7 @@ platform/ios/LegacyTileGrid.mm
> platform/ios/LegacyTileGridTile.mm
> platform/ios/LegacyTileLayer.mm
> platform/ios/LegacyTileLayerPool.mm
>+platform/ios/LocalCurrentTraitCollection.mm
> platform/ios/LowPowerModeNotifierIOS.mm
> platform/ios/PasteboardIOS.mm
> platform/ios/PlatformEventFactoryIOS.mm @no-unify
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 7b69a86dc7928a7fc65c178f507aebbd862b11a7..0e46120cf94c32516fe08a95921d7b93b29292be 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -621,6 +621,7 @@
> 		1C21E57D183ED1FF001C289D /* IOSurfacePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C21E57B183ED1FF001C289D /* IOSurfacePool.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1C24EEA51C729CE40080F8FC /* FontFaceSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C24EEA31C729CE40080F8FC /* FontFaceSet.h */; };
> 		1C24EEA91C72A7B40080F8FC /* JSFontFaceSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C24EEA71C72A7B40080F8FC /* JSFontFaceSet.h */; };
>+		1C43DE6B22AB4B8A001527D9 /* LocalCurrentTraitCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C43DE6822AB4B8A001527D9 /* LocalCurrentTraitCollection.h */; };
> 		1C6626111C6E7CA600AB527C /* FontFace.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C66260F1C6E7CA600AB527C /* FontFace.h */; };
> 		1C73A7132185757E004CCEA5 /* TextUnderlineOffset.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CB6B4FB217B83940093B9CD /* TextUnderlineOffset.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1C73A71521857587004CCEA5 /* TextDecorationThickness.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CB6B4F8217B83930093B9CD /* TextDecorationThickness.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -6381,6 +6382,8 @@
> 		1C33277121CF0BE1000DC9F2 /* WHLSLNamedType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLNamedType.h; sourceTree = "<group>"; };
> 		1C33277221CF0D2E000DC9F2 /* WHLSLUnnamedType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLUnnamedType.h; sourceTree = "<group>"; };
> 		1C3969CF1B74211E002BCFA7 /* FontCacheCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontCacheCoreText.cpp; sourceTree = "<group>"; };
>+		1C43DE6822AB4B8A001527D9 /* LocalCurrentTraitCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalCurrentTraitCollection.h; sourceTree = "<group>"; };
>+		1C43DE6A22AB4B8A001527D9 /* LocalCurrentTraitCollection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalCurrentTraitCollection.mm; sourceTree = "<group>"; };
> 		1C59B0182238687900853805 /* WHLSLScopedSetAdder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLScopedSetAdder.h; sourceTree = "<group>"; };
> 		1C66260E1C6E7CA600AB527C /* FontFace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFace.cpp; sourceTree = "<group>"; };
> 		1C66260F1C6E7CA600AB527C /* FontFace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFace.h; sourceTree = "<group>"; };
>@@ -22331,6 +22334,8 @@
> 				E4B65A5D132FADB60070E7BE /* LegacyTileLayer.mm */,
> 				E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */,
> 				E4E39AFC1330EFC5003AB274 /* LegacyTileLayerPool.mm */,
>+				1C43DE6822AB4B8A001527D9 /* LocalCurrentTraitCollection.h */,
>+				1C43DE6A22AB4B8A001527D9 /* LocalCurrentTraitCollection.mm */,
> 				46EFAF0D1E5FB9C200E7F34B /* LowPowerModeNotifierIOS.mm */,
> 				E45390190EAFCACA003695C8 /* PasteboardIOS.mm */,
> 				26601EBD14B3B9AD0012C0FE /* PlatformEventFactoryIOS.h */,
>@@ -30521,6 +30526,7 @@
> 				51E6821016387302003BBF3C /* LoaderStrategy.h in Headers */,
> 				8A12E35D11FA33280025836A /* LoadTiming.h in Headers */,
> 				06E81ED70AB5D5E900C87837 /* LocalCurrentGraphicsContext.h in Headers */,
>+				1C43DE6B22AB4B8A001527D9 /* LocalCurrentTraitCollection.h in Headers */,
> 				445775E520472F73008DCE5D /* LocalDefaultSystemAppearance.h in Headers */,
> 				F5973DE015CFB2030027F804 /* LocaleMac.h in Headers */,
> 				7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */,
>diff --git a/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
>index 3b2f141cd4bbf9fee3f4c2a397afacc3865914ab..c6e1a29552a7ced09908bc960f9974146cd145f9 100644
>--- a/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
>@@ -129,8 +129,8 @@ static void showLetterpressedGlyphsWithAdvances(const FloatPoint& point, const F
>         styleConfiguration.useSimplifiedEffect = YES;
>     }
> 
>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/FontCascadeCocoaAdditions.mm>)
>-#include <WebKitAdditions/FontCascadeCocoaAdditions.mm>
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+    styleConfiguration.appearanceName = coreContext.useDarkAppearance() ? @"UIAppearanceDark" : @"UIAppearanceLight";
> #endif
> 
>     CGContextSetFont(context, adoptCF(CTFontCopyGraphicsFont(ctFont, nullptr)).get());
>diff --git a/Source/WebCore/platform/ios/LocalCurrentTraitCollection.h b/Source/WebCore/platform/ios/LocalCurrentTraitCollection.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..626b014402f63c42bcc49cb01caf6000ff4d1eee
>--- /dev/null
>+++ b/Source/WebCore/platform/ios/LocalCurrentTraitCollection.h
>@@ -0,0 +1,76 @@
>+/*
>+ * Copyright (C) 2019 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#include <wtf/Noncopyable.h>
>+#include <wtf/RetainPtr.h>
>+
>+#if PLATFORM(IOS_FAMILY)
>+
>+OBJC_CLASS UITraitCollection;
>+
>+namespace WebCore {
>+
>+// This class automatically saves and restores the current UITraitCollection for
>+// functions which call out into UIKit and rely on the current UITraitCollection being set
>+class LocalCurrentTraitCollection {
>+    WTF_MAKE_NONCOPYABLE(LocalCurrentTraitCollection);
>+
>+public:
>+    WEBCORE_EXPORT LocalCurrentTraitCollection(bool useDarkAppearance, bool useBaseLevelAppearance);
>+    WEBCORE_EXPORT LocalCurrentTraitCollection(UITraitCollection *);
>+    WEBCORE_EXPORT ~LocalCurrentTraitCollection();
>+
>+    bool usingDarkAppearance() const
>+    {
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+        return m_usingDarkAppearance;
>+#else
>+        return false;
>+#endif
>+    }
>+
>+    bool usingBaseLevelAppearance() const
>+    {
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+        return m_usingBaseLevelAppearance;
>+#else
>+        return true;
>+#endif
>+    }
>+
>+private:
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+    RetainPtr<UITraitCollection> m_savedTraitCollection;
>+    bool m_usingDarkAppearance { false };
>+    bool m_usingBaseLevelAppearance { true };
>+#endif
>+};
>+
>+}
>+
>+#endif // PLATFORM(IOS_FAMILY)
>+
>diff --git a/Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm b/Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm
>new file mode 100644
>index 0000000000000000000000000000000000000000..9dd2317677885c466cd66153789e08d3dcd4bf0b
>--- /dev/null
>+++ b/Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm
>@@ -0,0 +1,75 @@
>+/*
>+ * Copyright (C) 2019 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
>+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "LocalCurrentTraitCollection.h"
>+
>+#if PLATFORM(IOS_FAMILY)
>+
>+#include <pal/ios/UIKitSoftLink.h>
>+#include <UIKit/UITraitCollection_Private.h>
>+
>+namespace WebCore {
>+
>+LocalCurrentTraitCollection::LocalCurrentTraitCollection(bool useDarkAppearance, bool useBaseLevelAppearance)
>+{
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+    m_savedTraitCollection = [PAL::getUITraitCollectionClass() _currentTraitCollection];
>+    m_usingDarkAppearance = useDarkAppearance;
>+    m_usingBaseLevelAppearance = useBaseLevelAppearance;
>+
>+    auto userInterfaceStyleTrait = [PAL::getUITraitCollectionClass() traitCollectionWithUserInterfaceStyle:m_usingDarkAppearance ? UIUserInterfaceStyleDark : UIUserInterfaceStyleLight];
>+    auto backgroundLevelTrait = [PAL::getUITraitCollectionClass() traitCollectionWithUserInterfaceLevel:m_usingBaseLevelAppearance ? UIUserInterfaceLevelBase : UIUserInterfaceLevelElevated];
>+    auto newTraitCollection = [PAL::getUITraitCollectionClass() traitCollectionWithTraitsFromCollections:@[ m_savedTraitCollection.get(), userInterfaceStyleTrait, backgroundLevelTrait ]];
>+
>+    [PAL::getUITraitCollectionClass() _setCurrentTraitCollection:newTraitCollection];
>+#else
>+    UNUSED_PARAM(useDarkAppearance);
>+    UNUSED_PARAM(useBaseLevelAppearance);
>+#endif
>+}
>+
>+LocalCurrentTraitCollection::LocalCurrentTraitCollection(UITraitCollection *traitCollection)
>+{
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+    m_savedTraitCollection = [PAL::getUITraitCollectionClass() _currentTraitCollection];
>+    m_usingDarkAppearance = traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
>+    m_usingBaseLevelAppearance = traitCollection.userInterfaceLevel == UIUserInterfaceLevelBase;
>+
>+    [PAL::getUITraitCollectionClass() _setCurrentTraitCollection:traitCollection];
>+#else
>+    UNUSED_PARAM(traitCollection);
>+#endif
>+}
>+
>+LocalCurrentTraitCollection::~LocalCurrentTraitCollection()
>+{
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+    [PAL::getUITraitCollectionClass() _setCurrentTraitCollection:m_savedTraitCollection.get()];
>+#endif
>+}
>+
>+}
>+
>+#endif // PLATFORM(IOS_FAMILY)
>diff --git a/Source/WebCore/platform/ios/PasteboardIOS.mm b/Source/WebCore/platform/ios/PasteboardIOS.mm
>index 8e005cab51abc3d631cd54b3f31d0338ca8f5e4e..c7f609b93a1ecfddf46902cfe40463d0329c8b76 100644
>--- a/Source/WebCore/platform/ios/PasteboardIOS.mm
>+++ b/Source/WebCore/platform/ios/PasteboardIOS.mm
>@@ -41,7 +41,7 @@
> #import <wtf/URL.h>
> #import <wtf/text/StringHash.h>
> 
>-@interface NSAttributedString (NSAttributedStringKitAdditions)
>+@interface NSAttributedString (NSAttributedStringInternal)
> - (id)initWithRTF:(NSData *)data documentAttributes:(NSDictionary **)dict;
> - (id)initWithRTFD:(NSData *)data documentAttributes:(NSDictionary **)dict;
> - (NSData *)RTFFromRange:(NSRange)range documentAttributes:(NSDictionary *)dict;
>diff --git a/Source/WebCore/rendering/RenderThemeIOS.mm b/Source/WebCore/rendering/RenderThemeIOS.mm
>index 0e639f8a3d12ce6ac80142dd9fcdd019517d38ba..9da48fe9aaf9977b3d27f9c0e1562b6dd624a1a2 100644
>--- a/Source/WebCore/rendering/RenderThemeIOS.mm
>+++ b/Source/WebCore/rendering/RenderThemeIOS.mm
>@@ -52,6 +52,7 @@
> #import "HTMLSelectElement.h"
> #import "IOSurface.h"
> #import "Icon.h"
>+#import "LocalCurrentTraitCollection.h"
> #import "LocalizedDateCache.h"
> #import "NodeRenderStyle.h"
> #import "Page.h"
>@@ -79,10 +80,6 @@
> #import <wtf/RefPtr.h>
> #import <wtf/StdLibExtras.h>
> 
>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/RenderThemeIOSAdditions.mm>)
>-#include <WebKitAdditions/RenderThemeIOSAdditions.mm>
>-#endif
>-
> @interface WebCoreRenderThemeBundle : NSObject
> @end
> 
>@@ -1446,16 +1443,54 @@ Color RenderThemeIOS::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::O
> 
>     auto& cache = colorCache(options);
>     return cache.systemStyleColors.ensure(cssValueID, [this, cssValueID, options] () -> Color {
>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/RenderThemeIOSSystemColorAdditions.mm>)
>-#include <WebKitAdditions/RenderThemeIOSSystemColorAdditions.mm>
>-#endif
>+        const bool useDarkAppearance = options.contains(StyleColor::Options::UseDarkAppearance);
>+        const bool useInactiveAppearance = options.contains(StyleColor::Options::UseInactiveAppearance);
>+        LocalCurrentTraitCollection localTraitCollection(useDarkAppearance, useInactiveAppearance);
> 
>         auto cssColorToSelector = [cssValueID] () -> SEL {
>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/RenderThemeIOSColorToSelectorAdditions.mm>)
>-#include <WebKitAdditions/RenderThemeIOSColorToSelectorAdditions.mm>
>-#endif
>-
>             switch (cssValueID) {
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+            case CSSValueText:
>+            case CSSValueAppleSystemLabel:
>+            case CSSValueAppleSystemHeaderText:
>+                return @selector(labelColor);
>+            case CSSValueAppleSystemSecondaryLabel:
>+                return @selector(secondaryLabelColor);
>+            case CSSValueAppleSystemTertiaryLabel:
>+                return @selector(tertiaryLabelColor);
>+            case CSSValueAppleSystemQuaternaryLabel:
>+                return @selector(quaternaryLabelColor);
>+            case CSSValueAppleSystemPlaceholderText:
>+                return @selector(placeholderTextColor);
>+            case CSSValueWebkitControlBackground:
>+            case CSSValueAppleSystemControlBackground:
>+            case CSSValueAppleSystemTextBackground:
>+            case CSSValueAppleSystemBackground:
>+                return @selector(systemBackgroundColor);
>+            case CSSValueAppleSystemSecondaryBackground:
>+                return @selector(secondarySystemBackgroundColor);
>+            case CSSValueAppleSystemTertiaryBackground:
>+                return @selector(tertiarySystemBackgroundColor);
>+            case CSSValueAppleSystemGroupedBackground:
>+                return @selector(systemGroupedBackgroundColor);
>+            case CSSValueAppleSystemSecondaryGroupedBackground:
>+                return @selector(secondarySystemGroupedBackgroundColor);
>+            case CSSValueAppleSystemTertiaryGroupedBackground:
>+                return @selector(tertiarySystemGroupedBackgroundColor);
>+            case CSSValueAppleSystemGrid:
>+            case CSSValueAppleSystemSeparator:
>+            case CSSValueAppleSystemContainerBorder:
>+                return @selector(separatorColor);
>+            case CSSValueAppleSystemSelectedContentBackground:
>+            case CSSValueAppleSystemUnemphasizedSelectedContentBackground:
>+                return @selector(tableCellDefaultSelectionTintColor);
>+            case CSSValueAppleSystemBrown:
>+                return @selector(systemBrownColor);
>+            case CSSValueAppleSystemIndigo:
>+                return @selector(systemIndigoColor);
>+#endif
>+            case CSSValueAppleSystemTeal:
>+                return @selector(systemTealColor);
>             case CSSValueAppleWirelessPlaybackTargetActive:
>             case CSSValueAppleSystemBlue:
>                 return @selector(systemBlueColor);
>diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm
>index 7667de071c3882dee7ef0a3087a036eaa643e24d..3e379cf750d8bdd713effa72409daaf816d12d2f 100644
>--- a/Source/WebCore/rendering/RenderThemeMac.mm
>+++ b/Source/WebCore/rendering/RenderThemeMac.mm
>@@ -713,6 +713,12 @@ Color RenderThemeMac::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::O
>                 return @selector(windowFrameTextColor);
>             case CSSValueAppleSystemHeaderText:
>                 return @selector(headerTextColor);
>+            case CSSValueAppleSystemBackground:
>+            case CSSValueAppleSystemSecondaryBackground:
>+            case CSSValueAppleSystemTertiaryBackground:
>+            case CSSValueAppleSystemGroupedBackground:
>+            case CSSValueAppleSystemSecondaryGroupedBackground:
>+            case CSSValueAppleSystemTertiaryGroupedBackground:
>             case CSSValueAppleSystemTextBackground:
>                 return @selector(textBackgroundColor);
>             case CSSValueAppleSystemControlBackground:
>diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>index 62ffb4a86f5fa6fc8d7ef3a53880505487dc3f5d..5bad0f685fbcccb9adc5fa79b2f8285204658bc6 100644
>--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>@@ -115,6 +115,8 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> 
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
>+ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index fe8ed889272a2deb5438cc5a1ea00bb29899b41f..84f53af1b649f4abef106727efdc46cfcfec90c5 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -473,11 +473,21 @@ - (BOOL)_isRetainingActiveFocusedState
>     return _focusPreservationCount || _activeFocusedStateRetainCount;
> }
> 
>-#endif
>+- (BOOL)_effectiveAppearanceIsDark
>+{
>+    return self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
>+}
> 
>-#if USE(APPLE_INTERNAL_SDK)
>-#include <WebKitAdditions/WKWebViewInternalAdditions.mm>
>+- (BOOL)_effectiveAppearanceIsInactive
>+{
>+#if HAVE(OS_DARK_MODE_SUPPORT) && !PLATFORM(WATCHOS)
>+    return self.traitCollection.userInterfaceLevel != UIUserInterfaceLevelElevated;
>+#else
>+    return NO;
> #endif
>+}
>+
>+#endif // PLATFORM(IOS_FAMILY)
> 
> static bool shouldRequireUserGestureToLoadVideo()
> {
>@@ -7244,11 +7254,15 @@ - (void)_simulateTextEntered:(NSString *)text
>     [_contentView _simulateTextEntered:text];
> }
> 
>-#endif // PLATFORM(IOS_FAMILY)
>+- (void)_dynamicUserInterfaceTraitDidChange
>+{
>+    if (!_page)
>+        return;
>+    _page->effectiveAppearanceDidChange();
>+    [self _updateScrollViewBackground];
>+}
> 
>-#if USE(APPLE_INTERNAL_SDK)
>-#include <WebKitAdditions/WKWebViewAdditions.mm>
>-#endif
>+#endif // PLATFORM(IOS_FAMILY)
> 
> - (BOOL)_beginBackSwipeForTesting
> {
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>index 56fe5c21cf41d0a068510b5940572fcc83cd8e11..a8d153e1937324fd93cdc3de58337d8b925b7ac9 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>@@ -169,11 +169,10 @@ struct PrintInfo;
> @property (nonatomic, readonly) UIEdgeInsets _computedObscuredInset;
> @property (nonatomic, readonly) UIEdgeInsets _computedUnobscuredSafeAreaInset;
> @property (nonatomic, readonly, getter=_isRetainingActiveFocusedState) BOOL _retainingActiveFocusedState;
>-#endif
> 
>-#if USE(APPLE_INTERNAL_SDK)
>-#include <WebKitAdditions/WKWebViewInternalAdditions.h>
>-#endif
>+- (BOOL)_effectiveAppearanceIsDark;
>+- (BOOL)_effectiveAppearanceIsInactive;
>+#endif // PLATFORM(IOS_FAMILY)
> 
> #if ENABLE(ATTACHMENT_ELEMENT)
> - (void)_didRemoveAttachment:(API::Attachment&)attachment;
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>index 413c93b3ac05e6c5f6537d49f5128235ef5c4a0f..32871854b7a5d6f006d363faa5e6d6ef967fc232 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>@@ -141,9 +141,8 @@ private:
>         
>     void didPerformDictionaryLookup(const WebCore::DictionaryPopupInfo&) override;
> 
>-#if USE(APPLE_INTERNAL_SDK)
>-#include <WebKitAdditions/PageClientImplIOSAdditions.h>
>-#endif
>+    bool effectiveAppearanceIsDark() const override;
>+    bool effectiveAppearanceIsInactive() const override;
> 
>     void couldNotRestorePageState() override;
>     void restorePageState(Optional<WebCore::FloatPoint>, const WebCore::FloatPoint&, const WebCore::FloatBoxExtent&, double) override;
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>index 267bd43bdd101cda946f8488a175333346cdd110..9dc5a5a384bcb9bd62e06a3c41cf61e5c940a7f5 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>@@ -476,9 +476,15 @@ void PageClientImpl::didPerformDictionaryLookup(const DictionaryPopupInfo& dicti
> #endif // ENABLE(REVEAL)
> }
> 
>-#if USE(APPLE_INTERNAL_SDK)
>-#include <WebKitAdditions/PageClientImplIOSAdditions.mm>
>-#endif
>+bool PageClientImpl::effectiveAppearanceIsDark() const
>+{
>+    return [m_webView _effectiveAppearanceIsDark];
>+}
>+
>+bool PageClientImpl::effectiveAppearanceIsInactive() const
>+{
>+    return [m_webView _effectiveAppearanceIsInactive];
>+}
> 
> void PageClientImpl::setRemoteLayerTreeRootNode(RemoteLayerTreeNode* rootNode)
> {
>diff --git a/Source/WebKit/UIProcess/ios/WKPasswordView.mm b/Source/WebKit/UIProcess/ios/WKPasswordView.mm
>index 0111ec5046de5f93492405e979a5ff505d23a0dd..b1a49a14b2df0042b69bf4920b82e96c5abc463e 100644
>--- a/Source/WebKit/UIProcess/ios/WKPasswordView.mm
>+++ b/Source/WebKit/UIProcess/ios/WKPasswordView.mm
>@@ -35,16 +35,6 @@
> #import <wtf/RetainPtr.h>
> #import <wtf/text/WTFString.h>
> 
>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKPasswordViewAdditions.mm>)
>-#include <WebKitAdditions/WKPasswordViewAdditions.mm>
>-#else
>-static void configureScrollView(UIScrollView *scrollView)
>-{
>-    [scrollView setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
>-}
>-#endif
>-
>-
> const CGFloat passwordEntryFieldPadding = 10;
> 
> @interface WKPasswordView () <UIDocumentPasswordViewDelegate>
>@@ -111,7 +101,11 @@ - (void)showInScrollView:(UIScrollView *)scrollView
>     [_scrollView setZoomScale:1];
>     [_scrollView setContentSize:self.frame.size];
> 
>-    configureScrollView(_scrollView.get());
>+#if HAVE(OS_DARK_MODE_SUPPORT)
>+    [_scrollView setBackgroundColor:UIColor.systemGroupedBackgroundColor];
>+#else
>+    [_scrollView setBackgroundColor:UIColor.groupTableViewBackgroundColor];
>+#endif
> 
>     [scrollView addSubview:self];
> }
>diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>index 62ffb4a86f5fa6fc8d7ef3a53880505487dc3f5d..5bad0f685fbcccb9adc5fa79b2f8285204658bc6 100644
>--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>@@ -115,6 +115,8 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> 
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
>+ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e7796e197e0b351c296f4cacd9086c4310cf097a..8d796f9b518ca1aff1d6a503a4bbf4cd5af27112 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-07  Timothy Hatcher  <timothy@apple.com>
>+
>+        Integrate dark mode support for iOS.
>+        https://bugs.webkit.org/show_bug.cgi?id=198687
>+        rdar://problem/51545643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
>+
> 2019-06-07  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] At least 6 API tests are failing due to an exception when writing NSAttributedString to the pasteboard
>diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>index 62ffb4a86f5fa6fc8d7ef3a53880505487dc3f5d..5bad0f685fbcccb9adc5fa79b2f8285204658bc6 100644
>--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>@@ -115,6 +115,8 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> 
> ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
>+ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
>+ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
> ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
> 
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index e388554944a6a22a2340a02a771e957f2c37ca8c..ed2c273e1e6f2284c0e683cbc77457f8113505df 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-08  Timothy Hatcher  <timothy@apple.com>
>+
>+        Integrate dark mode support for iOS.
>+        https://bugs.webkit.org/show_bug.cgi?id=198687
>+        rdar://problem/51545643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/ios/TestExpectations:
>+
> 2019-06-07  Shawn Roberts  <sroberts@apple.com>
> 
>         http/tests/storageAccess/request-and-grant-access-then-navigate-same-site-should-have-access.html is a flaky timeout
>diff --git a/LayoutTests/platform/ios/TestExpectations b/LayoutTests/platform/ios/TestExpectations
>index 25d58bceda6824a95656ae424d37179b8221487c..e849fbc3dbb26fcabd0d720996cda080a1e77e6c 100644
>--- a/LayoutTests/platform/ios/TestExpectations
>+++ b/LayoutTests/platform/ios/TestExpectations
>@@ -1144,6 +1144,9 @@ fast/css/variables/env/ios [ Pass ]
> # Dark mode not supported on iOS
> css-dark-mode [ Skip ]
> 
>+# Test Dark Mode CSS support for light mode on older systems.
>+css-dark-mode/older-systems [ Pass ]
>+
> ###
> # Known failures
> ##
>@@ -3278,4 +3281,4 @@ fast/scrolling/ipad/overflow-scrolling-touch-enabled-stacking-modern-compatibili
> webkit.org/b/197778 [ Debug ] webgl/2.0.0/conformance2/attribs/gl-vertexattribipointer.html [ Slow ]
> 
> # Was unskipped, but now has missing results in iOS . Skipping on iOS only.
>-media/controls-after-reload.html [ Skip ]
>\ No newline at end of file
>+media/controls-after-reload.html [ Skip ]

Actions: View | Formatted Diff | Diff

Attachments on bug 198687: 371702 | 371704 | 371705 | 371709 | 371712 | 371715