Index: components/html_viewer/media_factory.cc |
diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc |
index 260df923657f7b982f960f5f3ee30929eaf0caba..9f21a03b3ab14b4a6d7fe9dbe5cab1b05601dab8 100644 |
--- a/components/html_viewer/media_factory.cc |
+++ b/components/html_viewer/media_factory.cc |
@@ -28,6 +28,7 @@ |
#include "media/renderers/gpu_video_accelerator_factories.h" |
#include "mojo/application/public/cpp/connect.h" |
#include "mojo/application/public/interfaces/shell.mojom.h" |
+#include "third_party/WebKit/public/web/WebLocalFrame.h" |
namespace html_viewer { |
@@ -101,9 +102,15 @@ blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer( |
GetMediaPermission(), initial_cdm); |
base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
+ if (!resource_multibuffer_.get() || |
liberato (no reviews please)
2015/11/05 19:03:18
perhaps this should be protected by kMediaUseMulti
|
+ resource_multibuffer_->frame() != frame) { |
+ resource_multibuffer_.reset(new media::ResourceMultiBuffer(frame)); |
+ } |
+ |
return new media::WebMediaPlayerImpl(frame, client, encrypted_client, |
delegate, media_renderer_factory.Pass(), |
- GetCdmFactory(), params); |
+ GetCdmFactory(), resource_multibuffer_, |
+ params); |
#endif // defined(OS_ANDROID) |
} |