Update the QtWebEngineCore library to run on top of Chromium 37

Most of the patch is about upstream classes/methods that changed.

Other important details:
- icu data files are now used by default
- cygwin is no longer required to build on Windows
- RenderFrameHost has been replacing RenderViewHost in a few places,
  following the separate process iframes support in Chromium
- The user agent is accessed through ContentClient::GetUserAgent
  instead of from the command line switches

Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 7 insertions, 23 deletions

diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
index 38d7b1c19..0e02f574a 100644
--- a/src/core/media_capture_devices_dispatcher.h
+++ b/src/core/media_capture_devices_dispatcher.h
@@ -60,9 +60,7 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/media_stream_request.h"
 
-class AudioStreamIndicator;
 class DesktopStreamsRegistry;
-class MediaStreamCaptureIndicator;
 
 // This singleton is used to receive updates about media events from the content
 // layer. Based on Chrome's implementation.
@@ -80,13 +78,14 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
   void getDefaultDevices(const std::string &audioDeviceId, const std::string &videoDeviceId, bool audio, bool video, content::MediaStreamDevices *);
 
   // Overridden from content::MediaObserver:
-  virtual void OnAudioCaptureDevicesChanged(const content::MediaStreamDevices &) Q_DECL_OVERRIDE;
-  virtual void OnVideoCaptureDevicesChanged(const content::MediaStreamDevices &) Q_DECL_OVERRIDE;
-  virtual void OnMediaRequestStateChanged(int renderProcessId, int renderViewId, int pageRequestId, const content::MediaStreamDevice &device
+  virtual void OnAudioCaptureDevicesChanged() Q_DECL_OVERRIDE { }
+  virtual void OnVideoCaptureDevicesChanged() Q_DECL_OVERRIDE { }
+  virtual void OnMediaRequestStateChanged(int renderProcessId, int renderViewId, int pageRequestId, const GURL &securityOrigin, const content::MediaStreamDevice &device
                                           , content::MediaRequestState state) Q_DECL_OVERRIDE;
-  virtual void OnAudioStreamPlayingChanged(int /*render_process_id*/, int /*render_view_id*/, int /*stream_id*/
-                                           , bool /*is_playing*/, float /*power_dBFS*/, bool /*clipped*/) Q_DECL_OVERRIDE {}
-  virtual void OnCreatingAudioStream(int renderProcessId, int renderViewId) Q_DECL_OVERRIDE;
+
+  virtual void OnCreatingAudioStream(int /*render_process_id*/, int /*render_frame_id*/) Q_DECL_OVERRIDE { }
+  virtual void OnAudioStreamPlaying(int /*render_process_id*/, int /*render_frame_id*/, int /*stream_id*/, const ReadPowerAndClipCallback& /*power_read_callback*/) Q_DECL_OVERRIDE { }
+  virtual void OnAudioStreamStopped(int /*render_process_id*/, int /*render_frame_id*/, int /*stream_id*/) Q_DECL_OVERRIDE { }
 
   DesktopStreamsRegistry *getDesktopStreamsRegistry();
 
@@ -107,9 +106,6 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
   MediaCaptureDevicesDispatcher();
   virtual ~MediaCaptureDevicesDispatcher();
 
-  const content::MediaStreamDevices &getAudioCaptureDevices();
-  const content::MediaStreamDevices &getVideoCaptureDevices();
-
   // content::NotificationObserver implementation.
   virtual void Observe(int type, const content::NotificationSource &source, const content::NotificationDetails &details) Q_DECL_OVERRIDE;
 
@@ -121,21 +117,9 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
   void ProcessQueuedAccessRequest(content::WebContents *);
 
   // Called by the MediaObserver() functions, executed on UI thread.
-  void updateAudioDevicesOnUIThread(const content::MediaStreamDevices &);
-  void updateVideoDevicesOnUIThread(const content::MediaStreamDevices &);
   void updateMediaRequestStateOnUIThread(int renderProcessId, int renderViewId, int pageRequestId, const content::MediaStreamDevice &
                                          , content::MediaRequestState);
 
-  // A list of cached audio capture devices.
-  content::MediaStreamDevices m_audioDevices;
-
-  // A list of cached video capture devices.
-  content::MediaStreamDevices m_videoDevices;
-
-  // Flag to indicate if device enumeration has been done/doing.
-  // Only accessed on UI thread.
-  bool m_devicesEnumerated;
-
   RequestsQueues m_pendingRequests;
 
   scoped_ptr<DesktopStreamsRegistry> m_desktopStreamsRegistry;