| Index: third_party/WebKit/Source/platform/network/ResourceError.h
|
| diff --git a/third_party/WebKit/Source/platform/network/ResourceError.h b/third_party/WebKit/Source/platform/network/ResourceError.h
|
| index 1d5715df83f1b61eded66d6156ad4a78c32f398c..a35985193325156a9f1e860b0153787c2b4f0846 100644
|
| --- a/third_party/WebKit/Source/platform/network/ResourceError.h
|
| +++ b/third_party/WebKit/Source/platform/network/ResourceError.h
|
| @@ -35,6 +35,8 @@
|
|
|
| namespace blink {
|
|
|
| +enum class ResourceRequestBlockedReason;
|
| +
|
| // Used for errors that won't be exposed to clients.
|
| PLATFORM_EXPORT extern const char errorDomainBlinkInternal[];
|
|
|
| @@ -48,7 +50,9 @@ class PLATFORM_EXPORT ResourceError final {
|
| };
|
|
|
| static ResourceError cancelledError(const String& failingURL);
|
| - static ResourceError cancelledDueToAccessCheckError(const String& failingURL);
|
| + static ResourceError cancelledDueToAccessCheckError(
|
| + const String& failingURL,
|
| + ResourceRequestBlockedReason);
|
|
|
| // Only for Blink internal usage.
|
| static ResourceError cacheMissError(const String& failingURL);
|
| @@ -61,7 +65,8 @@ class PLATFORM_EXPORT ResourceError final {
|
| m_isTimeout(false),
|
| m_staleCopyInCache(false),
|
| m_wasIgnoredByHandler(false),
|
| - m_isCacheMiss(false) {}
|
| + m_isCacheMiss(false),
|
| + m_shouldCollapseInitiator(false) {}
|
|
|
| ResourceError(const String& domain,
|
| int errorCode,
|
| @@ -77,7 +82,8 @@ class PLATFORM_EXPORT ResourceError final {
|
| m_isTimeout(false),
|
| m_staleCopyInCache(false),
|
| m_wasIgnoredByHandler(false),
|
| - m_isCacheMiss(false) {}
|
| + m_isCacheMiss(false),
|
| + m_shouldCollapseInitiator(false) {}
|
|
|
| // Makes a deep copy. Useful for when you need to use a ResourceError on
|
| // another thread.
|
| @@ -113,6 +119,11 @@ class PLATFORM_EXPORT ResourceError final {
|
| void setIsCacheMiss(bool isCacheMiss) { m_isCacheMiss = isCacheMiss; }
|
| bool isCacheMiss() const { return m_isCacheMiss; }
|
|
|
| + void setShouldCollapseInitiator(bool shouldCollapseInitiator) {
|
| + m_shouldCollapseInitiator = shouldCollapseInitiator;
|
| + }
|
| + bool shouldCollapseInitiator() const { return m_shouldCollapseInitiator; }
|
| +
|
| static bool compare(const ResourceError&, const ResourceError&);
|
|
|
| private:
|
| @@ -127,6 +138,7 @@ class PLATFORM_EXPORT ResourceError final {
|
| bool m_staleCopyInCache;
|
| bool m_wasIgnoredByHandler;
|
| bool m_isCacheMiss;
|
| + bool m_shouldCollapseInitiator;
|
| };
|
|
|
| inline bool operator==(const ResourceError& a, const ResourceError& b) {
|
|
|