From 5b27df39b2860ba4c8a36660d82e1ffc5b76029e Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 11 May 2016 11:01:21 -0400
Subject: [PATCH] Fix incorrect initialization of WebCursor object (issue
 #1894)

---
 patch/patch.cfg                    |  6 ++++++
 patch/patches/webcursor_1894.patch | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 patch/patches/webcursor_1894.patch

diff --git a/patch/patch.cfg b/patch/patch.cfg
index ad4b485a7..398795ec6 100644
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@@ -264,4 +264,10 @@ patches = [
     'name': 'win_util_1783123003',
     'path': '../base/win/',
   },
+  {
+    # Fix incorrect initialization of WebCursor object.
+    # https://bitbucket.org/chromiumembedded/cef/issues/1894
+    'name': 'webcursor_1894',
+    'path': '../content/common/cursors/',
+  },
 ]
diff --git a/patch/patches/webcursor_1894.patch b/patch/patches/webcursor_1894.patch
new file mode 100644
index 000000000..e751b0c4c
--- /dev/null
+++ b/patch/patches/webcursor_1894.patch
@@ -0,0 +1,20 @@
+diff --git webcursor_aurawin.cc webcursor_aurawin.cc
+index b8b4c57..69fe05e 100644
+--- webcursor_aurawin.cc
++++ webcursor_aurawin.cc
+@@ -37,6 +37,7 @@ ui::PlatformCursor WebCursor::GetPlatformCursor() {
+ 
+ void WebCursor::InitPlatformData() {
+   custom_cursor_ = NULL;
++  device_scale_factor_ = 1.0f;
+ }
+ 
+ bool WebCursor::SerializePlatformData(base::Pickle* pickle) const {
+@@ -59,6 +60,7 @@ void WebCursor::CleanupPlatformData() {
+ }
+ 
+ void WebCursor::CopyPlatformData(const WebCursor& other) {
++  device_scale_factor_ = other.device_scale_factor_;
+ }
+ 
+ }  // namespace content