From 7e3c96086836384de2822d50db644d4db46406a4 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Fri, 15 May 2015 12:02:40 -0700 Subject: [PATCH] [M67 Dev][EFL] Define WebCursor::GetPlatformCursor for efl It will be necessary to define WebCursor::GetPlatformCursor in order to build ozone. Reference: 6bf5529a7a033a692f0ced0d25761f839114395c Change-Id: Ic681ccd587e0a5ea274b07ed0fa9283b2abd2e2e Signed-off-by: Arnaud Renevier Signed-off-by: Youngsoo Choi --- content/common/cursors/webcursor.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/common/cursors/webcursor.h b/content/common/cursors/webcursor.h index 485eef5..214cc27 100644 --- a/content/common/cursors/webcursor.h +++ b/content/common/cursors/webcursor.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#if defined(USE_AURA) +#if defined(USE_AURA) || defined(USE_EFL) #include "ui/base/cursor/cursor.h" #endif @@ -71,7 +71,7 @@ class CONTENT_EXPORT WebCursor { // Returns a native cursor representing the current WebCursor instance. gfx::NativeCursor GetNativeCursor(); -#if defined(USE_AURA) +#if defined(USE_AURA) || defined(USE_EFL) ui::PlatformCursor GetPlatformCursor(); // Updates |device_scale_factor_| and |rotation_| based on |display|. @@ -138,14 +138,14 @@ class CONTENT_EXPORT WebCursor { float custom_scale_; std::vector custom_data_; -#if defined(USE_AURA) && (defined(USE_X11) || defined(USE_OZONE)) +#if (defined(USE_AURA) || defined(USE_EFL)) && (defined(USE_X11) || defined(USE_OZONE)) // Only used for custom cursors. ui::PlatformCursor platform_cursor_; #elif defined(OS_WIN) // A custom cursor created from custom bitmap data by Webkit. HCURSOR custom_cursor_; #endif -#if defined(USE_AURA) +#if defined(USE_AURA) || defined(USE_EFL) float device_scale_factor_; #endif -- 2.7.4