From f1e2b2d80366b43ba638290bca55272b000b3ce1 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Mon, 1 Aug 2016 16:19:34 +0200
Subject: Adaptations to Chromium 53
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/core/renderer/content_renderer_client_qt.cpp | 5 +++--
 src/core/renderer/render_frame_observer_qt.h     | 1 +
 src/core/renderer/render_view_observer_qt.cpp    | 4 ++--
 src/core/renderer/render_view_observer_qt.h      | 1 +
 src/core/renderer/web_channel_ipc_transport.h    | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/core/renderer')

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 2b9970cc3..a6e35f4be 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -374,10 +374,11 @@ static void AddPepperBasedWidevine(std::vector<std::unique_ptr<media::KeySystemP
     supported_codecs |= media::EME_CODEC_MP4_AAC;
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
+    using Robustness = cdm::WidevineKeySystemProperties::Robustness;
     concrete_key_systems->emplace_back(new cdm::WidevineKeySystemProperties(
         supported_codecs,
-        media::EmeRobustness::SW_SECURE_CRYPTO,       // Maximum audio robustness.
-        media::EmeRobustness::SW_SECURE_DECODE,       // Maximum video robustness.
+        Robustness::SW_SECURE_CRYPTO,       // Maximum audio robustness.
+        Robustness::SW_SECURE_DECODE,       // Maximum video robustness.
         media::EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
         media::EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-release-message.
         media::EmeFeatureSupport::REQUESTABLE,        // Persistent state.
diff --git a/src/core/renderer/render_frame_observer_qt.h b/src/core/renderer/render_frame_observer_qt.h
index b1d59d8c5..c59b7babc 100644
--- a/src/core/renderer/render_frame_observer_qt.h
+++ b/src/core/renderer/render_frame_observer_qt.h
@@ -58,6 +58,7 @@ public:
 #if defined(ENABLE_PLUGINS)
     void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
 #endif
+    void OnDestruct() override { }
 
 private:
     DISALLOW_COPY_AND_ASSIGN(RenderFrameObserverQt);
diff --git a/src/core/renderer/render_view_observer_qt.cpp b/src/core/renderer/render_view_observer_qt.cpp
index 523d97052..393b4752c 100644
--- a/src/core/renderer/render_view_observer_qt.cpp
+++ b/src/core/renderer/render_view_observer_qt.cpp
@@ -72,8 +72,8 @@ void RenderViewObserverQt::onFetchDocumentInnerText(quint64 requestId)
 {
     blink::WebString text;
     if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame())
-        text = blink::WebFrameContentDumper::deprecatedDumpFrameTreeAsText(
-                    static_cast<blink::WebLocalFrame*>(render_view()->GetWebView()->mainFrame()),
+        text = blink::WebFrameContentDumper::dumpWebViewAsText(
+                    render_view()->GetWebView(),
                     std::numeric_limits<std::size_t>::max());
     Send(new RenderViewObserverHostQt_DidFetchDocumentInnerText(routing_id(), requestId, text));
 }
diff --git a/src/core/renderer/render_view_observer_qt.h b/src/core/renderer/render_view_observer_qt.h
index 06d97ee85..b62c815af 100644
--- a/src/core/renderer/render_view_observer_qt.h
+++ b/src/core/renderer/render_view_observer_qt.h
@@ -58,6 +58,7 @@ private:
     void onSetBackgroundColor(quint32 color);
 
     void OnFirstVisuallyNonEmptyLayout() Q_DECL_OVERRIDE;
+    void OnDestruct() Q_DECL_OVERRIDE { }
 
     virtual bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
     virtual void Navigate(const GURL& url) Q_DECL_OVERRIDE;
diff --git a/src/core/renderer/web_channel_ipc_transport.h b/src/core/renderer/web_channel_ipc_transport.h
index ae3f16cac..e949d1c99 100644
--- a/src/core/renderer/web_channel_ipc_transport.h
+++ b/src/core/renderer/web_channel_ipc_transport.h
@@ -68,6 +68,7 @@ private:
     void installWebChannel(uint worldId);
     void uninstallWebChannel(uint worldId);
     virtual bool OnMessageReceived(const IPC::Message &message) Q_DECL_OVERRIDE;
+    virtual void OnDestruct() Q_DECL_OVERRIDE { }
 
     bool m_installed;
     uint m_installedWorldId;
-- 
cgit v1.2.3