| Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
|
| diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
|
| index 0c421758e8f5e39bafcdbb4bc1fd2b82b54df9fc..43b2a213671741c5a751b4ece71826d11536e4ee 100644
|
| --- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
|
| +++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
|
| @@ -69,7 +69,7 @@ enum SriResourceIntegrityMismatchEvent {
|
| };
|
|
|
| #define DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, name) \
|
| - case Resource::name: { \
|
| + case Resource::k##name: { \
|
| DEFINE_THREAD_SAFE_STATIC_LOCAL( \
|
| EnumerationHistogram, resourceHistogram, \
|
| new EnumerationHistogram( \
|
| @@ -79,6 +79,8 @@ enum SriResourceIntegrityMismatchEvent {
|
| }
|
|
|
| #define DEFINE_RESOURCE_HISTOGRAM(prefix) \
|
| + /* DO NOT SUBMIT - conflict resolution helper:
|
| + * Important to have CSSStyleSheet instead of kCSSStyleSheet below. */
|
| switch (factory.type()) { \
|
| DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, CSSStyleSheet) \
|
| DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, Font) \
|
| @@ -95,6 +97,8 @@ enum SriResourceIntegrityMismatchEvent {
|
| DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, TextTrack) \
|
| DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, XSLStyleSheet) \
|
| }
|
| + /* DO NOT SUBMIT - conflict resolution helper:
|
| + * Important to have XSLStyleSheet instead of kXSLStyleSheet above. */
|
|
|
| void addRedirectsToTimingInfo(Resource* resource, ResourceTimingInfo* info) {
|
| // Store redirect responses that were packed inside the final response.
|
|
|