Changeset 95307 in webkit

Timestamp:

Sep 16, 2011 11:32:01 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r95227.
​http://trac.webkit.org/changeset/95227
​https://bugs.webkit.org/show_bug.cgi?id=68262

Broke a bunch of SVG tests (Requested by andersca on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-09-16

• platform/ScrollView.cpp:

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

• platform/ScrollView.h:
• platform/mac/ScrollViewMac.mm:

(WebCore::ScrollView::platformContentsSize):

• platform/wx/ScrollViewWx.cpp:

(WebCore::ScrollView::platformContentsSize):

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-16  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r95227.
+        http://trac.webkit.org/changeset/95227
+        https://bugs.webkit.org/show_bug.cgi?id=68262
+
+        Broke a bunch of SVG tests (Requested by andersca on #webkit).
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::contentsSize):
+        (WebCore::ScrollView::wheelEvent):
+        * platform/ScrollView.h:
+        * platform/mac/ScrollViewMac.mm:
+        (WebCore::ScrollView::platformContentsSize):
+        * platform/wx/ScrollViewWx.cpp:
+        (WebCore::ScrollView::platformContentsSize):
+
 2011-09-16  James Simonsen  <simonjam@chromium.org>
 

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -281 +281 @@
 IntSize ScrollView::contentsSize() const
 {
+    if (platformWidget())
+        return platformContentsSize();
     return m_contentsSize;
 }
@@ -1325 +1327 @@
 }
 
+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)
 {