Changeset 53490 in webkit

Timestamp:

Jan 19, 2010 1:53:43 PM (14 years ago)

Author:

dbates@webkit.org

Message:

2010-01-19 Daniel Bates <​dbates@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]).

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/ScrollViewMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-19  Daniel Bates  <dbates@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@google.com>
 

trunk/WebCore/platform/mac/ScrollViewMac.mm

@@ -108 +108 @@
 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();
 }