Changeset 95227 in webkit

Timestamp:

Sep 15, 2011 2:10:27 PM (13 years ago)

Author:

andersca@apple.com

Message:

Remove ScrollView::platformContentsSize
​https://bugs.webkit.org/show_bug.cgi?id=68188

Reviewed by Darin Adler.

Since ScrollView keeps track of the contents size in ScrollView::m_contentsSize, we never
have to ask the underlying platform scroll view for contents size since it should always just
be equal to m_contentsSize.

• platform/ScrollView.cpp:

(WebCore::ScrollView::contentsSize):
(WebCore::ScrollView::wheelEvent):

• platform/ScrollView.h:
• platform/mac/ScrollViewMac.mm:
• platform/wx/ScrollViewWx.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollView.cpp (modified) (2 diffs)
• platform/ScrollView.h (modified) (1 diff)
• platform/mac/ScrollViewMac.mm (modified) (1 diff)
• platform/wx/ScrollViewWx.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-15  Anders Carlsson  <andersca@apple.com>
+
+        Remove ScrollView::platformContentsSize
+        https://bugs.webkit.org/show_bug.cgi?id=68188
+
+        Reviewed by Darin Adler.
+
+        Since ScrollView keeps track of the contents size in ScrollView::m_contentsSize, we never
+        have to ask the underlying platform scroll view for contents size since it should always just
+        be equal to m_contentsSize.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::contentsSize):
+        (WebCore::ScrollView::wheelEvent):
+        * platform/ScrollView.h:
+        * platform/mac/ScrollViewMac.mm:
+        * platform/wx/ScrollViewWx.cpp:
+
 2011-09-15  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -281 +281 @@
 IntSize ScrollView::contentsSize() const
 {
-    if (platformWidget())
-        return platformContentsSize();
     return m_contentsSize;
 }
@@ -1327 +1325 @@
 }
 
-IntSize ScrollView::platformContentsSize() const
-{
-    return IntSize();
-}
-
 void ScrollView::platformSetContentsSize()
 {

trunk/Source/WebCore/platform/ScrollView.h

@@ -385 +385 @@
     bool platformCanBlitOnScroll() const;
     IntRect platformVisibleContentRect(bool includeScrollbars) const;
-    IntSize platformContentsSize() const;
     void platformSetContentsSize();
     IntRect platformContentsToScreen(const IntRect&) const;

trunk/Source/WebCore/platform/mac/ScrollViewMac.mm

@@ -118 +118 @@
 }
 
-IntSize ScrollView::platformContentsSize() const
-{
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    if (NSView* documentView = this->documentView())
-        return enclosingIntRect([documentView bounds]).size();
-    END_BLOCK_OBJC_EXCEPTIONS;
-    return IntSize();
-}
-
 void ScrollView::platformSetContentsSize()
 {

trunk/Source/WebCore/platform/wx/ScrollViewWx.cpp

@@ -166 +166 @@
 }
 
-IntSize ScrollView::platformContentsSize() const
-{
-    int width = 0;
-    int height = 0;
-    if (platformWidget()) {
-        platformWidget()->GetVirtualSize(&width, &height);
-        ASSERT(width >= 0 && height >= 0);
-    }
-    return IntSize(width, height);
-}
-
 void ScrollView::platformSetScrollPosition(const IntPoint& scrollPoint)
 {