[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 15:31:44 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 12716f903676a94ff0f46eb3611965925d209547
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 19:55:25 2010 +0000

    2010-11-05  Chris Guillory  <chris.guillory at google.com>
    
            Reviewed by Chris Fleizach.
    
            Keep a reference to the scrollbar in accessibility scrollbar.
            https://bugs.webkit.org/show_bug.cgi?id=48896
    
            * accessibility/AccessibilityScrollbar.h:
            (WebCore::AccessibilityScrollbar::scrollbar):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8409971..d5db43e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-05  Chris Guillory  <chris.guillory at google.com>
+
+        Reviewed by Chris Fleizach.
+
+        Keep a reference to the scrollbar in accessibility scrollbar.
+        https://bugs.webkit.org/show_bug.cgi?id=48896
+
+        * accessibility/AccessibilityScrollbar.h:
+        (WebCore::AccessibilityScrollbar::scrollbar):
+
 2010-11-05  Chang Shu  <chang.shu at nokia.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebCore/accessibility/AccessibilityScrollbar.h b/WebCore/accessibility/AccessibilityScrollbar.h
index 9a8d978..7d78b52 100644
--- a/WebCore/accessibility/AccessibilityScrollbar.h
+++ b/WebCore/accessibility/AccessibilityScrollbar.h
@@ -41,7 +41,7 @@ public:
 
     void setScrollbar(Scrollbar* scrollbar) { m_scrollbar = scrollbar; }
 
-    Scrollbar* scrollbar() const { return m_scrollbar; }
+    Scrollbar* scrollbar() const { return m_scrollbar.get(); }
 
     virtual bool isAccessibilityScrollbar() const { return true; }
 
@@ -60,7 +60,7 @@ private:
     virtual IntRect elementRect() const { ASSERT_NOT_REACHED(); return IntRect(); }
     virtual AccessibilityObject* parentObject() const { ASSERT_NOT_REACHED(); return 0; }
 
-    Scrollbar* m_scrollbar;
+    RefPtr<Scrollbar> m_scrollbar;
 };
 
 } // namespace WebCore

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list