Merge branch 'master' into 816

11 files changed, 284 insertions, 2 deletions

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 496f8e3cb..7edded5dc 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -3944,6 +3944,16 @@
         "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html"
       },
       {
+        "path": "2dcontext/drawing-images-to-the-canvas/drawimage_svg_image_1.html",
+        "references": [
+          [
+            "/2dcontext/drawing-images-to-the-canvas/drawimage_svg_image_1_ref.html",
+            "=="
+          ]
+        ],
+        "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_svg_image_1.html"
+      },
+      {
         "path": "2dcontext/line-styles/canvas_linestyles_linecap_001.htm",
         "references": [
           [
@@ -38443,8 +38453,23 @@
     ]
   },
   "local_changes": {
-    "deleted": [],
-    "deleted_reftests": {},
+    "deleted": [
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html"
+    ],
+    "deleted_reftests": {
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html"
+        }
+      ]
+    },
     "items": {
       "manual": {
         "html/browsers/windows/noreferrer-cross-origin-close-manual.sub.html": [
@@ -38461,6 +38486,78 @@
         ]
       },
       "reftest": {
+        "html/form-elements/the-textarea-element/multiline-placeholder-cr.html": [
+          {
+            "path": "html/form-elements/the-textarea-element/multiline-placeholder-cr.html",
+            "references": [
+              [
+                "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/html/form-elements/the-textarea-element/multiline-placeholder-cr.html"
+          }
+        ],
+        "html/form-elements/the-textarea-element/multiline-placeholder-crlf.html": [
+          {
+            "path": "html/form-elements/the-textarea-element/multiline-placeholder-crlf.html",
+            "references": [
+              [
+                "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html"
+          }
+        ],
+        "html/form-elements/the-textarea-element/multiline-placeholder.html": [
+          {
+            "path": "html/form-elements/the-textarea-element/multiline-placeholder.html",
+            "references": [
+              [
+                "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/html/form-elements/the-textarea-element/multiline-placeholder.html"
+          }
+        ],
+        "html/input/the-placeholder-attribute/multiline-cr.html": [
+          {
+            "path": "html/input/the-placeholder-attribute/multiline-cr.html",
+            "references": [
+              [
+                "/html/input/the-placeholder-attribute/multiline-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/html/input/the-placeholder-attribute/multiline-cr.html"
+          }
+        ],
+        "html/input/the-placeholder-attribute/multiline-crlf.html": [
+          {
+            "path": "html/input/the-placeholder-attribute/multiline-crlf.html",
+            "references": [
+              [
+                "/html/input/the-placeholder-attribute/multiline-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/html/input/the-placeholder-attribute/multiline-crlf.html"
+          }
+        ],
+        "html/input/the-placeholder-attribute/multiline.html": [
+          {
+            "path": "html/input/the-placeholder-attribute/multiline.html",
+            "references": [
+              [
+                "/html/input/the-placeholder-attribute/multiline-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/html/input/the-placeholder-attribute/multiline.html"
+          }
+        ],
         "html/semantics/grouping-content/the-ol-element/reversed-1e.html": [
           {
             "path": "html/semantics/grouping-content/the-ol-element/reversed-1e.html",
@@ -38797,6 +38894,78 @@
       }
     },
     "reftest_nodes": {
+      "html/form-elements/the-textarea-element/multiline-placeholder-cr.html": [
+        {
+          "path": "html/form-elements/the-textarea-element/multiline-placeholder-cr.html",
+          "references": [
+            [
+              "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/html/form-elements/the-textarea-element/multiline-placeholder-cr.html"
+        }
+      ],
+      "html/form-elements/the-textarea-element/multiline-placeholder-crlf.html": [
+        {
+          "path": "html/form-elements/the-textarea-element/multiline-placeholder-crlf.html",
+          "references": [
+            [
+              "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html"
+        }
+      ],
+      "html/form-elements/the-textarea-element/multiline-placeholder.html": [
+        {
+          "path": "html/form-elements/the-textarea-element/multiline-placeholder.html",
+          "references": [
+            [
+              "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/html/form-elements/the-textarea-element/multiline-placeholder.html"
+        }
+      ],
+      "html/input/the-placeholder-attribute/multiline-cr.html": [
+        {
+          "path": "html/input/the-placeholder-attribute/multiline-cr.html",
+          "references": [
+            [
+              "/html/input/the-placeholder-attribute/multiline-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/html/input/the-placeholder-attribute/multiline-cr.html"
+        }
+      ],
+      "html/input/the-placeholder-attribute/multiline-crlf.html": [
+        {
+          "path": "html/input/the-placeholder-attribute/multiline-crlf.html",
+          "references": [
+            [
+              "/html/input/the-placeholder-attribute/multiline-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/html/input/the-placeholder-attribute/multiline-crlf.html"
+        }
+      ],
+      "html/input/the-placeholder-attribute/multiline.html": [
+        {
+          "path": "html/input/the-placeholder-attribute/multiline.html",
+          "references": [
+            [
+              "/html/input/the-placeholder-attribute/multiline-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/html/input/the-placeholder-attribute/multiline.html"
+        }
+      ],
       "html/semantics/grouping-content/the-ol-element/reversed-1e.html": [
         {
           "path": "html/semantics/grouping-content/the-ol-element/reversed-1e.html",
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-cr.html b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-cr.html
new file mode 100644
index 000000000..f4a5be35a
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-cr.html
@@ -0,0 +1 @@
+<!doctype html>
<html class="reftest-wait">
<meta charset="utf-8">
<title>textarea multiline placeholder (CR)</title>
<link rel="help" href="https://html.spec.whatwg.org/multipage/form-elements.html#attr-textarea-placeholder">
<meta name="assert" content="textarea element's placeholder preserves newlines (CR)">
<link rel="match" href="/html/form-elements/the-textarea-element/multiline-placeholder-ref.html">
<link rel="stylesheet" href="support/placeholder.css">
<textarea rows="5" placeholder="this is
a multiline

placeholder"></textarea>
<textarea rows="5" placeholder="this is&#xd;a multiline&#xd;&#xd;placeholder"></textarea>
<textarea rows="5" id="dynamic"></textarea>
<script>
  document.querySelector("#dynamic")
          .setAttribute("placeholder", "this is\ra multiline\r\rplaceholder");
  document.documentElement.classList.remove("reftest-wait");
</script>
</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html
new file mode 100644
index 000000000..0fb434fc6
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>textarea multiline placeholder (CRLF)</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/form-elements.html#attr-textarea-placeholder">
+<meta name="assert" content="textarea element's placeholder preserves newlines (CRLF)">
+<link rel="match" href="/html/form-elements/the-textarea-element/multiline-placeholder-ref.html">
+<link rel="stylesheet" href="support/placeholder.css">
+<textarea rows="5" placeholder="this is
+a multiline
+
+placeholder"></textarea>
+<textarea rows="5" placeholder="this is&#xd;&#xa;a multiline&#xd;&#xa;&#xd;&#xa;placeholder"></textarea>
+<textarea rows="5" id="dynamic"></textarea>
+<script>
+  document.querySelector("#dynamic")
+          .setAttribute("placeholder", "this is\r\na multiline\r\n\r\nplaceholder");
+  document.documentElement.classList.remove("reftest-wait");
+</script>
+</html>
+
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-ref.html b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-ref.html
new file mode 100644
index 000000000..0234ed64c
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-ref.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="stylesheet" href="support/placeholder.css">
+<textarea rows="5" class="placeholder">this is
+a multiline
+
+placeholder</textarea>
+<textarea rows="5" class="placeholder">this is
+a multiline
+
+placeholder</textarea>
+<textarea rows="5" class="placeholder">this is
+a multiline
+
+placeholder</textarea>
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder.html b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder.html
new file mode 100644
index 000000000..00bb9696d
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>textarea multiline placeholder</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/form-elements.html#attr-textarea-placeholder">
+<meta name="assert" content="textarea element's placeholder preserves newlines">
+<link rel="match" href="/html/form-elements/the-textarea-element/multiline-placeholder-ref.html">
+<link rel="stylesheet" href="support/placeholder.css">
+<textarea rows="5" placeholder="this is
+a multiline
+
+placeholder"></textarea>
+<textarea rows="5" placeholder="this is&#xa;a multiline&#xa;&#xa;placeholder"></textarea>
+<textarea rows="5" id="dynamic"></textarea>
+<script>
+  document.querySelector("#dynamic")
+          .setAttribute("placeholder", "this is\na multiline\n\nplaceholder");
+  document.documentElement.classList.remove("reftest-wait");
+</script>
+</html>
+
+
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/support/placeholder.css b/testing/web-platform/tests/html/form-elements/the-textarea-element/support/placeholder.css
new file mode 100644
index 000000000..9aaed05c8
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/support/placeholder.css
@@ -0,0 +1,6 @@
+textarea.placeholder,
+textarea::placeholder {
+  /* revert browser styling of the placeholder */
+  color: GrayText; /* blink/webkit use colour */
+  opacity: 1.0; /* gecko uses opacity */
+}
diff --git a/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-cr.html b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-cr.html
new file mode 100644
index 000000000..f3150f25d
--- /dev/null
+++ b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-cr.html
@@ -0,0 +1 @@
+<!doctype html>
<html class="reftest-wait">
<meta charset="utf-8">
<title>input multiline placeholder (CRLF)</title>
<link rel="help" href="https://html.spec.whatwg.org/multipage/input.html#the-placeholder-attribute">
<meta name="assert" content="input element's placeholder strips newlines (CRLF)">
<link rel="match" href="/html/input/the-placeholder-attribute/multiline-ref.html">
<input placeholder="this is
a multiline

placeholder">
<input placeholder="this is&#xd;a multiline&#xd;&#xd;placeholder">
<input id="dynamic">
<script>
  document.querySelector("#dynamic")
          .setAttribute("placeholder", "this is\ra multiline\r\rplaceholder");
  document.documentElement.classList.remove("reftest-wait");
</script>
</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-crlf.html b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-crlf.html
new file mode 100644
index 000000000..dd581629d
--- /dev/null
+++ b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-crlf.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>input multiline placeholder (CRLF)</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/input.html#the-placeholder-attribute">
+<meta name="assert" content="input element's placeholder strips newlines (CRLF)">
+<link rel="match" href="/html/input/the-placeholder-attribute/multiline-ref.html">
+<input placeholder="this is
+a multiline
+
+placeholder">
+<input placeholder="this is&#xd;&#xa;a multiline&#xd;&#xa;&#xd;&#xa;placeholder">
+<input id="dynamic">
+<script>
+  document.querySelector("#dynamic")
+          .setAttribute("placeholder", "this is\r\na multiline\r\n\r\nplaceholder");
+  document.documentElement.classList.remove("reftest-wait");
+</script>
+</html>
diff --git a/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-ref.html b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-ref.html
new file mode 100644
index 000000000..2812f86e1
--- /dev/null
+++ b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<meta charset=utf-8>
+<input placeholder="this isa multilineplaceholder">
+<input placeholder="this isa multilineplaceholder">
+<input placeholder="this isa multilineplaceholder">
diff --git a/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline.html b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline.html
new file mode 100644
index 000000000..2d7102bd4
--- /dev/null
+++ b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>input multiline placeholder</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/input.html#the-placeholder-attribute">
+<meta name="assert" content="input element's placeholder strips newlines">
+<link rel="match" href="/html/input/the-placeholder-attribute/multiline-ref.html">
+<input placeholder="this is
+a multiline
+
+placeholder">
+<input placeholder="this is&#xa;a multiline&#xa;&#xa;placeholder">
+<input id="dynamic">
+<script>
+  document.querySelector("#dynamic")
+          .setAttribute("placeholder", "this is\na multiline\n\nplaceholder");
+  document.documentElement.classList.remove("reftest-wait");
+</script>
+</html>
diff --git a/testing/web-platform/tests/lint.whitelist b/testing/web-platform/tests/lint.whitelist
index 9b358b0db..01832c3fe 100644
--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -85,6 +85,10 @@ PRINT STATEMENT:*/tools/*
 
 CR AT EOL:WebIDL/valid/idl/documentation-dos.widl
 CR AT EOL:cors/resources/cors-headers.asis
+CR AT EOL: html/form-elements/the-textarea-element/multiline-placefolder-cr.html
+CR AT EOL: html/form-elements/the-textarea-element/multiline-placefolder-crlf.html
+CR AT EOL: html/input/the-placeholder-attribute/multiline-cr.html
+CR AT EOL: html/input/the-placeholder-attribute/multiline-crlf.html
 CR AT EOL:html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
 INDENT TABS:html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
 CR AT EOL:webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/newlines.vtt