diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit/chromium/src/WebCursorInfo.cpp | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/chromium/src/WebCursorInfo.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebCursorInfo.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebKit/chromium/src/WebCursorInfo.cpp b/Source/WebKit/chromium/src/WebCursorInfo.cpp index d4b0f81fa..0981e4665 100644 --- a/Source/WebKit/chromium/src/WebCursorInfo.cpp +++ b/Source/WebKit/chromium/src/WebCursorInfo.cpp @@ -38,13 +38,14 @@ using namespace WebCore; namespace WebKit { WebCursorInfo::WebCursorInfo(const Cursor& cursor) -{ - type = static_cast<Type>(cursor.impl().type()); - hotSpot = cursor.impl().hotSpot(); - customImage = cursor.impl().customImage(); + : type(static_cast<Type>(cursor.type())) + , hotSpot(cursor.hotSpot()) + , imageScaleFactor(1) + , customImage(cursor.image()) #ifdef WIN32 - externalHandle = 0; + , externalHandle(0) #endif +{ } } // namespace WebKit |