[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e782d9183e19ad6063638ecf4ffa1d55a5d6ad9a
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 19:24:34 2009 +0000

    Make the local static panScrollIcon into a Image* instead
    of a RefPtr<Image>.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-19
    Reviewed by Adam Roben.
    
    * platform/ScrollView.cpp:
    (WebCore::ScrollView::wheelEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49800 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 233ed76..e6e4932 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-19  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Make the local static panScrollIcon into a Image* instead
+        of a RefPtr<Image>.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::wheelEvent):
+
 2009-10-19  Andrew Scherkus  <scherkus at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index d8c3318..6fcfedf 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -796,8 +796,8 @@ void ScrollView::paint(GraphicsContext* context, const IntRect& rect)
 
     // Paint the panScroll Icon
     if (m_drawPanScrollIcon) {
-        DEFINE_STATIC_LOCAL(RefPtr<Image>, panScrollIcon, (Image::loadPlatformResource("panIcon")));
-        context->drawImage(panScrollIcon.get(), m_panScrollIconPoint);
+        DEFINE_STATIC_LOCAL(Image*, panScrollIcon, (Image::loadPlatformResource("panIcon").releaseRef()));
+        context->drawImage(panScrollIcon, m_panScrollIconPoint);
     }
 }
 

-- 
WebKit Debian packaging