Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(629)

Unified Diff: Source/core/loader/LinkHeader.cpp

Issue 876633009: Revert of Add a parser for Link headers (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/LinkHeader.h ('k') | Source/core/loader/LinkHeaderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/LinkHeader.cpp
diff --git a/Source/core/loader/LinkHeader.cpp b/Source/core/loader/LinkHeader.cpp
deleted file mode 100644
index ec6d2e955c7d8b9cc57bd85c1d87fb65ca567823..0000000000000000000000000000000000000000
--- a/Source/core/loader/LinkHeader.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "config.h"
-#include "core/loader/LinkHeader.h"
-
-#include "platform/ParsingUtilities.h"
-
-namespace blink {
-
-// LWSP definition in https://www.ietf.org/rfc/rfc0822.txt
-template <typename CharType>
-static bool isWhitespace(CharType chr)
-{
- return (chr == ' ') || (chr == '\t');
-}
-
-template <typename CharType>
-static bool isValidURLChar(CharType chr)
-{
- return !isWhitespace(chr) && chr != '>';
-}
-
-template <typename CharType>
-static bool isValidParameterNameChar(CharType chr)
-{
- return !isWhitespace(chr) && chr != '=';
-}
-
-template <typename CharType>
-static bool isValidParameterValueChar(CharType chr)
-{
- return !isWhitespace(chr) && chr != ';';
-}
-
-// Before:
-//
-// <cat.jpg>; rel=preload
-// ^ ^
-// position end
-//
-// After (if successful: otherwise the method returns false)
-//
-// <cat.jpg>; rel=preload
-// ^ ^
-// position end
-template <typename CharType>
-static bool parseURL(CharType*& position, CharType* end, String& url)
-{
- skipWhile<CharType, isWhitespace>(position, end);
- if (!skipExactly<CharType>(position, end, '<'))
- return false;
- skipWhile<CharType, isWhitespace>(position, end);
-
- CharType* urlStart = position;
- skipWhile<CharType, isValidURLChar>(position, end);
- CharType* urlEnd = position;
- skipUntil<CharType>(position, end, '>');
- if (!skipExactly<CharType>(position, end, '>'))
- return false;
-
- url = String(urlStart, urlEnd - urlStart);
- return true;
-}
-
-// Before:
-//
-// <cat.jpg>; rel=preload
-// ^ ^
-// position end
-//
-// After (if successful: otherwise the method returns false, and modifies the isValid boolean accordingly)
-//
-// <cat.jpg>; rel=preload
-// ^ ^
-// position end
-template <typename CharType>
-static bool parseParameterDelimiter(CharType*& position, CharType* end, bool& isValidDelimiter)
-{
- isValidDelimiter = true;
- skipWhile<CharType, isWhitespace>(position, end);
- if (!skipExactly<CharType>(position, end, ';') && (position < end)) {
- isValidDelimiter = false;
- return false;
- }
- skipWhile<CharType, isWhitespace>(position, end);
- if (position == end)
- return false;
- return true;
-}
-
-static LinkHeader::LinkParameterName paramterNameFromString(String name)
-{
- // FIXME: Add support for more header parameters as neccessary.
- if (name == "rel")
- return LinkHeader::LinkParameterRel;
- return LinkHeader::LinkParameterUnknown;
-}
-
-// Before:
-//
-// <cat.jpg>; rel=preload
-// ^ ^
-// position end
-//
-// After (if successful: otherwise the method returns false)
-//
-// <cat.jpg>; rel=preload
-// ^ ^
-// position end
-template <typename CharType>
-static bool parseParameterName(CharType*& position, CharType* end, LinkHeader::LinkParameterName& name)
-{
- CharType* nameStart = position;
- skipWhile<CharType, isValidParameterNameChar>(position, end);
- CharType* nameEnd = position;
- skipWhile<CharType, isWhitespace>(position, end);
- if (!skipExactly<CharType>(position, end, '='))
- return false;
- skipWhile<CharType, isWhitespace>(position, end);
- name = paramterNameFromString(String(nameStart, nameEnd - nameStart));
- return true;
-}
-
-// Before:
-//
-// <cat.jpg>; rel=preload; foo=bar
-// ^ ^
-// position end
-//
-// After (if successful: otherwise the method returns false)
-//
-// <cat.jpg>; rel=preload; foo=bar
-// ^ ^
-// position end
-template <typename CharType>
-static bool parseParameterValue(CharType*& position, CharType* end, String& value)
-{
- CharType* valueStart = position;
- skipWhile<CharType, isValidParameterValueChar>(position, end);
- CharType* valueEnd = position;
- skipWhile<CharType, isWhitespace>(position, end);
- if ((valueEnd == valueStart) || (*position != ';' && position != end))
- return false;
- value = String(valueStart, valueEnd - valueStart);
- return true;
-}
-
-void LinkHeader::setValue(LinkParameterName name, String value)
-{
- // FIXME: Add support for more header parameters as neccessary.
- if (name == LinkParameterRel)
- m_rel = value;
-}
-
-template <typename CharType>
-bool LinkHeader::init(CharType* headerValue, unsigned len)
-{
- CharType* position = headerValue;
- CharType* end = headerValue + len;
-
- if (!parseURL(position, end, m_url))
- return false;
-
- while (position < end) {
- bool isValidDelimiter;
- if (!parseParameterDelimiter(position, end, isValidDelimiter))
- return isValidDelimiter;
-
- LinkParameterName parameterName;
- if (!parseParameterName(position, end, parameterName))
- return false;
-
- String parameterValue;
- if (!parseParameterValue(position, end, parameterValue))
- return false;
-
- setValue(parameterName, parameterValue);
- }
-
- return true;
-}
-
-LinkHeader::LinkHeader(const String& header)
-{
- if (header.isNull()) {
- m_isValid = false;
- return;
- }
-
- if (header.is8Bit())
- m_isValid = init(header.characters8(), header.length());
- else
- m_isValid = init(header.characters16(), header.length());
-}
-
-}
« no previous file with comments | « Source/core/loader/LinkHeader.h ('k') | Source/core/loader/LinkHeaderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698