Changeset 25532 in webkit

Timestamp:

Sep 12, 2007 11:27:09 PM (17 years ago)

Author:

oliver

Message:

2007-09-12 Oliver Hunt <​oliver@apple.com>

Reviewed by Adam.

Corrections missed in previous revision

• platform/Cursor.h:
• platform/win/CursorWin.cpp: (WebCore::loadCursorByName):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/Cursor.h (modified) (2 diffs)
• platform/win/CursorWin.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-12  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Adam.
+
+        Corrections missed in previous revision
+
+        * platform/Cursor.h:
+        * platform/win/CursorWin.cpp:
+        (WebCore::loadCursorByName):
+
 2007-09-12  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/platform/Cursor.h

@@ -33 +33 @@
 typedef HICON HCURSOR;
 #include <Shared.h>
-#include <RefPtr.h>
+#include <wtf/RefPtr.h>
 #elif PLATFORM(GDK)
 #include <gdk/gdk.h>
@@ -60 +60 @@
             DestroyIcon(m_nativeCursor);
         }
-        HCURSOR nativeCursor() { return m_nativeCursor; }
+        HCURSOR nativeCursor() const { return m_nativeCursor; }
     private:
         HCURSOR m_nativeCursor;

trunk/WebCore/platform/win/CursorWin.cpp

@@ -30 +30 @@
 #include "Image.h"
 #include "IntPoint.h"
+
+#include <wtf/OwnPtr.h>
+
 #include <windows.h>
 
@@ -147 +150 @@
 }
 
-static Cursor loadCursorByName(char *name, int x, int y) {
+static Cursor loadCursorByName(char* name, int x, int y) 
+{
     IntPoint hotSpot(x, y);
     Cursor c;
-    Image *cursorImage = Image::loadPlatformResource(name);
-    if (cursorImage && !cursorImage->isNull()) {
-        c = Cursor(cursorImage, hotSpot);
-        delete cursorImage;
-    } else
+    OwnPtr<Image> cursorImage(Image::loadPlatformResource(name));
+    if (cursorImage && !cursorImage->isNull()) 
+        c = Cursor(cursorImage.get(), hotSpot);
+    else
         c = pointerCursor();
     return c;