| Index: third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
|
| index 85a8a628d5ab961304ef149f6e596058e14c36fc..5d188e1841ff881ff33754fa2e6af535e006d596 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
|
| @@ -41,7 +41,7 @@ static const char applicationCacheAgentEnabled[] = "applicationCacheAgentEnabled
|
| }
|
|
|
| InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectedFrames* inspectedFrames)
|
| - : InspectorBaseAgent<InspectorApplicationCacheAgent, InspectorFrontend::ApplicationCache>("ApplicationCache")
|
| + : InspectorBaseAgent<InspectorApplicationCacheAgent, protocol::Frontend::ApplicationCache>("ApplicationCache")
|
| , m_inspectedFrames(inspectedFrames)
|
| {
|
| }
|
| @@ -88,9 +88,9 @@ void InspectorApplicationCacheAgent::networkStateChanged(LocalFrame* frame, bool
|
| frontend()->networkStateUpdated(online);
|
| }
|
|
|
| -void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::ApplicationCache::FrameWithManifest>>& result)
|
| +void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::ApplicationCache::FrameWithManifest>>& result)
|
| {
|
| - result = TypeBuilder::Array<TypeBuilder::ApplicationCache::FrameWithManifest>::create();
|
| + result = protocol::TypeBuilder::Array<protocol::TypeBuilder::ApplicationCache::FrameWithManifest>::create();
|
|
|
| for (LocalFrame* frame : *m_inspectedFrames) {
|
| DocumentLoader* documentLoader = frame->loader().documentLoader();
|
| @@ -101,7 +101,7 @@ void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr
|
| ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
|
| String manifestURL = info.m_manifest.string();
|
| if (!manifestURL.isEmpty()) {
|
| - RefPtr<TypeBuilder::ApplicationCache::FrameWithManifest> value = TypeBuilder::ApplicationCache::FrameWithManifest::create()
|
| + RefPtr<protocol::TypeBuilder::ApplicationCache::FrameWithManifest> value = protocol::TypeBuilder::ApplicationCache::FrameWithManifest::create()
|
| .setFrameId(IdentifiersFactory::frameId(frame))
|
| .setManifestURL(manifestURL)
|
| .setStatus(static_cast<int>(host->status()));
|
| @@ -134,7 +134,7 @@ void InspectorApplicationCacheAgent::getManifestForFrame(ErrorString* errorStrin
|
| *manifestURL = info.m_manifest.string();
|
| }
|
|
|
| -void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, RefPtr<TypeBuilder::ApplicationCache::ApplicationCache>& applicationCache)
|
| +void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, RefPtr<protocol::TypeBuilder::ApplicationCache::ApplicationCache>& applicationCache)
|
| {
|
| DocumentLoader* documentLoader = assertFrameWithDocumentLoader(errorString, frameId);
|
| if (!documentLoader)
|
| @@ -149,9 +149,9 @@ void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* er
|
| applicationCache = buildObjectForApplicationCache(resources, info);
|
| }
|
|
|
| -PassRefPtr<TypeBuilder::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
|
| +PassRefPtr<protocol::TypeBuilder::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
|
| {
|
| - return TypeBuilder::ApplicationCache::ApplicationCache::create()
|
| + return protocol::TypeBuilder::ApplicationCache::ApplicationCache::create()
|
| .setManifestURL(applicationCacheInfo.m_manifest.string())
|
| .setSize(applicationCacheInfo.m_size)
|
| .setCreationTime(applicationCacheInfo.m_creationTime)
|
| @@ -160,9 +160,9 @@ PassRefPtr<TypeBuilder::ApplicationCache::ApplicationCache> InspectorApplication
|
| .release();
|
| }
|
|
|
| -PassRefPtr<TypeBuilder::Array<TypeBuilder::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
|
| +PassRefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
|
| {
|
| - RefPtr<TypeBuilder::Array<TypeBuilder::ApplicationCache::ApplicationCacheResource>> resources = TypeBuilder::Array<TypeBuilder::ApplicationCache::ApplicationCacheResource>::create();
|
| + RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::ApplicationCache::ApplicationCacheResource>> resources = protocol::TypeBuilder::Array<protocol::TypeBuilder::ApplicationCache::ApplicationCacheResource>::create();
|
|
|
| ApplicationCacheHost::ResourceInfoList::const_iterator end = applicationCacheResources.end();
|
| ApplicationCacheHost::ResourceInfoList::const_iterator it = applicationCacheResources.begin();
|
| @@ -172,7 +172,7 @@ PassRefPtr<TypeBuilder::Array<TypeBuilder::ApplicationCache::ApplicationCacheRes
|
| return resources;
|
| }
|
|
|
| -PassRefPtr<TypeBuilder::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
|
| +PassRefPtr<protocol::TypeBuilder::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
|
| {
|
| StringBuilder builder;
|
| if (resourceInfo.m_isMaster)
|
| @@ -190,7 +190,7 @@ PassRefPtr<TypeBuilder::ApplicationCache::ApplicationCacheResource> InspectorApp
|
| if (resourceInfo.m_isExplicit)
|
| builder.appendLiteral("Explicit ");
|
|
|
| - RefPtr<TypeBuilder::ApplicationCache::ApplicationCacheResource> value = TypeBuilder::ApplicationCache::ApplicationCacheResource::create()
|
| + RefPtr<protocol::TypeBuilder::ApplicationCache::ApplicationCacheResource> value = protocol::TypeBuilder::ApplicationCache::ApplicationCacheResource::create()
|
| .setUrl(resourceInfo.m_resource.string())
|
| .setSize(static_cast<int>(resourceInfo.m_size))
|
| .setType(builder.toString());
|
|
|