← Back to branch summary

~justinmcp/oxide/mediahub-fixes-1.9

« back to all changes in this revision

Viewing changes to patches/mediahub-support.patch

  • Committer: Chris Coulson
  • Date: 2015-07-16 10:09:46 UTC
  • mfrom: (640.1.329 canary)
  • Revision ID: chris.coulson@canonical.com-20150716100946-k9707yx7xquf14ks
Bump Chromium rev to 45.0.2454.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/mediahub-support.patch
1
1
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
2
2
--- a/content/public/renderer/content_renderer_client.cc
3
3
+++ b/content/public/renderer/content_renderer_client.cc
4
 
@@ -222,9 +222,17 @@ std::string ContentRendererClient::GetUs
 
4
@@ -223,9 +223,17 @@ std::string ContentRendererClient::GetUs
5
5
   return std::string();
6
6
 }
7
7
 
41
41
 class WebPrescientNetworking;
42
42
 class WebRTCPeerConnectionHandler;
43
43
 class WebRTCPeerConnectionHandlerClient;
44
 
@@ -53,16 +55,17 @@ class WebURLRequest;
45
 
 class WebWorkerContentSettingsClientProxy;
 
44
@@ -54,16 +56,17 @@ class WebWorkerContentSettingsClientProx
46
45
 struct WebPluginParams;
47
46
 struct WebURLError;
48
47
 }
49
48
 
50
49
 namespace media {
 
50
 class GpuVideoAcceleratorFactories;
51
51
 class MediaLog;
52
52
 class RendererFactory;
53
53
+class WebMediaPlayerDelegate;
59
59
 class DocumentState;
60
60
 class MediaStreamRendererFactory;
61
61
 class RenderFrame;
62
 
@@ -309,13 +312,20 @@ class CONTENT_EXPORT ContentRendererClie
 
62
@@ -311,13 +314,20 @@ class CONTENT_EXPORT ContentRendererClie
63
63
   virtual scoped_ptr<blink::WebAppBannerClient> CreateAppBannerClient(
64
64
       RenderFrame* render_frame);
65
65
 
83
83
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
84
84
--- a/content/renderer/render_frame_impl.cc
85
85
+++ b/content/renderer/render_frame_impl.cc
86
 
@@ -1956,16 +1956,26 @@ blink::WebMediaPlayer* RenderFrameImpl::
 
86
@@ -1970,16 +1970,26 @@ blink::WebMediaPlayer* RenderFrameImpl::
87
87
   if (!web_stream.isNull())
88
88
     return CreateWebMediaPlayerForMediaStream(client);
89
89