← Back to branch summary

~osomon/oxide/fix-crash-popup-menu

« back to all changes in this revision

Viewing changes to patches/mediahub-support.patch

  • Committer: Chris Coulson
  • Date: 2015-04-17 20:22:43 UTC
  • mfrom: (640.1.244 canary)
  • Revision ID: chris.coulson@canonical.com-20150417202243-a5dz76gwj6hdqmw2
Bump Chromium rev to 44.0.2369.0 and Qt version to 1.8

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/mediahub-support.patch
59
59
 class DocumentState;
60
60
 class RenderFrame;
61
61
 class RenderView;
62
 
@@ -286,13 +289,20 @@ class CONTENT_EXPORT ContentRendererClie
63
 
   virtual bool IsPluginAllowedToUseCompositorAPI(const GURL& url);
64
 
 
65
 
   // Returns true if dev channel APIs are available for plugins.
66
 
   virtual bool IsPluginAllowedToUseDevChannelAPIs();
67
 
 
68
 
   // Returns a user agent override specific for |url|, or empty string if
69
 
   // default user agent should be used.
70
 
   virtual std::string GetUserAgentOverrideForURL(const GURL& url);
 
62
@@ -295,13 +298,20 @@ class CONTENT_EXPORT ContentRendererClie
 
63
   // Records a sample string to a Rappor privacy-preserving metric.
 
64
   // See: https://www.chromium.org/developers/design-documents/rappor
 
65
   virtual void RecordRappor(const std::string& metric,
 
66
                             const std::string& sample) {}
 
67
 
 
68
   // Records a domain and registry of a url to a Rappor privacy-preserving
 
69
   // metric. See: https://www.chromium.org/developers/design-documents/rappor
 
70
   virtual void RecordRapporURL(const std::string& metric, const GURL& url) {}
71
71
+
72
72
+  // Allow overriding default media player
73
73
+  virtual blink::WebMediaPlayer* OverrideWebMediaPlayer(
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
 
@@ -1941,16 +1941,26 @@ blink::WebMediaPlayer* RenderFrameImpl::
 
86
@@ -2024,16 +2024,26 @@ blink::WebMediaPlayer* RenderFrameImpl::
87
87
     return CreateWebMediaPlayerForMediaStream(url, client);
88
88
 
89
89
 #if defined(OS_ANDROID)