Changeset 57358 in webkit

Timestamp:

Apr 9, 2010 1:44:13 PM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=37353, clean up cursors used by RenderStyles.

Reviewed by Adam Roben.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• page/EventHandler.cpp:

(WebCore::EventHandler::selectCursor):

• rendering/style/CursorData.h:

(WebCore::CursorData::CursorData):
(WebCore::CursorData::operator==):
(WebCore::CursorData::image):
(WebCore::CursorData::hotSpot):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::addCursor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)
• rendering/style/CursorData.h (modified) (3 diffs)
• rendering/style/RenderStyle.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-09  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37353, clean up cursors used by RenderStyles.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::selectCursor):
+        * rendering/style/CursorData.h:
+        (WebCore::CursorData::CursorData):
+        (WebCore::CursorData::operator==):
+        (WebCore::CursorData::image):
+        (WebCore::CursorData::hotSpot):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::addCursor):
+
 2010-04-09  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -821 +821 @@
                 list = CSSValueList::createCommaSeparated();
                 for (unsigned i = 0; i < cursors->size(); ++i)
-                    list->append(CSSPrimitiveValue::create((*cursors)[i].cursorImage->url(), CSSPrimitiveValue::CSS_URI));
+                    list->append(CSSPrimitiveValue::create((*cursors)[i].image()->url(), CSSPrimitiveValue::CSS_URI));
             }
             RefPtr<CSSValue> value = CSSPrimitiveValue::create(style->cursor());

trunk/WebCore/page/EventHandler.cpp

@@ -1022 +1022 @@
         const CursorList* cursors = style->cursors();
         for (unsigned i = 0; i < cursors->size(); ++i) {
-            CachedImage* cimage = (*cursors)[i].cursorImage.get();
-            IntPoint hotSpot = (*cursors)[i].hotSpot;
+            const CachedImage* cimage = (*cursors)[i].image();
+            IntPoint hotSpot = (*cursors)[i].hotSpot();
             if (!cimage)
                 continue;

trunk/WebCore/rendering/style/CursorData.h

@@ -32 +32 @@
 namespace WebCore {
 
-struct CursorData {
-    CursorData()
-        : cursorImage(0)
+class CursorData {
+public:
+    CursorData(CachedImage* image, const IntPoint& hotSpot)
+        : m_image(image)
+        , m_hotSpot(hotSpot)
     {
     }
@@ -40 +42 @@
     bool operator==(const CursorData& o) const
     {
-        return hotSpot == o.hotSpot && cursorImage == o.cursorImage;
+        return m_hotSpot == o.m_hotSpot && m_image == o.m_image;
     }
 
@@ -48 +50 @@
     }
 
-    IntPoint hotSpot; // for CSS3 support
-    CachedResourceHandle<CachedImage> cursorImage;
+    const CachedImage* image() const { return m_image.get(); }    
+    const IntPoint& hotSpot() const { return m_hotSpot; }
+    
+private:
+    CachedResourceHandle<CachedImage> m_image;
+    IntPoint m_hotSpot; // for CSS3 support
 };
 

trunk/WebCore/rendering/style/RenderStyle.cpp

@@ -543 +543 @@
 void RenderStyle::addCursor(CachedImage* image, const IntPoint& hotSpot)
 {
-    CursorData data;
-    data.cursorImage = image;
-    data.hotSpot = hotSpot;
     if (!inherited.access()->cursorData)
         inherited.access()->cursorData = CursorList::create();
-    inherited.access()->cursorData->append(data);
+    inherited.access()->cursorData->append(CursorData(image, hotSpot));
 }