[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[aa at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit bcbad32873e847833261b6f2cb585fccd0c21a29
Author: aa at chromium.org <aa at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 14 01:22:56 2009 +0000

    woo
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4b69c04..b756277 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2009-11-13  Aaron Boodman  <aa at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Adds a way to get the document element's scrollHeight,
+        which is sort of the moral equivalent to
+        RenderBox::minPrefWidth().
+
+        https://bugs.webkit.org/show_bug.cgi?id=31036
+
+        * public/WebFrame.h: Declare documentElementScrollHeight()
+        * src/WebFrameImpl.h: Ditto
+        * src/WebFrameImpl.cpp: Implement documentElementScrollHeight()
+        (WebKit::WebFrameImpl::documentElementScrollHeight): Return the
+        scroll height of the document element, or zero if there's no
+        documentElement.
+
 2009-11-12  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebFrame.h b/WebKit/chromium/public/WebFrame.h
index 0a3ed00..44b57aa 100644
--- a/WebKit/chromium/public/WebFrame.h
+++ b/WebKit/chromium/public/WebFrame.h
@@ -119,6 +119,11 @@ public:
     // current document.
     virtual int contentsPreferredWidth() const = 0;
 
+    // Returns the scroll height of the document element. This is
+    // equivalent to the DOM property of the same name, and is the minimum
+    // height required to display the document without scrollbars.
+    virtual int documentElementScrollHeight() const = 0;
+
     // Returns true if the contents (minus scrollbars) has non-zero area.
     virtual bool hasVisibleContent() const = 0;
 
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 6d51235..06d394f 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -412,6 +412,13 @@ int WebFrameImpl::contentsPreferredWidth() const
     return 0;
 }
 
+int WebFrameImpl::documentElementScrollHeight() const
+{
+    if (m_frame->document() && m_frame->document()->documentElement())
+        return m_frame->document()->documentElement()->scrollHeight();
+    return 0;
+}
+
 bool WebFrameImpl::hasVisibleContent() const
 {
     return frame()->view()->visibleWidth() > 0 && frame()->view()->visibleHeight() > 0;
diff --git a/WebKit/chromium/src/WebFrameImpl.h b/WebKit/chromium/src/WebFrameImpl.h
index 6c07ee8..050675b 100644
--- a/WebKit/chromium/src/WebFrameImpl.h
+++ b/WebKit/chromium/src/WebFrameImpl.h
@@ -68,6 +68,7 @@ public:
     virtual WebSize scrollOffset() const;
     virtual WebSize contentsSize() const;
     virtual int contentsPreferredWidth() const;
+    virtual int documentElementScrollHeight() const;
     virtual bool hasVisibleContent() const;
     virtual WebView* view() const;
     virtual WebFrame* opener() const;

-- 
WebKit Debian packaging