diff options
author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/platform/wince | |
parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/platform/wince')
-rw-r--r-- | WebCore/platform/wince/CursorWince.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/platform/wince/CursorWince.cpp b/WebCore/platform/wince/CursorWince.cpp index e35f1f9..d7dcfb4 100644 --- a/WebCore/platform/wince/CursorWince.cpp +++ b/WebCore/platform/wince/CursorWince.cpp @@ -38,12 +38,12 @@ static const Cursor& getCursor(CursorType type) } Cursor::Cursor(const Cursor& other) -: m_impl(other.m_impl) +: m_platformCursor(other.m_platformCursor) { } Cursor::Cursor(Image* img, const IntPoint& hotspot) -: m_impl(CursorNone) +: m_platformCursor(CursorNone) { } @@ -53,12 +53,12 @@ Cursor::~Cursor() Cursor& Cursor::operator=(const Cursor& other) { - m_impl = other.m_impl; + m_platformCursor = other.m_platformCursor; return *this; } Cursor::Cursor(PlatformCursor c) -: m_impl(c) +: m_platformCursor(c) { } |