diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 17:59:40 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 17:59:40 +0200 |
| commit | b43a1afcd369cb7a04d681c0a1bd21002a9ab724 (patch) | |
| tree | 0b6e4cfff6c1d4f699aa04c98c27744b4c0c481f /layout | |
| parent | 19f010c62022e269f99066a8d90e3522fe31adaf (diff) | |
| download | UXP-b43a1afcd369cb7a04d681c0a1bd21002a9ab724.tar UXP-b43a1afcd369cb7a04d681c0a1bd21002a9ab724.tar.gz UXP-b43a1afcd369cb7a04d681c0a1bd21002a9ab724.tar.lz UXP-b43a1afcd369cb7a04d681c0a1bd21002a9ab724.tar.xz UXP-b43a1afcd369cb7a04d681c0a1bd21002a9ab724.zip | |
Revert "Part 1. Move IsLocalRefURL to nsContentUtils to reuse this function. (port-rewrite)"
This reverts commit 19f010c62022e269f99066a8d90e3522fe31adaf.
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/style/nsCSSValue.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp index e9c391737..baf5b7897 100644 --- a/layout/style/nsCSSValue.cpp +++ b/layout/style/nsCSSValue.cpp @@ -29,6 +29,22 @@ using namespace mozilla; +static bool +IsLocalRefURL(nsStringBuffer* aString) +{ + // Find the first non-"C0 controls + space" character. + char16_t* current = static_cast<char16_t*>(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) { @@ -2707,7 +2723,7 @@ css::URLValueData::URLValueData(already_AddRefed<PtrHolder<nsIURI>> aURI, , mReferrer(Move(aReferrer)) , mOriginPrincipal(Move(aOriginPrincipal)) , mURIResolved(true) - , mIsLocalRef(nsContentUtils::IsLocalRefURL(aString)) + , mIsLocalRef(IsLocalRefURL(aString)) { MOZ_ASSERT(mString); MOZ_ASSERT(mBaseURI); @@ -2724,7 +2740,7 @@ css::URLValueData::URLValueData(nsStringBuffer* aString, , mReferrer(Move(aReferrer)) , mOriginPrincipal(Move(aOriginPrincipal)) , mURIResolved(false) - , mIsLocalRef(nsContentUtils::IsLocalRefURL(aString)) + , mIsLocalRef(IsLocalRefURL(aString)) { MOZ_ASSERT(aString); MOZ_ASSERT(mBaseURI); |