Diff
Modified: trunk/LayoutTests/ChangeLog (243168 => 243169)
--- trunk/LayoutTests/ChangeLog 2019-03-19 20:35:14 UTC (rev 243168)
+++ trunk/LayoutTests/ChangeLog 2019-03-19 20:56:31 UTC (rev 243169)
@@ -1,3 +1,13 @@
+2019-03-19 Timothy Hatcher <[email protected]>
+
+ REGRESSION (r239904): Update dark mode defines in a few places that got missed.
+ https://bugs.webkit.org/show_bug.cgi?id=195958
+
+ Reviewed by Megan Gardner.
+
+ * inspector/css/shadow-scoped-style-expected.txt: Rebaseline.
+ * platform/mac/printing/width-overflow-expected.txt: Rebaseline.
+
2019-03-19 Joanmarie Diggs <[email protected]>
REGRESSION(r241586:r241590): [GTK] Accessibility tests in need of rebase
Modified: trunk/LayoutTests/inspector/css/shadow-scoped-style-expected.txt (243168 => 243169)
--- trunk/LayoutTests/inspector/css/shadow-scoped-style-expected.txt 2019-03-19 20:35:14 UTC (rev 243168)
+++ trunk/LayoutTests/inspector/css/shadow-scoped-style-expected.txt 2019-03-19 20:56:31 UTC (rev 243169)
@@ -21,8 +21,6 @@
}
address, article, aside, div, footer, header, hgroup, layer, main, nav, section {
}
-html {
-}
-- Running test case: CSS.ShadowScopedStyle.ElementInShadowTree
PASS: Node should not have shadow roots.
Modified: trunk/LayoutTests/platform/mac/printing/width-overflow-expected.txt (243168 => 243169)
--- trunk/LayoutTests/platform/mac/printing/width-overflow-expected.txt 2019-03-19 20:35:14 UTC (rev 243168)
+++ trunk/LayoutTests/platform/mac/printing/width-overflow-expected.txt 2019-03-19 20:56:31 UTC (rev 243169)
@@ -8,11 +8,11 @@
text run at (0,0) width 765: "To run this test manually, print this page. If the right side of any lines is printed without being truncated, the test passes."
RenderBlock {DIV} at (0,34) size 1300x2218
RenderBlock {P} at (0,0) size 1300x72
- RenderText {#text} at (0,0) size 1289x72
- text run at (0,0) width 1289: "A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A"
- text run at (0,18) width 1289: "A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A"
- text run at (0,36) width 1289: "A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A"
- text run at (0,54) width 526: "A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A"
+ RenderText {#text} at (0,0) size 1288x72
+ text run at (0,0) width 1288: "A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A"
+ text run at (0,18) width 1288: "A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A"
+ text run at (0,36) width 1288: "A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A"
+ text run at (0,54) width 525: "A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A A"
RenderBlock {P} at (0,88) size 1300x72
RenderText {#text} at (0,0) size 1288x72
text run at (0,0) width 1288: "B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B"
@@ -96,9 +96,9 @@
text run at (0,36) width 1288: "O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O"
text run at (0,54) width 790: "O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O"
RenderBlock {P} at (0,1284) size 1300x54
- RenderText {#text} at (0,0) size 1290x54
- text run at (0,0) width 1290: "P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P"
- text run at (0,18) width 1290: "P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P"
+ RenderText {#text} at (0,0) size 1289x54
+ text run at (0,0) width 1289: "P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P"
+ text run at (0,18) width 1289: "P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P"
text run at (0,36) width 1105: "P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P"
RenderBlock {P} at (0,1354) size 1300x72
RenderText {#text} at (0,0) size 1288x72
@@ -122,7 +122,7 @@
text run at (0,0) width 1292: "T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T"
text run at (0,18) width 1292: "T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T"
text run at (0,36) width 1292: "T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T"
- text run at (0,54) width 159: "T T T T T T T T T T T T"
+ text run at (0,54) width 158: "T T T T T T T T T T T T"
RenderBlock {P} at (0,1688) size 1300x72
RenderText {#text} at (0,0) size 1288x72
text run at (0,0) width 1288: "U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U U"
@@ -153,7 +153,7 @@
text run at (0,0) width 1299: "Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y"
text run at (0,18) width 1299: "Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y"
text run at (0,36) width 1299: "Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y"
- text run at (0,54) width 581: "Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y"
+ text run at (0,54) width 580: "Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y"
RenderBlock {P} at (0,2146) size 1300x72
RenderText {#text} at (0,0) size 1291x72
text run at (0,0) width 1291: "Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z"
Modified: trunk/Source/WebCore/ChangeLog (243168 => 243169)
--- trunk/Source/WebCore/ChangeLog 2019-03-19 20:35:14 UTC (rev 243168)
+++ trunk/Source/WebCore/ChangeLog 2019-03-19 20:56:31 UTC (rev 243169)
@@ -1,3 +1,15 @@
+2019-03-19 Timothy Hatcher <[email protected]>
+
+ REGRESSION (r239904): Update dark mode defines in a few places that got missed.
+ https://bugs.webkit.org/show_bug.cgi?id=195958
+
+ Reviewed by Megan Gardner.
+
+ * DerivedSources.make: Support HAVE_OS_DARK_MODE_SUPPORT in html.css.
+ * css/html.css: Update dark mode defines.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::updateBackgroundRecursively): Ditto.
+
2019-03-19 Chris Dumez <[email protected]>
media/track/track-in-band-style.html is flaky
Modified: trunk/Source/WebCore/DerivedSources.make (243168 => 243169)
--- trunk/Source/WebCore/DerivedSources.make 2019-03-19 20:35:14 UTC (rev 243168)
+++ trunk/Source/WebCore/DerivedSources.make 2019-03-19 20:56:31 UTC (rev 243169)
@@ -1145,6 +1145,12 @@
USE_APPLE_INTERNAL_SDK = 0
endif
+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 HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
+ HAVE_OS_DARK_MODE_SUPPORT = 1
+else
+ HAVE_OS_DARK_MODE_SUPPORT = 0
+endif
+
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/html.css (243168 => 243169)
--- trunk/Source/WebCore/css/html.css 2019-03-19 20:35:14 UTC (rev 243168)
+++ trunk/Source/WebCore/css/html.css 2019-03-19 20:56:31 UTC (rev 243169)
@@ -25,7 +25,7 @@
html {
display: block;
-#if defined(WTF_PLATFORM_MAC) && WTF_PLATFORM_MAC
+#if defined(HAVE_OS_DARK_MODE_SUPPORT) && HAVE_OS_DARK_MODE_SUPPORT
color: text;
#endif
}
@@ -387,7 +387,7 @@
input,
input:matches([type="password"], [type="search"]) {
-webkit-appearance: textfield;
-#if defined(WTF_PLATFORM_MAC) && WTF_PLATFORM_MAC
+#if defined(HAVE_OS_DARK_MODE_SUPPORT) && HAVE_OS_DARK_MODE_SUPPORT
color: text;
background-color: -apple-system-control-background;
#else
@@ -407,7 +407,7 @@
cursor: auto;
}
-#if defined(WTF_PLATFORM_MAC) && WTF_PLATFORM_MAC
+#if defined(HAVE_OS_DARK_MODE_SUPPORT) && HAVE_OS_DARK_MODE_SUPPORT
@media (prefers-dark-interface) {
input,
input:matches([type="password"], [type="search"]) {
@@ -665,7 +665,7 @@
textarea {
-webkit-appearance: textarea;
#if !(defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY)
-#if defined(WTF_PLATFORM_MAC) && WTF_PLATFORM_MAC
+#if defined(HAVE_OS_DARK_MODE_SUPPORT) && HAVE_OS_DARK_MODE_SUPPORT
color: text;
background-color: -apple-system-control-background;
#else
@@ -952,7 +952,7 @@
#else
-webkit-appearance: menulist;
border: 1px solid;
-#if defined(WTF_PLATFORM_MAC) && WTF_PLATFORM_MAC
+#if defined(HAVE_OS_DARK_MODE_SUPPORT) && HAVE_OS_DARK_MODE_SUPPORT
color: text;
background-color: -apple-system-control-background;
#else
Modified: trunk/Source/WebCore/page/FrameView.cpp (243168 => 243169)
--- trunk/Source/WebCore/page/FrameView.cpp 2019-03-19 20:35:14 UTC (rev 243168)
+++ trunk/Source/WebCore/page/FrameView.cpp 2019-03-19 20:56:31 UTC (rev 243169)
@@ -2998,7 +2998,7 @@
void FrameView::updateBackgroundRecursively(const Optional<Color>& backgroundColor)
{
-#if ENABLE(DARK_MODE_CSS) && PLATFORM(MAC)
+#if HAVE(OS_DARK_MODE_SUPPORT) && ENABLE(DARK_MODE_CSS)
Color baseBackgroundColor = backgroundColor.valueOr(RenderTheme::singleton().systemColor(CSSValueAppleSystemControlBackground, styleColorOptions()));
#else
Color baseBackgroundColor = backgroundColor.valueOr(Color::white);
