Changeset 14501 in webkit

Timestamp:

May 20, 2006 1:57:16 AM (18 years ago)

Author:

ap

Message:

Reviewed by Darin.

• ​http://bugzilla.opendarwin.org/show_bug.cgi?id=8991 REGRESSION: missing or broken CSS custom cursors are displayed as a missing image icon

• page/FrameView.cpp: (WebCore::selectCursor): Fallback to CURSOR_AUTO if the image is an error image.
• manual-tests/custom-cursors.html: Added.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/custom-cursors.html (added)
• page/FrameView.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-05-20  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=8991
+          REGRESSION: missing or broken CSS custom cursors are displayed as 
+          a missing image icon
+
+        * page/FrameView.cpp:
+        (WebCore::selectCursor): Fallback to CURSOR_AUTO if the image is an error image.
+        * manual-tests/custom-cursors.html: Added.
+
 2006-05-20  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -552 +552 @@
 
     if (style && style->cursorImage() && !style->cursorImage()->image()->isNull())
-        return style->cursorImage()->image();
+        if (!style->cursorImage()->isErrorImage())
+            return style->cursorImage()->image();
+        else 
+            style = 0; // Fallback to CURSOR_AUTO
 
     switch (style ? style->cursor() : CURSOR_AUTO) {