Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Unified Diff: content/common/cursors/webcursor_aurax11.cc

Issue 437593007: Don't rotate WebCursor based on display rotation in X11 Aura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/cursors/webcursor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cursors/webcursor_aurax11.cc
diff --git a/content/common/cursors/webcursor_aurax11.cc b/content/common/cursors/webcursor_aurax11.cc
index 8f25225e8ef140d19ba2900c0918800088a967a0..91fc942b680a391023502c2eba75a6a10d260315 100644
--- a/content/common/cursors/webcursor_aurax11.cc
+++ b/content/common/cursors/webcursor_aurax11.cc
@@ -29,7 +29,7 @@ const ui::PlatformCursor WebCursor::GetPlatformCursor() {
memcpy(bitmap.getAddr32(0, 0), custom_data_.data(), custom_data_.size());
gfx::Point hotspot = hotspot_;
ui::ScaleAndRotateCursorBitmapAndHotpoint(
- device_scale_factor_, rotation_, &bitmap, &hotspot);
+ device_scale_factor_, gfx::Display::ROTATE_0, &bitmap, &hotspot);
XcursorImage* image = ui::SkBitmapToXcursorImage(&bitmap, hotspot);
platform_cursor_ = ui::CreateReffedCustomXCursor(image);
@@ -37,12 +37,10 @@ const ui::PlatformCursor WebCursor::GetPlatformCursor() {
}
void WebCursor::SetDisplayInfo(const gfx::Display& display) {
- if (rotation_ == display.rotation() &&
- device_scale_factor_ == display.device_scale_factor())
+ if (device_scale_factor_ == display.device_scale_factor())
return;
device_scale_factor_ = display.device_scale_factor();
- rotation_ = display.rotation();
if (platform_cursor_)
ui::UnrefCustomXCursor(platform_cursor_);
platform_cursor_ = 0;
@@ -53,7 +51,6 @@ void WebCursor::SetDisplayInfo(const gfx::Display& display) {
void WebCursor::InitPlatformData() {
platform_cursor_ = 0;
device_scale_factor_ = 1.f;
- rotation_ = gfx::Display::ROTATE_0;
}
bool WebCursor::SerializePlatformData(Pickle* pickle) const {
« no previous file with comments | « content/common/cursors/webcursor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698