Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerScriptCachedMetadataHandler.cpp |
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerScriptCachedMetadataHandler.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerScriptCachedMetadataHandler.cpp |
index 61bb43e2c94edf628eb47db15e303974c1d23601..62db2222e60c8b88e4efae351e5f9a4454355787 100644 |
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerScriptCachedMetadataHandler.cpp |
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerScriptCachedMetadataHandler.cpp |
@@ -15,7 +15,7 @@ ServiceWorkerScriptCachedMetadataHandler::ServiceWorkerScriptCachedMetadataHandl |
, m_scriptURL(scriptURL) |
{ |
if (metaData) |
- m_cachedMetadata = CachedMetadata::deserialize(metaData->data(), metaData->size()); |
+ m_cachedMetadata = CachedMetadata::createFromSerializedData(metaData->data(), metaData->size()); |
} |
ServiceWorkerScriptCachedMetadataHandler::~ServiceWorkerScriptCachedMetadataHandler() |
@@ -28,12 +28,12 @@ DEFINE_TRACE(ServiceWorkerScriptCachedMetadataHandler) |
CachedMetadataHandler::trace(visitor); |
} |
-void ServiceWorkerScriptCachedMetadataHandler::setCachedMetadata(unsigned dataTypeID, const char* data, size_t size, CacheType type) |
+void ServiceWorkerScriptCachedMetadataHandler::setCachedMetadata(uint32_t dataTypeID, const char* data, size_t size, CacheType type) |
{ |
if (type != SendToPlatform) |
return; |
m_cachedMetadata = CachedMetadata::create(dataTypeID, data, size); |
- const Vector<char>& serializedData = m_cachedMetadata->serialize(); |
+ const Vector<char>& serializedData = m_cachedMetadata->serializedData(); |
ServiceWorkerGlobalScopeClient::from(m_workerGlobalScope)->setCachedMetadata(m_scriptURL, serializedData.data(), serializedData.size()); |
} |
@@ -45,7 +45,7 @@ void ServiceWorkerScriptCachedMetadataHandler::clearCachedMetadata(CacheType typ |
ServiceWorkerGlobalScopeClient::from(m_workerGlobalScope)->clearCachedMetadata(m_scriptURL); |
} |
-PassRefPtr<CachedMetadata> ServiceWorkerScriptCachedMetadataHandler::cachedMetadata(unsigned dataTypeID) const |
+PassRefPtr<CachedMetadata> ServiceWorkerScriptCachedMetadataHandler::cachedMetadata(uint32_t dataTypeID) const |
{ |
if (!m_cachedMetadata || m_cachedMetadata->dataTypeID() != dataTypeID) |
return nullptr; |