| Index: Source/web/ApplicationCacheHost.cpp
|
| diff --git a/Source/web/ApplicationCacheHost.cpp b/Source/web/ApplicationCacheHost.cpp
|
| index fb0d328d0bd38099214840e08fa21c7b51c1c7a0..817b73750afbc2238618354c78d7ecadc8494d94 100644
|
| --- a/Source/web/ApplicationCacheHost.cpp
|
| +++ b/Source/web/ApplicationCacheHost.cpp
|
| @@ -43,7 +43,7 @@
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| #include "core/loader/DocumentLoader.h"
|
| #include "core/loader/FrameLoader.h"
|
| -#include "core/loader/appcache/DOMApplicationCache.h"
|
| +#include "core/loader/appcache/ApplicationCache.h"
|
| #include "core/page/Frame.h"
|
| #include "core/page/Page.h"
|
| #include "core/page/Settings.h"
|
| @@ -158,13 +158,13 @@ void ApplicationCacheHost::willStartLoadingSynchronously(ResourceRequest& reques
|
| }
|
| }
|
|
|
| -void ApplicationCacheHost::setDOMApplicationCache(DOMApplicationCache* domApplicationCache)
|
| +void ApplicationCacheHost::setApplicationCache(ApplicationCache* domApplicationCache)
|
| {
|
| ASSERT(!m_domApplicationCache || !domApplicationCache);
|
| m_domApplicationCache = domApplicationCache;
|
| }
|
|
|
| -void ApplicationCacheHost::notifyDOMApplicationCache(EventID id, int total, int done)
|
| +void ApplicationCacheHost::notifyApplicationCache(EventID id, int total, int done)
|
| {
|
| if (id != PROGRESS_EVENT)
|
| InspectorInstrumentation::updateApplicationCacheStatus(m_documentLoader->frame());
|
| @@ -215,7 +215,7 @@ void ApplicationCacheHost::stopDeferringEvents()
|
| void ApplicationCacheHost::dispatchDOMEvent(EventID id, int total, int done)
|
| {
|
| if (m_domApplicationCache) {
|
| - const AtomicString& eventType = DOMApplicationCache::toEventType(id);
|
| + const AtomicString& eventType = ApplicationCache::toEventType(id);
|
| RefPtr<Event> event;
|
| if (id == PROGRESS_EVENT)
|
| event = ProgressEvent::create(eventType, true, done, total);
|
|
|