diff options
| author | mfomitchev <mfomitchev@chromium.org> | 2015-08-06 17:12:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-07 00:13:06 +0000 |
| commit | 2977ebf3b41b57398762743080108623bf15c8d1 (patch) | |
| tree | af01f7485fd4e6a373f5facb9c0d1d0e06493531 | |
| parent | 0aa7c64253cca8b636d52d1d01d94f96ab9c13fa (diff) | |
| download | chromium_src-2977ebf3b41b57398762743080108623bf15c8d1.zip chromium_src-2977ebf3b41b57398762743080108623bf15c8d1.tar.gz chromium_src-2977ebf3b41b57398762743080108623bf15c8d1.tar.bz2 | |
Aura on Android: Expanding the empty webcursor implementation.
Expanding the empty webcursor implementation so that we can use it with RenderWidgetHostViewAura.
Currently mouse cursors on Android are always rendered as a small circle. Until the time we invest into better cursor support on Android platform, this stubbed implementation should be fine - at least this will compile.
BUG=507792
Review URL: https://codereview.chromium.org/1255113006
Cr-Commit-Position: refs/heads/master@{#342239}
| -rw-r--r-- | content/common/BUILD.gn | 2 | ||||
| -rw-r--r-- | content/common/cursors/webcursor_android.cc | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 751bf60..241872a 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -284,7 +284,7 @@ source_set("common") { ] } - if (!use_aura) { + if (!use_aura || is_android) { sources -= [ "cursors/webcursor_aura.cc" ] } diff --git a/content/common/cursors/webcursor_android.cc b/content/common/cursors/webcursor_android.cc index 08be8b2..a932b27 100644 --- a/content/common/cursors/webcursor_android.cc +++ b/content/common/cursors/webcursor_android.cc @@ -9,6 +9,18 @@ namespace content { +gfx::NativeCursor WebCursor::GetNativeCursor() { + return gfx::kNullCursor; +} + +#if defined(USE_AURA) +// In the future when we want to support cursors of various kinds in Aura on +// Android, we should switch to using webcursor_aura rather than add an +// implementation here. +void WebCursor::SetDisplayInfo(const gfx::Display& display) { +} +#endif + void WebCursor::InitPlatformData() { } |