From 325afc0ab8eeb2545d372e8ae89d1a83b2985066 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 4 Sep 2018 17:55:18 +0200 Subject: [PATCH] Part 1. Move IsLocalRefURL to nsContentUtils to reuse this function. (port-rewrite) `IsLocalRefURL` is originally designed to be used by URLValue only. Since we need this function in SVGUseElement::LookupHref too, move it to nsContentUtils as a util function. --- layout/style/nsCSSValue.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp index baf5b78973..e9c391737f 100644 --- a/layout/style/nsCSSValue.cpp +++ b/layout/style/nsCSSValue.cpp @@ -29,22 +29,6 @@ using namespace mozilla; -static bool -IsLocalRefURL(nsStringBuffer* aString) -{ - // Find the first non-"C0 controls + space" character. - char16_t* current = static_cast(aString->Data()); - for (; *current != '\0'; current++) { - if (*current > 0x20) { - // if the first non-"C0 controls + space" character is '#', this is a - // local-ref URL. - return *current == '#'; - } - } - - return false; -} - nsCSSValue::nsCSSValue(int32_t aValue, nsCSSUnit aUnit) : mUnit(aUnit) { @@ -2723,7 +2707,7 @@ css::URLValueData::URLValueData(already_AddRefed> aURI, , mReferrer(Move(aReferrer)) , mOriginPrincipal(Move(aOriginPrincipal)) , mURIResolved(true) - , mIsLocalRef(IsLocalRefURL(aString)) + , mIsLocalRef(nsContentUtils::IsLocalRefURL(aString)) { MOZ_ASSERT(mString); MOZ_ASSERT(mBaseURI); @@ -2740,7 +2724,7 @@ css::URLValueData::URLValueData(nsStringBuffer* aString, , mReferrer(Move(aReferrer)) , mOriginPrincipal(Move(aOriginPrincipal)) , mURIResolved(false) - , mIsLocalRef(IsLocalRefURL(aString)) + , mIsLocalRef(nsContentUtils::IsLocalRefURL(aString)) { MOZ_ASSERT(aString); MOZ_ASSERT(mBaseURI);