Commit cb123ecf authored by Sandor Molnar's avatar Sandor Molnar
Browse files

Backed out changeset 69cd9d943489 (bug 1823354) for causing wpt failures in... 

Backed out changeset 69cd9d943489 (bug 1823354) for causing wpt failures in /url/idlharness.any.worker.html CLOSED TREE
parent 68488bcc

dom/url/URL.cpp

+0 −28
Original line number Diff line number Diff line
@@ -131,34 +131,6 @@ bool URL::IsValidURL(const GlobalObject& aGlobal, const nsAString& aURL, 
  return URLWorker::IsValidURL(aGlobal, aURL, aRv);

}



bool URL::CanParse(const GlobalObject& aGlobal, const nsAString& aURL,

                   const Optional<nsAString>& aBase) {

  nsCOMPtr<nsIURI> baseUri;

  if (aBase.WasPassed()) {

    // Don't use NS_ConvertUTF16toUTF8 because that doesn't let us handle OOM.

    nsAutoCString base;

    if (!AppendUTF16toUTF8(aBase.Value(), base, fallible)) {

      // Just return false with OOM errors as no ErrorResult.

      return false;

    }



    nsresult rv = NS_NewURI(getter_AddRefs(baseUri), base);

    if (NS_FAILED(rv)) {

      // Invalid base URL, return false.

      return false;

    }

  }



  nsAutoCString urlStr;

  if (!AppendUTF16toUTF8(aURL, urlStr, fallible)) {

    // Just return false with OOM errors as no ErrorResult.

    return false;

  }



  nsCOMPtr<nsIURI> uri;

  return NS_SUCCEEDED(NS_NewURI(getter_AddRefs(uri), urlStr, nullptr, baseUri));

}



URLSearchParams* URL::SearchParams() {

  CreateSearchParamsIfNeeded();

  return mSearchParams;

dom/url/URL.h

+0 −3
Original line number Diff line number Diff line
@@ -69,9 +69,6 @@ class URL final : public URLSearchParamsObserver, public nsWrapperCache { 
  static bool IsValidURL(const GlobalObject& aGlobal, const nsAString& aURL,

                         ErrorResult& aRv);



  static bool CanParse(const GlobalObject& aGlobal, const nsAString& aURL,

                       const Optional<nsAString>& aBase);



  void GetHref(nsAString& aHref) const;



  void SetHref(const nsAString& aHref, ErrorResult& aRv);

dom/webidl/URL.webidl

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ interface URL { 
  [Throws]

  constructor(USVString url, optional USVString base);



  static boolean canParse(USVString url, optional USVString base);



  [SetterThrows]

  stringifier attribute USVString href;

  readonly attribute USVString origin;

testing/web-platform/meta/url/url-statics-canparse.any.js.ini

0 → 100644
+44 −0
Original line number Diff line number Diff line 
[url-statics-canparse.any.worker.html]

  [URL.canParse(undefined, undefined)]

    expected: FAIL



  [URL.canParse(a:b, undefined)]

    expected: FAIL



  [URL.canParse(undefined, a:b)]

    expected: FAIL



  [URL.canParse(a:/b, undefined)]

    expected: FAIL



  [URL.canParse(undefined, a:/b)]

    expected: FAIL



  [URL.canParse(https://test:test, undefined)]

    expected: FAIL



  [URL.canParse(a, https://b/)]

    expected: FAIL





[url-statics-canparse.any.html]

  [URL.canParse(undefined, undefined)]

    expected: FAIL



  [URL.canParse(a:b, undefined)]

    expected: FAIL



  [URL.canParse(undefined, a:b)]

    expected: FAIL



  [URL.canParse(a:/b, undefined)]

    expected: FAIL



  [URL.canParse(undefined, a:/b)]

    expected: FAIL



  [URL.canParse(https://test:test, undefined)]

    expected: FAIL



  [URL.canParse(a, https://b/)]

    expected: FAIL