diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-02 04:14:09 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-02 14:26:04 +0300 |
commit | 6fb62e5afd575a380322955a0a0144e4a6f8f86d (patch) | |
tree | 7903573103880a868ab4584e3c2030dd377e338c /Source/WebCore/platform/Cursor.cpp | |
parent | 33a5322d0126b0fcf90026b6bf26092fd78b072e (diff) |
Import QtWebKit commit 1c054b639030b02ff98964cc915beaa45b18e6ce
Change-Id: Ieac288ef14217f25da44d69e1d191c47290182c3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/platform/Cursor.cpp')
-rw-r--r-- | Source/WebCore/platform/Cursor.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/platform/Cursor.cpp b/Source/WebCore/platform/Cursor.cpp index 014efa5f5..722181bc1 100644 --- a/Source/WebCore/platform/Cursor.cpp +++ b/Source/WebCore/platform/Cursor.cpp @@ -154,7 +154,9 @@ Cursor::Cursor(Image* image, const IntPoint& hotSpot) #if ENABLE(MOUSE_CURSOR_SCALE) , m_imageScaleFactor(1) #endif +#if !PLATFORM(QT) , m_platformCursor(nullptr) +#endif { } @@ -164,7 +166,9 @@ Cursor::Cursor(Image* image, const IntPoint& hotSpot, float scale) , m_image(image) , m_hotSpot(determineHotSpot(image, hotSpot)) , m_imageScaleFactor(scale) +#if !PLATFORM(QT) , m_platformCursor(0) +#endif { } #endif @@ -174,7 +178,9 @@ Cursor::Cursor(Type type) #if ENABLE(MOUSE_CURSOR_SCALE) , m_imageScaleFactor(1) #endif +#if !PLATFORM(QT) , m_platformCursor(nullptr) +#endif { } @@ -182,7 +188,7 @@ Cursor::Cursor(Type type) PlatformCursor Cursor::platformCursor() const { ensurePlatformCursor(); - return m_platformCursor.get(); + return m_platformCursor ? &m_platformCursor.value() : nullptr; } #elif !PLATFORM(COCOA) |