| Index: third_party/WebKit/Source/core/dom/PendingScript.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/PendingScript.cpp b/third_party/WebKit/Source/core/dom/PendingScript.cpp
|
| index 4809f63e0e2e3663ee3d3d3d7b03b35f826a7024..270cde456bc7af05605f6f0f273869830a54a54b 100644
|
| --- a/third_party/WebKit/Source/core/dom/PendingScript.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/PendingScript.cpp
|
| @@ -149,22 +149,22 @@ void PendingScript::notifyFinished(Resource* resource) {
|
| // resource has empty integrity metadata.
|
| if (!integrityAttr.isEmpty() &&
|
| !scriptResource->integrityMetadata().isEmpty()) {
|
| - ScriptIntegrityDisposition disposition =
|
| + ResourceIntegrityDisposition disposition =
|
| scriptResource->integrityDisposition();
|
| - if (disposition == ScriptIntegrityDisposition::Failed) {
|
| + if (disposition == ResourceIntegrityDisposition::Failed) {
|
| // TODO(jww): This should probably also generate a console
|
| // message identical to the one produced by
|
| // CheckSubresourceIntegrity below. See https://crbug.com/585267.
|
| m_integrityFailure = true;
|
| - } else if (disposition == ScriptIntegrityDisposition::NotChecked &&
|
| + } else if (disposition == ResourceIntegrityDisposition::NotChecked &&
|
| resource->resourceBuffer()) {
|
| m_integrityFailure = !SubresourceIntegrity::CheckSubresourceIntegrity(
|
| scriptResource->integrityMetadata(), *m_element,
|
| resource->resourceBuffer()->data(),
|
| resource->resourceBuffer()->size(), resource->url(), *resource);
|
| scriptResource->setIntegrityDisposition(
|
| - m_integrityFailure ? ScriptIntegrityDisposition::Failed
|
| - : ScriptIntegrityDisposition::Passed);
|
| + m_integrityFailure ? ResourceIntegrityDisposition::Failed
|
| + : ResourceIntegrityDisposition::Passed);
|
| }
|
| }
|
| }
|
|
|