Chromium Code Reviews| Index: android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java |
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java |
| index 7044cb77fcc33939376c1661c605b2b4b4902c38..15c5edbb9acb73861ac9ce164b2f746478fe77f8 100644 |
| --- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java |
| +++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java |
| @@ -5,13 +5,16 @@ |
| package org.chromium.android_webview; |
| import android.content.Context; |
| +import android.util.Log; |
| import org.chromium.base.PathUtils; |
| import org.chromium.base.ThreadUtils; |
| import org.chromium.base.library_loader.LibraryLoader; |
| import org.chromium.base.library_loader.ProcessInitException; |
| import org.chromium.content.browser.BrowserStartupController; |
| +import org.chromium.media.MediaDrmBridge; |
| +import java.util.UUID; |
| /** |
| * Wrapper for the steps needed to initialize the java and native sides of webview chromium. |
| @@ -50,10 +53,25 @@ public abstract class AwBrowserProcess { |
| try { |
| BrowserStartupController.get(context).startBrowserProcessesSync( |
| BrowserStartupController.MAX_RENDERERS_SINGLE_PROCESS); |
| + initializePlatformKeySystem(); |
|
mkosiba (inactive)
2014/06/16 08:38:20
any idea how much time this will add to our startu
ycheo (away)
2014/06/16 11:05:53
Did a quick experiment using android.os.SystemCloc
|
| } catch (ProcessInitException e) { |
| throw new RuntimeException("Cannot initialize WebView", e); |
| } |
| } |
| }); |
| } |
| + |
| + private static void initializePlatformKeySystem() { |
| + String[] mappings = AwResource.getConfigKeySystemUuidMapping(); |
| + for (String mapping : mappings) { |
| + try { |
| + String fragments[] = mapping.split(","); |
| + String keySystem = fragments[0].trim(); |
| + UUID uuid = UUID.fromString(fragments[1]); |
| + MediaDrmBridge.addKeySystemUuidMapping(keySystem, uuid); |
| + } catch (java.lang.RuntimeException e) { |
| + Log.e(TAG, "Can't parse key-system mapping: " + mapping); |
| + } |
| + } |
| + } |
| } |