| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 { | 120 { |
| 121 DCHECK(m_documentLoader); | 121 DCHECK(m_documentLoader); |
| 122 | 122 |
| 123 LocalFrame* frame = m_documentLoader->frame(); | 123 LocalFrame* frame = m_documentLoader->frame(); |
| 124 Document* document = frame->document(); | 124 Document* document = frame->document(); |
| 125 if (document->isSecureContext()) { | 125 if (document->isSecureContext()) { |
| 126 UseCounter::count(document, UseCounter::ApplicationCacheManifestSelectSe
cureOrigin); | 126 UseCounter::count(document, UseCounter::ApplicationCacheManifestSelectSe
cureOrigin); |
| 127 UseCounter::countCrossOriginIframe(*document, UseCounter::ApplicationCac
heManifestSelectSecureOrigin); | 127 UseCounter::countCrossOriginIframe(*document, UseCounter::ApplicationCac
heManifestSelectSecureOrigin); |
| 128 } else { | 128 } else { |
| 129 Deprecation::countDeprecation(document, UseCounter::ApplicationCacheMani
festSelectInsecureOrigin); | 129 Deprecation::countDeprecation(document, UseCounter::ApplicationCacheMani
festSelectInsecureOrigin); |
| 130 UseCounter::countCrossOriginIframe(*document, UseCounter::ApplicationCac
heManifestSelectInsecureOrigin); | 130 Deprecation::countDeprecationCrossOriginIframe(*document, UseCounter::Ap
plicationCacheManifestSelectInsecureOrigin); |
| 131 OriginsUsingFeatures::countAnyWorld(*document, OriginsUsingFeatures::Fea
ture::ApplicationCacheManifestSelectInsecureOrigin); | 131 OriginsUsingFeatures::countAnyWorld(*document, OriginsUsingFeatures::Fea
ture::ApplicationCacheManifestSelectInsecureOrigin); |
| 132 } | 132 } |
| 133 if (m_host && !m_host->selectCacheWithManifest(manifestURL)) { | 133 if (m_host && !m_host->selectCacheWithManifest(manifestURL)) { |
| 134 // It's a foreign entry, restart the current navigation from the top | 134 // It's a foreign entry, restart the current navigation from the top |
| 135 // of the navigation algorithm. The navigation will not result in the | 135 // of the navigation algorithm. The navigation will not result in the |
| 136 // same resource being loaded, because "foreign" entries are never picke
d | 136 // same resource being loaded, because "foreign" entries are never picke
d |
| 137 // during navigation. | 137 // during navigation. |
| 138 // see ApplicationCacheGroup::selectCache() | 138 // see ApplicationCacheGroup::selectCache() |
| 139 frame->navigate(*document, document->url(), true, UserGestureStatus::Non
e); | 139 frame->navigate(*document, document->url(), true, UserGestureStatus::Non
e); |
| 140 } | 140 } |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 notifyApplicationCache(ERROR_EVENT, 0, 0, reason, url.string(), status, mess
age); | 304 notifyApplicationCache(ERROR_EVENT, 0, 0, reason, url.string(), status, mess
age); |
| 305 } | 305 } |
| 306 | 306 |
| 307 DEFINE_TRACE(ApplicationCacheHost) | 307 DEFINE_TRACE(ApplicationCacheHost) |
| 308 { | 308 { |
| 309 visitor->trace(m_domApplicationCache); | 309 visitor->trace(m_domApplicationCache); |
| 310 visitor->trace(m_documentLoader); | 310 visitor->trace(m_documentLoader); |
| 311 } | 311 } |
| 312 | 312 |
| 313 } // namespace blink | 313 } // namespace blink |
| OLD | NEW |