[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8aee3f12ad423e0b5214cccd14180d24b52d6837
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 07:30:15 2010 +0000

    2010-02-24  Sam Kerner  <skerner at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Expose WebFrame::setCanHaveScrollbars().  This allows a view
            which is being resized to not need scroll bars to ensure that
            they are not drawn.
    
            Existing function setAllowsScrolling() was renamed
            setCanHaveScrollbars(), to be consistant with change 37159:
            http://trac.webkit.org/changeset/37159
    
            https://bugs.webkit.org/show_bug.cgi?id=35257
    
            * WebKit/chromium/public/WebFrame.h:
            * WebKit/chromium/src/ChromeClientImpl.cpp:
            * WebKit/chromium/src/WebFrameImpl.cpp:
            * WebKit/chromium/src/WebFrameImpl.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55226 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 2b167e7..2987787 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-02-24  Sam Kerner  <skerner at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Expose WebFrame::setCanHaveScrollbars().  This allows a view
+        which is being resized to not need scroll bars to ensure that
+        they are not drawn.
+
+        Existing function setAllowsScrolling() was renamed
+        setCanHaveScrollbars(), to be consistant with change 37159:
+        http://trac.webkit.org/changeset/37159
+
+        https://bugs.webkit.org/show_bug.cgi?id=35257
+
+        * WebKit/chromium/public/WebFrame.h:
+        * WebKit/chromium/src/ChromeClientImpl.cpp:
+        * WebKit/chromium/src/WebFrameImpl.cpp:
+        * WebKit/chromium/src/WebFrameImpl.h:
+
 2010-02-19  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/chromium/public/WebFrame.h b/WebKit/chromium/public/WebFrame.h
index 0170a4f..a6466e0 100644
--- a/WebKit/chromium/public/WebFrame.h
+++ b/WebKit/chromium/public/WebFrame.h
@@ -123,6 +123,9 @@ public:
     // NOTE: These routines do not force page layout so their results may
     // not be accurate if the page layout is out-of-date.
 
+    // If set to false, do not draw scrollbars on this frame's view.
+    virtual void setCanHaveScrollbars(bool) = 0;
+
     // The scroll offset from the top-left corner of the frame in pixels.
     virtual WebSize scrollOffset() const = 0;
 
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 6e5bfc2..a420da3 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -327,7 +327,7 @@ void ChromeClientImpl::setScrollbarsVisible(bool value)
     m_scrollbarsVisible = value;
     WebFrameImpl* web_frame = static_cast<WebFrameImpl*>(m_webView->mainFrame());
     if (web_frame)
-        web_frame->setAllowsScrolling(value);
+        web_frame->setCanHaveScrollbars(value);
 }
 
 bool ChromeClientImpl::scrollbarsVisible()
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index ca04b85..a7d449d 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1728,7 +1728,7 @@ WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element)
         static_cast<HTMLFrameOwnerElement*>(element);
     return fromFrame(frameElement->contentFrame());
 }
-    
+
 WebViewImpl* WebFrameImpl::viewImpl() const
 {
     if (!m_frame)
@@ -1803,9 +1803,9 @@ void WebFrameImpl::didFail(const ResourceError& error, bool wasProvisional)
         client()->didFailLoad(this, webError);
 }
 
-void WebFrameImpl::setAllowsScrolling(bool flag)
+void WebFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars)
 {
-    m_frame->view()->setCanHaveScrollbars(flag);
+    m_frame->view()->setCanHaveScrollbars(canHaveScrollbars);
 }
 
 void WebFrameImpl::registerPasswordListener(
diff --git a/WebKit/chromium/src/WebFrameImpl.h b/WebKit/chromium/src/WebFrameImpl.h
index f41e1f5..0379cf7 100644
--- a/WebKit/chromium/src/WebFrameImpl.h
+++ b/WebKit/chromium/src/WebFrameImpl.h
@@ -88,7 +88,7 @@ public:
     virtual WebFrame* findChildByExpression(const WebString&) const;
     virtual WebDocument document() const;
     virtual void forms(WebVector<WebFormElement>&) const;
-    virtual WebAnimationController* animationController(); 
+    virtual WebAnimationController* animationController();
     virtual WebSecurityOrigin securityOrigin() const;
     virtual void grantUniversalAccess();
     virtual NPObject* windowObject() const;
@@ -213,7 +213,7 @@ public:
     // Sets whether the WebFrameImpl allows its document to be scrolled.
     // If the parameter is true, allow the document to be scrolled.
     // Otherwise, disallow scrolling.
-    void setAllowsScrolling(bool);
+    void setCanHaveScrollbars(bool);
 
     // Returns the password autocomplete listener associated with the passed
     // user name input element, or 0 if none available.

-- 
WebKit Debian packaging