mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #3957 from atom/widevine

Browse source 
Merge #3830
This commit is contained in:
Cheng Zhao 2015-12-30 12:46:19 +08:00
commit cb5d79e0df
19 changed files with 481 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/renderer/atom_renderer_client.cc
View file

@ -5,6 +5,7 @@
#include "atom/renderer/atom_renderer_client.h"
#include <string>
#include <vector>
#include "atom/common/api/api_messages.h"
#include "atom/common/api/atom_bindings.h"
@ -15,6 +16,7 @@
#include "atom/renderer/guest_view_container.h"
#include "atom/renderer/node_array_buffer_bridge.h"
#include "base/command_line.h"
#include "chrome/renderer/media/chrome_key_systems.h"
#include "chrome/renderer/pepper/pepper_helper.h"
#include "chrome/renderer/printing/print_web_view_helper.h"
#include "chrome/renderer/tts_dispatcher.h"
@ -234,4 +236,9 @@ void AtomRendererClient::EnableWebRuntimeFeatures() {
blink::WebRuntimeFeatures::enableSharedWorker(true);
}
void AtomRendererClient::AddKeySystems(
std::vector<media::KeySystemInfo>* key_systems) {
AddChromeKeySystems(key_systems);
}
} // namespace atom

2
atom/renderer/atom_renderer_client.h
View file

@ -6,6 +6,7 @@
#define ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
#include <string>
#include <vector>
#include "content/public/renderer/content_renderer_client.h"
#include "content/public/renderer/render_process_observer.h"
@ -58,6 +59,7 @@ class AtomRendererClient : public content::ContentRendererClient,
bool ShouldOverridePageVisibilityState(
const content::RenderFrame* render_frame,
blink::WebPageVisibilityState* override_state) override;
void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
void EnableWebRuntimeFeatures();