Title: [237557] trunk/Source/WebCore
Revision
237557
Author
ddkil...@apple.com
Date
2018-10-29 10:53:46 -0700 (Mon, 29 Oct 2018)

Log Message

Fix clang static analyzer warning in StyleBuilderConverter.h
<https://webkit.org/b/190907>

Reviewed by Antti Koivisto.

Fix the following clang static warning in StyleBuilderConverter.h:
    Value stored to 'autoFlow' during its initialization is never read

* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertGridAutoFlow): Move
assignment of RenderStyle::initialGridAutoFlow() to `default`
case.  Make `CSSValueDense` consistent with other cases by
assigning value to `autoFlow` instead of returning early.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (237556 => 237557)


--- trunk/Source/WebCore/ChangeLog	2018-10-29 17:09:09 UTC (rev 237556)
+++ trunk/Source/WebCore/ChangeLog	2018-10-29 17:53:46 UTC (rev 237557)
@@ -1,3 +1,19 @@
+2018-10-29  David Kilzer  <ddkil...@apple.com>
+
+        Fix clang static analyzer warning in StyleBuilderConverter.h
+        <https://webkit.org/b/190907>
+
+        Reviewed by Antti Koivisto.
+
+        Fix the following clang static warning in StyleBuilderConverter.h:
+            Value stored to 'autoFlow' during its initialization is never read
+
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertGridAutoFlow): Move
+        assignment of RenderStyle::initialGridAutoFlow() to `default`
+        case.  Make `CSSValueDense` consistent with other cases by
+        assigning value to `autoFlow` instead of returning early.
+
 2018-10-29  Youenn Fablet  <you...@apple.com>
 
         Guard H264 simulcast with a runtime flag

Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (237556 => 237557)


--- trunk/Source/WebCore/css/StyleBuilderConverter.h	2018-10-29 17:09:09 UTC (rev 237556)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h	2018-10-29 17:53:46 UTC (rev 237557)
@@ -1047,11 +1047,11 @@
     auto& first = downcast<CSSPrimitiveValue>(*list.item(0));
     auto* second = downcast<CSSPrimitiveValue>(list.item(1));
 
-    GridAutoFlow autoFlow = RenderStyle::initialGridAutoFlow();
+    GridAutoFlow autoFlow;
     switch (first.valueID()) {
     case CSSValueRow:
         if (second && second->valueID() == CSSValueDense)
-            autoFlow =  AutoFlowRowDense;
+            autoFlow = AutoFlowRowDense;
         else
             autoFlow = AutoFlowRow;
         break;
@@ -1063,10 +1063,13 @@
         break;
     case CSSValueDense:
         if (second && second->valueID() == CSSValueColumn)
-            return AutoFlowColumnDense;
-        return AutoFlowRowDense;
+            autoFlow = AutoFlowColumnDense;
+        else
+            autoFlow = AutoFlowRowDense;
+        break;
     default:
         ASSERT_NOT_REACHED();
+        autoFlow = RenderStyle::initialGridAutoFlow();
         break;
     }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to