Title: [181071] trunk/Tools
Revision
181071
Author
[email protected]
Date
2015-03-05 00:51:52 -0800 (Thu, 05 Mar 2015)

Log Message

[EFL] REGRESSION (r178685): ASSERTION FAILED: !parameters.mediaKeyStorageDirectory.isEmpty()
https://bugs.webkit.org/show_bug.cgi?id=141154

Patch by Pawel Forysiuk <[email protected]> on 2015-03-05
Reviewed by Jer Noble.

Unlike GTK, EFL port enables ENABLE_ENCRYPTED_MEDIA_V2 build option by default.

For the sake of completeness WebKitTestRunner should specify temporary
folder for MediaKeysStorageDirecory as well as IndexedDB, LocalStorage, etc.

Default non legacy paths are set up in ProcessPoolConfiguration constructor.
They use WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation
to get data storage paths. Only Mac port has an actual implementation of it.
However, WebKitTestRunner overrides them in favour of unique temporary dir
which is taken from libraryPathForTesting().

Since WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation
is not implemented for EFL and GTK ports it returns an empty string.
All default data folders besides MediaKeys are overridden in TestRunner
code with unique temporary folders derived from DUMPRENDERTREE_TEMP
env variable.

GTK port does not enable encrypted keys by default so
WebMediaKeyStorageManager::initialize() code path is never triggered.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize): Set MediaKeysStorageDirectory for all
WebKit ports.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (181070 => 181071)


--- trunk/Tools/ChangeLog	2015-03-05 08:03:22 UTC (rev 181070)
+++ trunk/Tools/ChangeLog	2015-03-05 08:51:52 UTC (rev 181071)
@@ -1,3 +1,34 @@
+2015-03-05  Pawel Forysiuk  <[email protected]>
+
+        [EFL] REGRESSION (r178685): ASSERTION FAILED: !parameters.mediaKeyStorageDirectory.isEmpty()
+        https://bugs.webkit.org/show_bug.cgi?id=141154
+
+        Reviewed by Jer Noble.
+
+        Unlike GTK, EFL port enables ENABLE_ENCRYPTED_MEDIA_V2 build option by default.
+
+        For the sake of completeness WebKitTestRunner should specify temporary
+        folder for MediaKeysStorageDirecory as well as IndexedDB, LocalStorage, etc.
+
+        Default non legacy paths are set up in ProcessPoolConfiguration constructor.
+        They use WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation
+        to get data storage paths. Only Mac port has an actual implementation of it.
+        However, WebKitTestRunner overrides them in favour of unique temporary dir
+        which is taken from libraryPathForTesting().
+
+        Since WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation
+        is not implemented for EFL and GTK ports it returns an empty string.
+        All default data folders besides MediaKeys are overridden in TestRunner
+        code with unique temporary folders derived from DUMPRENDERTREE_TEMP
+        env variable.
+
+        GTK port does not enable encrypted keys by default so
+        WebMediaKeyStorageManager::initialize() code path is never triggered.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize): Set MediaKeysStorageDirectory for all
+        WebKit ports.
+
 2015-03-05  Csaba Osztrogonác  <[email protected]>
 
         [buildbot] Add regression test to check which builder runs which tests

Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (181070 => 181071)


--- trunk/Tools/WebKitTestRunner/TestController.cpp	2015-03-05 08:03:22 UTC (rev 181070)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2015-03-05 08:51:52 UTC (rev 181071)
@@ -355,6 +355,7 @@
         WKContextConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "IndexedDB").get());
         WKContextConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
         WKContextConfigurationSetWebSQLDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "WebSQL").get());
+        WKContextConfigurationSetMediaKeysStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "MediaKeys").get());
     }
 
     m_context = adoptWK(WKContextCreateWithConfiguration(configuration.get()));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to