Title: [214790] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 214790
- Author
- carlo...@webkit.org
- Date
- 2017-04-03 06:33:41 -0700 (Mon, 03 Apr 2017)
Log Message
Merge r214305 - NeverDestroyed<MediaQueryEvaluator> must explicitly construct with a String
https://bugs.webkit.org/show_bug.cgi?id=169987
<rdar://problem/31211087>
Reviewed by Alex Christensen.
CSSDefaultStyleSheets creates a static MediaQueryEvaluator, but thanks
to the template magic of NeverDestroyed, it was converting the char*
argument into a bool, and calling the wrong constructor.
Unfortunately this is difficult to test because it only affects
the default UA style sheets, and they currently don't have
and @media rules (which would always evaluate to true given
the bug). I don't want to put in a useless rule just to check
if the bug is fixed. When one is added for bug 168447, this change
will be exercised.
* css/CSSDefaultStyleSheets.cpp: Explicitly construct with a String
rather than a char*.
(WebCore::screenEval):
(WebCore::printEval):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (214789 => 214790)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 13:32:18 UTC (rev 214789)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 13:33:41 UTC (rev 214790)
@@ -1,3 +1,27 @@
+2017-03-22 Dean Jackson <d...@apple.com>
+
+ NeverDestroyed<MediaQueryEvaluator> must explicitly construct with a String
+ https://bugs.webkit.org/show_bug.cgi?id=169987
+ <rdar://problem/31211087>
+
+ Reviewed by Alex Christensen.
+
+ CSSDefaultStyleSheets creates a static MediaQueryEvaluator, but thanks
+ to the template magic of NeverDestroyed, it was converting the char*
+ argument into a bool, and calling the wrong constructor.
+
+ Unfortunately this is difficult to test because it only affects
+ the default UA style sheets, and they currently don't have
+ and @media rules (which would always evaluate to true given
+ the bug). I don't want to put in a useless rule just to check
+ if the bug is fixed. When one is added for bug 168447, this change
+ will be exercised.
+
+ * css/CSSDefaultStyleSheets.cpp: Explicitly construct with a String
+ rather than a char*.
+ (WebCore::screenEval):
+ (WebCore::printEval):
+
2017-03-22 Antti Koivisto <an...@apple.com>
Dynamically applied :empty pseudo class with display:none does not get unapplied
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/css/CSSDefaultStyleSheets.cpp (214789 => 214790)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2017-04-03 13:32:18 UTC (rev 214789)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2017-04-03 13:33:41 UTC (rev 214790)
@@ -84,13 +84,13 @@
static const MediaQueryEvaluator& screenEval()
{
- static NeverDestroyed<const MediaQueryEvaluator> staticScreenEval("screen");
+ static NeverDestroyed<const MediaQueryEvaluator> staticScreenEval(String(ASCIILiteral("screen")));
return staticScreenEval;
}
static const MediaQueryEvaluator& printEval()
{
- static NeverDestroyed<const MediaQueryEvaluator> staticPrintEval("print");
+ static NeverDestroyed<const MediaQueryEvaluator> staticPrintEval(String(ASCIILiteral("print")));
return staticPrintEval;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
