Merge from Chromium at DEPS revision r219274
This commit was generated by merge_to_master.py.
Change-Id: I4217737c165f68da34d720aa074431613911dc68
diff --git a/Source/core/loader/appcache/ApplicationCacheHost.h b/Source/core/loader/appcache/ApplicationCacheHost.h
index 4d4490a..48d7b23 100644
--- a/Source/core/loader/appcache/ApplicationCacheHost.h
+++ b/Source/core/loader/appcache/ApplicationCacheHost.h
@@ -39,7 +39,7 @@
#include "wtf/Vector.h"
namespace WebCore {
- class DOMApplicationCache;
+ class ApplicationCache;
class DocumentLoader;
class Frame;
class ResourceLoader;
@@ -125,8 +125,8 @@
bool swapCache();
void abort();
- void setDOMApplicationCache(DOMApplicationCache*);
- void notifyDOMApplicationCache(EventID, int progressTotal, int progressDone);
+ void setApplicationCache(ApplicationCache*);
+ void notifyApplicationCache(EventID, int progressTotal, int progressDone);
void stopDeferringEvents(); // Also raises the events that have been queued up.
@@ -144,7 +144,7 @@
DeferredEvent(EventID id, int total, int done) : eventID(id), progressTotal(total), progressDone(done) { }
};
- DOMApplicationCache* m_domApplicationCache;
+ ApplicationCache* m_domApplicationCache;
DocumentLoader* m_documentLoader;
bool m_defersEvents; // Events are deferred until after document onload.
Vector<DeferredEvent> m_deferredEvents;