Changeset 214790 in webkit

Timestamp:

Apr 3, 2017 6:33:41 AM (7 years ago)

Author:

Carlos Garcia Campos

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):

Location:

releases/WebKitGTK/webkit-2.16/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSDefaultStyleSheets.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-22  Dean Jackson  <dino@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  <antti@apple.com>
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/css/CSSDefaultStyleSheets.cpp

@@ -85 +85 @@
 static const MediaQueryEvaluator& screenEval()
 {
-    static NeverDestroyed<const MediaQueryEvaluator> staticScreenEval("screen");
+    static NeverDestroyed<const MediaQueryEvaluator> staticScreenEval(String(ASCIILiteral("screen")));
     return staticScreenEval;
 }
@@ -91 +91 @@
 static const MediaQueryEvaluator& printEval()
 {
-    static NeverDestroyed<const MediaQueryEvaluator> staticPrintEval("print");
+    static NeverDestroyed<const MediaQueryEvaluator> staticPrintEval(String(ASCIILiteral("print")));
     return staticPrintEval;
 }