← Back to branch summary

~justinmcp/oxide/mediahub-seekable-status-1.10

« back to all changes in this revision

Viewing changes to patches/allow-render-widget-compositor-settings-override.patch

  • Committer: Chris Coulson
  • Date: 2015-08-21 15:16:19 UTC
  • mfrom: (640.1.348 canary)
  • Revision ID: chris.coulson@canonical.com-20150821151619-s1nzodx4pb6ai2bx
Bump Chromium rev to 46.0.2486.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/allow-render-widget-compositor-settings-override.patch
5
5
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
6
6
--- a/content/public/renderer/content_renderer_client.cc
7
7
+++ b/content/public/renderer/content_renderer_client.cc
8
 
@@ -231,9 +231,12 @@ ContentRendererClient::CreateAppBannerCl
 
8
@@ -217,9 +217,12 @@ ContentRendererClient::CreateAppBannerCl
9
9
 blink::WebMediaPlayer* ContentRendererClient::OverrideWebMediaPlayer(
10
10
     blink::WebFrame* frame,
11
11
     blink::WebMediaPlayerClient* client,
21
21
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
22
22
--- a/content/public/renderer/content_renderer_client.h
23
23
+++ b/content/public/renderer/content_renderer_client.h
24
 
@@ -52,16 +52,20 @@ class WebSpeechSynthesizerClient;
 
24
@@ -50,16 +50,20 @@ class WebSpeechSynthesizerClient;
25
25
 class WebThemeEngine;
26
26
 class WebURLResponse;
27
27
 class WebURLRequest;
42
42
 struct KeySystemInfo;
43
43
 }
44
44
 
45
 
@@ -321,13 +325,16 @@ class CONTENT_EXPORT ContentRendererClie
 
45
@@ -302,13 +306,16 @@ class CONTENT_EXPORT ContentRendererClie
46
46
       std::map<std::string, std::string>* properties) {}
47
47
 
48
48
   // Allow overriding default media player
62
62
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
63
63
--- a/content/renderer/gpu/render_widget_compositor.cc
64
64
+++ b/content/renderer/gpu/render_widget_compositor.cc
65
 
@@ -31,17 +31,19 @@
 
65
@@ -34,17 +34,19 @@
66
66
 #include "cc/output/swap_promise.h"
67
67
 #include "cc/resources/single_release_callback.h"
68
68
 #include "cc/scheduler/begin_frame_source.h"