Index: Source/core/loader/LinkHeader.cpp |
diff --git a/Source/core/loader/LinkHeader.cpp b/Source/core/loader/LinkHeader.cpp |
index 158c022e8668f3ae7a476cda8c7d671707901d87..ab32f759787f5f2c497567f2f74e955487ca0689 100644 |
--- a/Source/core/loader/LinkHeader.cpp |
+++ b/Source/core/loader/LinkHeader.cpp |
@@ -38,11 +38,6 @@ |
static bool isValidParameterValueChar(CharType chr) |
{ |
return !isWhitespace(chr) && !isValidParameterValueEnd(chr); |
-} |
- |
-static bool isExtensionParameter(LinkHeader::LinkParameterName name) |
-{ |
- return name > LinkHeader::LinkParameterAnchor; |
} |
// Before: |
@@ -121,8 +116,6 @@ |
return LinkHeader::LinkParameterRel; |
else if (equalIgnoringCase(name, "anchor")) |
return LinkHeader::LinkParameterAnchor; |
- else if (equalIgnoringCase(name, "crossorigin")) |
- return LinkHeader::LinkParameterCrossOrigin; |
return LinkHeader::LinkParameterUnknown; |
} |
@@ -144,10 +137,11 @@ |
skipWhile<CharType, isValidParameterNameChar>(position, end); |
CharType* nameEnd = position; |
skipWhile<CharType, isWhitespace>(position, end); |
- bool hasEqual = skipExactly<CharType>(position, end, '='); |
+ if (!skipExactly<CharType>(position, end, '=')) |
+ return false; |
skipWhile<CharType, isWhitespace>(position, end); |
name = paramterNameFromString(String(nameStart, nameEnd - nameStart)); |
- return hasEqual || isExtensionParameter(name); |
+ return true; |
} |
// Before: |
@@ -206,10 +200,8 @@ |
} |
valueEnd = position; |
skipWhile<CharType, isWhitespace>(position, end); |
- if ((!completeQuotes && valueStart == valueEnd) || (position != end && !isValidParameterValueEnd(*position))) { |
- value = String(""); |
- return false; |
- } |
+ if ((!completeQuotes && valueStart == valueEnd) || (position != end && !isValidParameterValueEnd(*position))) |
+ return false; |
if (hasQuotes) |
++valueStart; |
if (completeQuotes) |
@@ -225,8 +217,6 @@ |
m_rel = value.lower(); |
else if (name == LinkParameterAnchor) |
m_isValid = false; |
- else if (name == LinkParameterCrossOrigin) |
- m_crossOrigin = crossOriginAttributeValue(value); |
} |
template <typename CharType> |
@@ -238,8 +228,7 @@ |
template <typename CharType> |
LinkHeader::LinkHeader(CharType*& position, CharType* end) |
- : m_crossOrigin(CrossOriginAttributeNotSet) |
- , m_isValid(true) |
+ : m_isValid(true) |
{ |
if (!parseURL(position, end, m_url)) { |
m_isValid = false; |
@@ -261,7 +250,7 @@ |
} |
String parameterValue; |
- if (!parseParameterValue(position, end, parameterValue) && !isExtensionParameter(parameterName)) { |
+ if (!parseParameterValue(position, end, parameterValue)) { |
findNextHeader(position, end); |
m_isValid = false; |
return; |