Merge WebKit at r63859 : Initial merge by git.

Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62

1 files changed, 6 insertions, 6 deletions

diff --git a/WebCore/platform/haiku/CursorHaiku.cpp b/WebCore/platform/haiku/CursorHaiku.cpp
index 21d678a..58833bc 100644
--- a/WebCore/platform/haiku/CursorHaiku.cpp
+++ b/WebCore/platform/haiku/CursorHaiku.cpp
@@ -34,31 +34,31 @@
 namespace WebCore {
 
 Cursor::Cursor(PlatformCursor cursor)
-    : m_impl(cursor)
+    : m_platformCursor(cursor)
 {
 }
 
 Cursor::Cursor(const Cursor& other)
-    : m_impl(0)
+    : m_platformCursor(0)
 {
     *this = other;
 }
 
 Cursor::~Cursor()
 {
-    delete m_impl;
+    delete m_platformCursor;
 }
 
 Cursor::Cursor(Image*, const IntPoint&)
-    : m_impl(0)
+    : m_platformCursor(0)
 {
     notImplemented();
 }
 
 Cursor& Cursor::operator=(const Cursor& other)
 {
-    delete m_impl;
-    m_impl = other.m_impl ? new BCursor(*other.m_impl) : 0;
+    delete m_platformCursor;
+    m_platformCursor = other.m_platformCursor ? new BCursor(*other.m_platformCursor) : 0;
     return *this;
 }