Fix incorrect initialization of WebCursor object (issue #1894)

This commit is contained in:
Marshall Greenblatt 2016-05-11 11:01:21 -04:00
parent 64e2fe1d2b
commit 5b27df39b2
2 changed files with 26 additions and 0 deletions

View File

@ -264,4 +264,10 @@ patches = [
'name': 'win_util_1783123003', 'name': 'win_util_1783123003',
'path': '../base/win/', 'path': '../base/win/',
}, },
{
# Fix incorrect initialization of WebCursor object.
# https://bitbucket.org/chromiumembedded/cef/issues/1894
'name': 'webcursor_1894',
'path': '../content/common/cursors/',
},
] ]

View File

@ -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