Extend srcset's syntax to include 'w' descriptors

Source/core/html/parser/HTMLSrcsetParserTest.cpp

Index: Source/core/html/parser/HTMLSrcsetParserTest.cpp
diff --git a/Source/core/html/parser/HTMLSrcsetParserTest.cpp b/Source/core/html/parser/HTMLSrcsetParserTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2ab349e925dc0b23c90e06f2579539d14551d390
--- /dev/null
+++ b/Source/core/html/parser/HTMLSrcsetParserTest.cpp
@@ -0,0 +1,62 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "config.h"
+#include "core/html/parser/HTMLSrcsetParser.h"
+
+#include <gtest/gtest.h>
+#include <limits.h>
+
+namespace WebCore {
+
+typedef struct {
+    float deviceScaleFactor;
+    int effectiveSize;
+    const char* srcInput;
+    const char* srcsetInput;
+    const char* outputURL;
+    float outputScaleFactor;
+    int outputResourceWidth;
+} TestCase;
+
+TEST(HTMLSrcsetParserTest, Basic)
+{
+    TestCase testCases[] = {
+        {2.0, -1, "", "1x.gif 1x, 2x.gif 2x", "2x.gif", 2.0, -1},
+        {2.0, -1, "", "1x.gif 1x, 2x.gif -2x", "1x.gif", 1.0, -1},
+        {2.0, -1, "", "1x.gif 1x, 2x.gif 2q", "1x.gif", 1.0, -1},
+        {2.0, -1, "1x.gif 1x, 2x.gif 2x", "1x.gif 1x, 2x.gif 2x", "2x.gif", 2.0, -1},
+        {1.0, -1, "1x.gif 1x, 2x.gif 2x", "1x.gif 1x, 2x.gif 2x", "1x.gif", 1.0, -1},
+        {1.0, -1, "1x.gif 1x, 2x.gif 2x", "", "1x.gif 1x, 2x.gif 2x", 1.0, -1},
+        {2.0, -1, "src.gif", "1x.gif 1x, 2x.gif 2x", "2x.gif", 2.0, -1},
+        {1.0, -1, "src.gif", "1x.gif 1x, 2x.gif 2x", "1x.gif", 1.0, -1},
+        {1.0, -1, "src.gif", "2x.gif 2x", "src.gif", 1.0, -1},
+        {2.0, -1, "src.gif", "2x.gif 2x", "2x.gif", 2.0, -1},
+        {1.5, -1, "src.gif", "2x.gif 2x", "2x.gif", 2.0, -1},
+        {2.5, -1, "src.gif", "2x.gif 2x", "2x.gif", 2.0, -1},
+        {2.5, -1, "src.gif", "2x.gif 2x, 3x.gif 3x", "3x.gif", 3.0, -1},
+        {2.0, -1, "", "1x,,  ,   x    ,2x  ", "1x,", 1.0, -1},
+        {2.0, -1, "", "1x,,  ,   x    ,2x  ", "1x,", 1.0, -1},
+        {2.0, -1, "", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUg 1x, 2x.gif 2x", "2x.gif", 2.0, -1},
+        {2.0, -1, "", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUg 2x, 1x.gif 1x", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUg", 2.0, -1},
+        {2.0, -1, "", "1x,,  ,   x    ,2x  , 1x.gif, 3x, 4x.gif 4x 100h, 5x.gif 5, dx.gif dx, 2x.gif   2x ,", "2x.gif", 2.0, -1},
+        {4.0, -1, "", "1x,,  ,   x    ,2x  , 1x.gif, 3x, 4x.gif 4x 100h, 5x.gif 5, dx.gif dx, 2x.gif   2x ,", "4x.gif", 4.0, -1},
+        {1.0, -1, "", "1x,,  ,   x    ,2x  , 1x.gif, 3x, 4x.gif 4x 100h, 5x.gif 5, dx.gif dx, 2x.gif   2x ,", "1x,", 1.0, -1},
+        {5.0, -1, "", "1x,,  ,   x    ,2x  , 1x.gif, 3x, 4x.gif 4x 100h, 5x.gif 5, dx.gif dx, 2x.gif   2x ,", "4x.gif", 4.0, -1},
+        {1.0, 400, "", "400.gif 400w, 6000.gif 6000w", "400.gif", 1.0, 400},
+        {2.0, 400, "", "400.gif 400w, 6000.gif 6000w", "6000.gif", 15.0, 6000},
+        {1.0, 0, "", "400.gif 400w, 6000.gif 6000w", "400.gif", std::numeric_limits<float>::infinity(), 400},
+        {0, 0, 0, 0, 0, 0} // Do not remove the terminator line.
+    };
+
+    for (unsigned i = 0; testCases[i].srcInput; ++i) {
+        TestCase test = testCases[i];
+        ImageCandidate candidate = bestFitSourceForImageAttributes(test.deviceScaleFactor, test.effectiveSize, test.srcInput, test.srcsetInput);
+        ASSERT_EQ(test.outputScaleFactor, candidate.scaleFactor());
+        ASSERT_EQ(test.outputResourceWidth, candidate.resourceWidth());
+        ASSERT_STREQ(test.outputURL, candidate.toString().ascii().data());
+    }
+}
+
+} // namespace