Changeset 200641 in webkit

Timestamp:

May 10, 2016, 1:44:43 PM (9 years ago)

Author:

Csaba Osztrogonác

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (6 diffs)
• WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-05-10  Csaba Osztrogonác  <ossy@webkit.org>
+
+        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  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -262 +262 @@
         StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
         
+#if ENABLE(VIDEO)
         callbackAggregator->addPendingCallback();
         m_queue->dispatch([fetchOptions, mediaCacheDirectory, callbackAggregator] {
@@ -278 +279 @@
             });
         });
+#endif
     }
 
@@ -558 +560 @@
         StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
 
+#if ENABLE(VIDEO)
         callbackAggregator->addPendingCallback();
         m_queue->dispatch([modifiedSince, mediaCacheDirectory, callbackAggregator] {
@@ -566 +569 @@
             });
         });
+#endif
     }
 
@@ -804 +808 @@
         }
         
+#if ENABLE(VIDEO)
         callbackAggregator->addPendingCallback();
         m_queue->dispatch([origins, mediaCacheDirectory, callbackAggregator] {
@@ -812 +817 @@
             });
         });
+#endif
     }
     

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -298 +298 @@
 #endif
 
+#if ENABLE(VIDEO)
     if (!parameters.mediaCacheDirectory.isEmpty())
         WebCore::HTMLMediaElement::setMediaCacheDirectory(parameters.mediaCacheDirectory);
+#endif
 
     setCacheModel(static_cast<uint32_t>(parameters.cacheModel));