7 files changed, 9 insertions, 42 deletions
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp
index fecbac111..30e6efc2e 100644
--- a/src/core/browser_accessibility_qt.cpp
+++ b/src/core/browser_accessibility_qt.cpp
@@ -418,7 +418,7 @@ QAccessible::State BrowserAccessibilityQt::state() const
         state.expanded = true;
     if (s & (1 << ui::AX_STATE_FOCUSABLE))
         state.focusable = true;
-    if (s & (1 << ui::AX_STATE_FOCUSED))
+    if (manager()->GetFocus() == this)
         state.focused = true;
     if (s & (1 << ui::AX_STATE_HASPOPUP))
         state.hasPopup = true;
@@ -480,7 +480,7 @@ QStringList BrowserAccessibilityQt::actionNames() const
 void BrowserAccessibilityQt::doAction(const QString &actionName)
 {
     if (actionName == QAccessibleActionInterface::setFocusAction())
-        manager()->SetFocus(this, true);
+        manager()->SetFocus(*this);
 }
 
 QStringList BrowserAccessibilityQt::keyBindingsForAction(const QString &actionName) const
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 8a5dde70f..158bb0895 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -221,11 +221,9 @@ void AddPepperWidevine(std::vector<content::PepperPluginInfo>* plugins)
 
             // Add the supported codecs as if they came from the component manifest.
             std::vector<std::string> codecs;
-            codecs.push_back(kCdmSupportedCodecVorbis);
             codecs.push_back(kCdmSupportedCodecVp8);
             codecs.push_back(kCdmSupportedCodecVp9);
 #if defined(USE_PROPRIETARY_CODECS)
-            codecs.push_back(kCdmSupportedCodecAac);
             codecs.push_back(kCdmSupportedCodecAvc1);
 #endif  // defined(USE_PROPRIETARY_CODECS)
             std::string codec_string =
diff --git a/src/core/printing_message_filter_qt.cpp b/src/core/printing_message_filter_qt.cpp
index ba4d5c6e6..3c81896c1 100644
--- a/src/core/printing_message_filter_qt.cpp
+++ b/src/core/printing_message_filter_qt.cpp
@@ -76,9 +76,6 @@ void PrintingMessageFilterQt::OverrideThreadForMessage(
 bool PrintingMessageFilterQt::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PrintingMessageFilterQt, message)
-#if defined(OS_WIN)
-    IPC_MESSAGE_HANDLER(PrintHostMsg_DuplicateSection, OnDuplicateSection)
-#endif
     IPC_MESSAGE_HANDLER(PrintHostMsg_IsPrintingEnabled, OnIsPrintingEnabled)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(PrintHostMsg_GetDefaultPrintSettings,
                                     OnGetDefaultPrintSettings)
@@ -91,17 +88,6 @@ bool PrintingMessageFilterQt::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-#if defined(OS_WIN)
-void PrintingMessageFilterQt::OnDuplicateSection(
-    base::SharedMemoryHandle renderer_handle,
-    base::SharedMemoryHandle* browser_handle) {
-  // Duplicate the handle in this process right now so the memory is kept alive
-  // (even if it is not mapped)
-  base::SharedMemory shared_buf(renderer_handle, true, PeerHandle());
-  shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), browser_handle);
-}
-#endif
-
 void PrintingMessageFilterQt::OnIsPrintingEnabled(bool* is_enabled) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   *is_enabled = true;
diff --git a/src/core/printing_message_filter_qt.h b/src/core/printing_message_filter_qt.h
index c92bee192..156a31250 100644
--- a/src/core/printing_message_filter_qt.h
+++ b/src/core/printing_message_filter_qt.h
@@ -84,12 +84,6 @@ class PrintingMessageFilterQt : public content::BrowserMessageFilter {
  private:
   ~PrintingMessageFilterQt() override;
 
-#if defined(OS_WIN)
-  // Used to pass resulting EMF from renderer to browser in printing.
-  void OnDuplicateSection(base::SharedMemoryHandle renderer_handle,
-                          base::SharedMemoryHandle* browser_handle);
-#endif
-
   // GetPrintSettingsForRenderView must be called via PostTask and
   // base::Bind.  Collapse the settings-specific params into a
   // struct to avoid running into issues with too many params
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 3e0646d10..b986d29de 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -85,17 +85,6 @@ namespace QtWebEngineCore {
 static const char kHttpErrorDomain[] = "http";
 static const char kQrcSchemeQt[] = "qrc";
 
-class RenderProcessObserverQt : public content::RenderProcessObserver {
-public:
-    void WebKitInitialized() override
-    {
-        // Can only be done after blink is initialized.
-        blink::WebString qrcScheme(base::ASCIIToUTF16(kQrcSchemeQt));
-        // mark qrc as a secure scheme (avoids deprecation warnings)
-        blink::WebSecurityPolicy::registerURLSchemeAsSecure(qrcScheme);
-    }
-};
-
 ContentRendererClientQt::ContentRendererClientQt()
 {
 }
@@ -109,15 +98,17 @@ void ContentRendererClientQt::RenderThreadStarted()
     content::RenderThread *renderThread = content::RenderThread::Get();
     m_visitedLinkSlave.reset(new visitedlink::VisitedLinkSlave);
     m_webCacheObserver.reset(new web_cache::WebCacheRenderProcessObserver());
-    m_renderProcessObserver.reset(new RenderProcessObserverQt());
     renderThread->AddObserver(m_visitedLinkSlave.data());
     renderThread->AddObserver(UserResourceController::instance());
-    renderThread->AddObserver(m_renderProcessObserver.data());
 
 #if defined(ENABLE_SPELLCHECK)
     m_spellCheck.reset(new SpellCheck());
     renderThread->AddObserver(m_spellCheck.data());
 #endif
+
+    blink::WebString qrcScheme(base::ASCIIToUTF16(kQrcSchemeQt));
+    // mark qrc as a secure scheme (avoids deprecation warnings)
+    blink::WebSecurityPolicy::registerURLSchemeAsSecure(qrcScheme);
 }
 
 void ContentRendererClientQt::RenderViewCreated(content::RenderView* render_view)
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index d475c7801..847b09b63 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -44,10 +44,6 @@
 #include <QtGlobal>
 #include <QScopedPointer>
 
-namespace content {
-class RenderProcessObserver;
-}
-
 namespace visitedlink {
 class VisitedLinkSlave;
 }
@@ -81,7 +77,6 @@ public:
 private:
     QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave;
     QScopedPointer<web_cache::WebCacheRenderProcessObserver> m_webCacheObserver;
-    QScopedPointer<content::RenderProcessObserver> m_renderProcessObserver;
 #if defined(ENABLE_SPELLCHECK)
     QScopedPointer<SpellCheck> m_spellCheck;
 #endif
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 6da80e94d..c3d12a5ce 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -279,6 +279,9 @@ WebEngineContext::WebEngineContext()
     parsedCommandLine->AppendSwitch(switches::kDisableZeroCopy);
     parsedCommandLine->AppendSwitch(switches::kDisableGpuMemoryBufferCompositorResources);
 
+    // Enabled on OS X and Linux but currently not working. It worked in 5.7 on OS X.
+    parsedCommandLine->AppendSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
+
     if (useEmbeddedSwitches) {
         // Inspired by the Android port's default switches
         parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbar);