From 67155451ba5b3d4d46b3948c70af2954abd93536 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 30 Sep 2014 18:53:27 +0000
Subject: [PATCH] Windows: Fix cancellation of drag&drop when using off-screen
 rendering and multi-threaded message loop and returning false from
 CefRenderHandler::StartDragging (issue #1364).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/2062@1854 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 libcef/browser/browser_host_impl.cc     | 14 ++++++--------
 libcef/browser/web_contents_view_osr.cc | 12 ++++++++----
 libcef/browser/web_contents_view_osr.h  |  5 +++--
 tests/cefclient/client_handler.cpp      |  1 -
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/libcef/browser/browser_host_impl.cc b/libcef/browser/browser_host_impl.cc
index 54cc14490..904b52d0b 100644
--- a/libcef/browser/browser_host_impl.cc
+++ b/libcef/browser/browser_host_impl.cc
@@ -408,16 +408,16 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::CreateInternal(
     content::WebContents::CreateParams create_params(
         browser_context);
 
+    CefWebContentsViewOSR* view_or = NULL;
     if (window_info.windowless_rendering_enabled) {
       // Use the OSR view instead of the default view.
-      CefWebContentsViewOSR* view_or = new CefWebContentsViewOSR(
-          web_contents,
-          CefContentBrowserClient::Get()->GetWebContentsViewDelegate(
-              web_contents));
+      view_or = new CefWebContentsViewOSR();
       create_params.view = view_or;
       create_params.delegate_view = view_or;
     }
     web_contents = content::WebContents::Create(create_params);
+    if (view_or)
+      view_or->set_web_contents(web_contents);
   }
 
   CefRefPtr<CefBrowserHostImpl> browser =
@@ -2143,10 +2143,8 @@ bool CefBrowserHostImpl::ShouldCreateWebContents(
   DCHECK(pending_popup_info_.get());
   if (pending_popup_info_->window_info.windowless_rendering_enabled) {
     // Use the OSR view instead of the default view.
-    CefWebContentsViewOSR* view_or = new CefWebContentsViewOSR(
-        web_contents,
-        CefContentBrowserClient::Get()->GetWebContentsViewDelegate(
-            web_contents));
+    CefWebContentsViewOSR* view_or = new CefWebContentsViewOSR();
+    view_or->set_web_contents(web_contents);
     *view = view_or;
     *delegate_view = view_or;
   }
diff --git a/libcef/browser/web_contents_view_osr.cc b/libcef/browser/web_contents_view_osr.cc
index 673b112c3..460745bf6 100644
--- a/libcef/browser/web_contents_view_osr.cc
+++ b/libcef/browser/web_contents_view_osr.cc
@@ -10,16 +10,20 @@
 
 #include "content/public/browser/render_widget_host.h"
 
-CefWebContentsViewOSR::CefWebContentsViewOSR(
-    content::WebContents* web_contents,
-    content::WebContentsViewDelegate* delegate)
-    : web_contents_(web_contents),
+CefWebContentsViewOSR::CefWebContentsViewOSR()
+    : web_contents_(NULL),
       view_(NULL) {
 }
 
 CefWebContentsViewOSR::~CefWebContentsViewOSR() {
 }
 
+void CefWebContentsViewOSR::set_web_contents(
+    content::WebContents* web_contents) {
+  DCHECK(!web_contents_);
+  web_contents_ = web_contents;
+}
+
 gfx::NativeView CefWebContentsViewOSR::GetNativeView() const {
   return gfx::NativeView();
 }
diff --git a/libcef/browser/web_contents_view_osr.h b/libcef/browser/web_contents_view_osr.h
index a6f0431af..bbfc13abd 100644
--- a/libcef/browser/web_contents_view_osr.h
+++ b/libcef/browser/web_contents_view_osr.h
@@ -20,10 +20,11 @@ class CefRenderWidgetHostViewOSR;
 class CefWebContentsViewOSR : public content::WebContentsView,
                               public content::RenderViewHostDelegateView {
  public:
-  CefWebContentsViewOSR(content::WebContents* web_contents,
-                        content::WebContentsViewDelegate* delegate);
+  CefWebContentsViewOSR();
   virtual ~CefWebContentsViewOSR();
 
+  void set_web_contents(content::WebContents* web_contents);
+
   // WebContentsView methods.
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
diff --git a/tests/cefclient/client_handler.cpp b/tests/cefclient/client_handler.cpp
index 0a381eb76..63814097f 100644
--- a/tests/cefclient/client_handler.cpp
+++ b/tests/cefclient/client_handler.cpp
@@ -732,7 +732,6 @@ void ClientHandler::SetOSRHandler(CefRefPtr<RenderHandler> handler) {
 }
 
 CefRefPtr<ClientHandler::RenderHandler> ClientHandler::GetOSRHandler() const {
-  CEF_REQUIRE_UI_THREAD();
   return osr_handler_; 
 }