From 83a5ac66d0f13eb5136cc76a09b7bbf151969a2a Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 17 Jun 2015 15:59:45 +0200
Subject: [PATCH] Backed out changeset 689ce5819b24 (bug 1170274) for w2 test
 failures

---
 dom/html/nsGenericHTMLElement.cpp | 55 ++++++++++++++++---------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/dom/html/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp
index bbb6c5321868..d826215112f2 100644
--- a/dom/html/nsGenericHTMLElement.cpp
+++ b/dom/html/nsGenericHTMLElement.cpp
@@ -1732,34 +1732,35 @@ nsGenericHTMLElement::GetURIListAttr(nsIAtom* aAttr, nsAString& aResult)
   nsIDocument* doc = OwnerDoc(); 
   nsCOMPtr<nsIURI> baseURI = GetBaseURI();
 
-  NS_ConvertUTF16toUTF8 str(value);
-  char* buffer = str.BeginWriting();
-
-  while (char* token = NS_strtok(" ", &buffer)) {
-    if (!aResult.IsEmpty()) {
-      aResult.Append(NS_LITERAL_STRING(" "));
+  // Value contains relative URIs split on spaces (U+0020)
+  const char16_t *start = value.BeginReading();
+  const char16_t *end   = value.EndReading();
+  const char16_t *iter  = start;
+  for (;;) {
+    if (iter < end && *iter != ' ') {
+      ++iter;
+    } else {  // iter is pointing at either end or a space
+      while (*start == ' ' && start < iter)
+        ++start;
+      if (iter != start) {
+        if (!aResult.IsEmpty())
+          aResult.Append(char16_t(' '));
+        const nsSubstring& uriPart = Substring(start, iter);
+        nsCOMPtr<nsIURI> attrURI;
+        nsContentUtils::NewURIWithDocumentCharset(getter_AddRefs(attrURI),
+                                                  uriPart, doc, baseURI);
+        if (attrURI) {
+          nsAutoCString spec;
+          attrURI->GetSpec(spec);
+          AppendUTF8toUTF16(spec, aResult);
+        } else {
+          aResult.Append(uriPart);
+        }
+      }
+      start = iter = iter + 1;
+      if (iter >= end)
+        break;
     }
-
-    NS_ConvertUTF8toUTF16 uriPart(token);
-    nsCOMPtr<nsIURI> attrURI;
-    nsresult rv =
-      nsContentUtils::NewURIWithDocumentCharset(getter_AddRefs(attrURI),
-                                                uriPart, doc, baseURI);
-    if (NS_FAILED(rv)) {
-      aResult.Append(uriPart);
-      continue;
-    }
-
-    MOZ_ASSERT(attrURI);
-
-    nsAutoCString spec;
-    rv = attrURI->GetSpec(spec);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      aResult.Append(uriPart);
-      continue;
-    }
-
-    AppendUTF8toUTF16(spec, aResult);
   }
 
   return NS_OK;