Title: [200641] trunk/Source/WebKit2
- Revision
- 200641
- Author
- [email protected]
- Date
- 2016-05-10 13:44:43 -0700 (Tue, 10 May 2016)
Log Message
Fix the !ENABLE(VIDEO) build
https://bugs.webkit.org/show_bug.cgi?id=157518
Reviewed by Alex Christensen.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):
(WebKit::WebsiteDataStore::removeData):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (200640 => 200641)
--- trunk/Source/WebKit2/ChangeLog 2016-05-10 20:42:33 UTC (rev 200640)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-10 20:44:43 UTC (rev 200641)
@@ -1,3 +1,16 @@
+2016-05-10 Csaba Osztrogonác <[email protected]>
+
+ Fix the !ENABLE(VIDEO) build
+ https://bugs.webkit.org/show_bug.cgi?id=157518
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+ (WebKit::WebsiteDataStore::removeData):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
2016-05-10 Anders Carlsson <[email protected]>
Fix more deprecation warnings.
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (200640 => 200641)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-05-10 20:42:33 UTC (rev 200640)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-05-10 20:44:43 UTC (rev 200641)
@@ -261,6 +261,7 @@
if (dataTypes.contains(WebsiteDataType::DiskCache)) {
StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
+#if ENABLE(VIDEO)
callbackAggregator->addPendingCallback();
m_queue->dispatch([fetchOptions, mediaCacheDirectory, callbackAggregator] {
HashSet<RefPtr<WebCore::SecurityOrigin>> origins = WebCore::HTMLMediaElement::originsInMediaCache(mediaCacheDirectory.string());
@@ -277,6 +278,7 @@
delete websiteData;
});
});
+#endif
}
auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, !isPersistent());
@@ -557,6 +559,7 @@
if (dataTypes.contains(WebsiteDataType::DiskCache)) {
StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
+#if ENABLE(VIDEO)
callbackAggregator->addPendingCallback();
m_queue->dispatch([modifiedSince, mediaCacheDirectory, callbackAggregator] {
WebCore::HTMLMediaElement::clearMediaCache(mediaCacheDirectory.string(), modifiedSince);
@@ -565,6 +568,7 @@
callbackAggregator->removePendingCallback();
});
});
+#endif
}
auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
@@ -803,6 +807,7 @@
origins.add(origin);
}
+#if ENABLE(VIDEO)
callbackAggregator->addPendingCallback();
m_queue->dispatch([origins, mediaCacheDirectory, callbackAggregator] {
WebCore::HTMLMediaElement::clearMediaCacheForOrigins(mediaCacheDirectory.string(), origins);
@@ -811,6 +816,7 @@
callbackAggregator->removePendingCallback();
});
});
+#endif
}
auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (200640 => 200641)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-05-10 20:42:33 UTC (rev 200640)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-05-10 20:44:43 UTC (rev 200641)
@@ -297,8 +297,10 @@
m_applicationCacheStorage->setDefaultOriginQuota(25ULL * 1024 * 1024);
#endif
+#if ENABLE(VIDEO)
if (!parameters.mediaCacheDirectory.isEmpty())
WebCore::HTMLMediaElement::setMediaCacheDirectory(parameters.mediaCacheDirectory);
+#endif
setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
