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

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d9b2f25c219ff4e183cb2f98b5439e34d3f72d85
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 21:53:43 2010 +0000

    2010-01-19  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=33851
    
            Fixes an issue in the Apple Mac port where ScrollView::platformVisibleContentRect
            returns the rectangle of the document within the content view of
            the scroll view (i.e. the rectangle not including scrollbars) when
            the parameter includeScrollbars == true
    
            Currently, this behavior contradicts both the comment in ScrollView.h
            for method visibleContentRect as well as the behavior in
            ScrollView::visibleContentRect() for a platform-independent scroll view.
    
            Instead, it should return the rectangle whose dimensions include
            the scrollbars.
    
            Also, removes some extra whitespace at the end of the lines.
    
            No tests included because we cannot test this using either DRT
            or a manual test.
    
            * platform/mac/ScrollViewMac.mm:
            (WebCore::ScrollView::platformVisibleContentRect): If includeScrollbars == true
            then return the rectangle whose dimensions are that of
            the frame (i.e. -[NSScrollView frame]).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53490 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c6d3d78..4b46fa9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,31 @@
+2010-01-19  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33851
+
+        Fixes an issue in the Apple Mac port where ScrollView::platformVisibleContentRect
+        returns the rectangle of the document within the content view of
+        the scroll view (i.e. the rectangle not including scrollbars) when
+        the parameter includeScrollbars == true
+
+        Currently, this behavior contradicts both the comment in ScrollView.h
+        for method visibleContentRect as well as the behavior in
+        ScrollView::visibleContentRect() for a platform-independent scroll view.
+
+        Instead, it should return the rectangle whose dimensions include
+        the scrollbars.
+
+        Also, removes some extra whitespace at the end of the lines.
+
+        No tests included because we cannot test this using either DRT
+        or a manual test.
+
+        * platform/mac/ScrollViewMac.mm:
+        (WebCore::ScrollView::platformVisibleContentRect): If includeScrollbars == true
+        then return the rectangle whose dimensions are that of
+        the frame (i.e. -[NSScrollView frame]).
+
 2010-01-19  Steve Block  <steveblock at google.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/mac/ScrollViewMac.mm b/WebCore/platform/mac/ScrollViewMac.mm
index 001b4c8..7ef5dc4 100644
--- a/WebCore/platform/mac/ScrollViewMac.mm
+++ b/WebCore/platform/mac/ScrollViewMac.mm
@@ -107,13 +107,12 @@ bool ScrollView::platformCanBlitOnScroll() const
 
 IntRect ScrollView::platformVisibleContentRect(bool includeScrollbars) const
 {
-    BEGIN_BLOCK_OBJC_EXCEPTIONS; 
-    if (includeScrollbars) {
-        if (NSView* documentView = this->documentView())
-            return enclosingIntRect([documentView visibleRect]);
-    }
-    return enclosingIntRect([scrollView() documentVisibleRect]); 
-    END_BLOCK_OBJC_EXCEPTIONS; 
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    IntRect result = enclosingIntRect([scrollView() documentVisibleRect]);
+    if (includeScrollbars)
+        result.setSize(IntSize([scrollView() frame].size));
+    return result;
+    END_BLOCK_OBJC_EXCEPTIONS;
     return IntRect();
 }
 

-- 
WebKit Debian packaging