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

Unified Diff: Source/modules/serviceworkers/Headers.cpp

Issue 379113002: Move fetch-related predicates to core/fetch. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 5 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
Index: Source/modules/serviceworkers/Headers.cpp
diff --git a/Source/modules/serviceworkers/Headers.cpp b/Source/modules/serviceworkers/Headers.cpp
index 3abe18507bb4aa5738b6ade64060fe80f40dccf3..a19b927052514ee0090ad57569f8c4ff6df4f1fa 100644
--- a/Source/modules/serviceworkers/Headers.cpp
+++ b/Source/modules/serviceworkers/Headers.cpp
@@ -90,15 +90,15 @@ void Headers::append(const String& name, const String& value, ExceptionState& ex
}
// "3. Otherwise, if guard is |request| and |name| is a forbidden header
// name, return."
- if (m_guard == RequestGuard && FetchHeaderList::isForbiddenHeaderName(name))
+ if (m_guard == RequestGuard && CrossOriginAccessControl::isForbiddenHeaderName(name))
return;
// "4. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
// simple header, return."
- if (m_guard == RequestNoCORSGuard && !FetchHeaderList::isSimpleHeader(name, value))
+ if (m_guard == RequestNoCORSGuard && !CrossOriginAccessControl::isSimpleHeader(AtomicString(name), AtomicString(value)))
return;
// "5. Otherwise, if guard is |response| and |name| is a forbidden response
// header name, return."
- if (m_guard == ResponseGuard && FetchHeaderList::isForbiddenResponseHeaderName(name))
+ if (m_guard == ResponseGuard && CrossOriginAccessControl::isForbiddenResponseHeaderName(name))
return;
// "6. Append |name|/|value| to header list."
m_headerList->append(name, value);
@@ -119,15 +119,15 @@ void Headers::remove(const String& name, ExceptionState& exceptionState)
}
// "3. Otherwise, if guard is |request| and |name| is a forbidden header
// name, return."
- if (m_guard == RequestGuard && FetchHeaderList::isForbiddenHeaderName(name))
+ if (m_guard == RequestGuard && CrossOriginAccessControl::isForbiddenHeaderName(name))
return;
// "4. Otherwise, if guard is |request-no-CORS| and |name|/`invalid` is not
// a simple header, return."
- if (m_guard == RequestNoCORSGuard && !FetchHeaderList::isSimpleHeader(name, "invalid"))
+ if (m_guard == RequestNoCORSGuard && !CrossOriginAccessControl::isSimpleHeader(AtomicString(name), "invalid"))
return;
// "5. Otherwise, if guard is |response| and |name| is a forbidden response
// header name, return."
- if (m_guard == ResponseGuard && FetchHeaderList::isForbiddenResponseHeaderName(name))
+ if (m_guard == ResponseGuard && CrossOriginAccessControl::isForbiddenResponseHeaderName(name))
return;
// "6. Delete |name| from header list."
m_headerList->remove(name);
@@ -196,15 +196,15 @@ void Headers::set(const String& name, const String& value, ExceptionState& excep
}
// "3. Otherwise, if guard is |request| and |name| is a forbidden header
// name, return."
- if (m_guard == RequestGuard && FetchHeaderList::isForbiddenHeaderName(name))
+ if (m_guard == RequestGuard && CrossOriginAccessControl::isForbiddenHeaderName(name))
return;
// "4. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
// simple header, return."
- if (m_guard == RequestNoCORSGuard && !FetchHeaderList::isSimpleHeader(name, value))
+ if (m_guard == RequestNoCORSGuard && !CrossOriginAccessControl::isSimpleHeader(AtomicString(name), AtomicString(value)))
return;
// "5. Otherwise, if guard is |response| and |name| is a forbidden response
// header name, return."
- if (m_guard == ResponseGuard && FetchHeaderList::isForbiddenResponseHeaderName(name))
+ if (m_guard == ResponseGuard && CrossOriginAccessControl::isForbiddenResponseHeaderName(name))
return;
// "6. Set |name|/|value| in header list."
m_headerList->set(name, value);

Powered by Google App Engine
This is Rietveld 408576698