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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 7995331fa9deac74a3f9770239a3ad8dff4548e1
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 20 04:51:48 2010 +0000

    2010-11-19  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            ScrollView: Make delegatesScrolling() and avoidScrollbarCreation() const.
            https://bugs.webkit.org/show_bug.cgi?id=49854
    
            * page/FrameView.cpp:
            (WebCore::FrameView::delegatesScrolling):
            (WebCore::FrameView::avoidScrollbarCreation):
            * page/FrameView.h:
            * platform/ScrollView.h:
            (WebCore::ScrollView::delegatesScrolling):
            (WebCore::ScrollView::avoidScrollbarCreation):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 816656c..6355809 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-19  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        ScrollView: Make delegatesScrolling() and avoidScrollbarCreation() const.
+        https://bugs.webkit.org/show_bug.cgi?id=49854
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::delegatesScrolling):
+        (WebCore::FrameView::avoidScrollbarCreation):
+        * page/FrameView.h:
+        * platform/ScrollView.h:
+        (WebCore::ScrollView::delegatesScrolling):
+        (WebCore::ScrollView::avoidScrollbarCreation):
+
 2010-11-19  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 13cbefb..16b1426 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -349,7 +349,7 @@ void FrameView::setMarginHeight(int h)
     m_margins.setHeight(h);
 }
 
-bool FrameView::delegatesScrolling()
+bool FrameView::delegatesScrolling() const
 {
     ASSERT(m_frame);
 
@@ -359,7 +359,7 @@ bool FrameView::delegatesScrolling()
     return m_frame->settings() && m_frame->settings()->shouldDelegateScrolling();
 }
 
-bool FrameView::avoidScrollbarCreation()
+bool FrameView::avoidScrollbarCreation() const
 {
     ASSERT(m_frame);
 
diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index bde1b79..17b147e 100644
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -76,8 +76,8 @@ public:
 
     virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
 
-    virtual bool delegatesScrolling();
-    virtual bool avoidScrollbarCreation();
+    virtual bool delegatesScrolling() const;
+    virtual bool avoidScrollbarCreation() const;
 
     virtual void setContentsSize(const IntSize&);
 
diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h
index 8186b77..8c031cf 100644
--- a/WebCore/platform/ScrollView.h
+++ b/WebCore/platform/ScrollView.h
@@ -104,8 +104,8 @@ public:
     virtual void setCanHaveScrollbars(bool);
     bool canHaveScrollbars() const { return horizontalScrollbarMode() != ScrollbarAlwaysOff || verticalScrollbarMode() != ScrollbarAlwaysOff; }
 
-    virtual bool delegatesScrolling() { return false; }
-    virtual bool avoidScrollbarCreation() { return false; }
+    virtual bool delegatesScrolling() const { return false; }
+    virtual bool avoidScrollbarCreation() const { return false; }
 
     // By default you only receive paint events for the area that is visible. In the case of using a
     // tiled backing store, this function can be set, so that the view paints the entire contents.

-- 
WebKit Debian packaging