Title: [95307] trunk/Source/WebCore
- Revision
- 95307
- Author
- commit-qu...@webkit.org
- Date
- 2011-09-16 11:32:01 -0700 (Fri, 16 Sep 2011)
Log 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....@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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95306 => 95307)
--- trunk/Source/WebCore/ChangeLog 2011-09-16 18:26:24 UTC (rev 95306)
+++ trunk/Source/WebCore/ChangeLog 2011-09-16 18:32:01 UTC (rev 95307)
@@ -1,3 +1,20 @@
+2011-09-16 Sheriff Bot <webkit.review....@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 <simon...@chromium.org>
Fix HTML5 parser's adoption agency algorithm to reparent correctly
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (95306 => 95307)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2011-09-16 18:26:24 UTC (rev 95306)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2011-09-16 18:32:01 UTC (rev 95307)
@@ -280,6 +280,8 @@
IntSize ScrollView::contentsSize() const
{
+ if (platformWidget())
+ return platformContentsSize();
return m_contentsSize;
}
@@ -1324,6 +1326,11 @@
return IntRect();
}
+IntSize ScrollView::platformContentsSize() const
+{
+ return IntSize();
+}
+
void ScrollView::platformSetContentsSize()
{
}
Modified: trunk/Source/WebCore/platform/ScrollView.h (95306 => 95307)
--- trunk/Source/WebCore/platform/ScrollView.h 2011-09-16 18:26:24 UTC (rev 95306)
+++ trunk/Source/WebCore/platform/ScrollView.h 2011-09-16 18:32:01 UTC (rev 95307)
@@ -384,6 +384,7 @@
void platformSetCanBlitOnScroll(bool);
bool platformCanBlitOnScroll() const;
IntRect platformVisibleContentRect(bool includeScrollbars) const;
+ IntSize platformContentsSize() const;
void platformSetContentsSize();
IntRect platformContentsToScreen(const IntRect&) const;
IntPoint platformScreenToContents(const IntPoint&) const;
Modified: trunk/Source/WebCore/platform/mac/ScrollViewMac.mm (95306 => 95307)
--- trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2011-09-16 18:26:24 UTC (rev 95306)
+++ trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2011-09-16 18:32:01 UTC (rev 95307)
@@ -117,6 +117,15 @@
return IntRect();
}
+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()
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
Modified: trunk/Source/WebCore/platform/wx/ScrollViewWx.cpp (95306 => 95307)
--- trunk/Source/WebCore/platform/wx/ScrollViewWx.cpp 2011-09-16 18:26:24 UTC (rev 95306)
+++ trunk/Source/WebCore/platform/wx/ScrollViewWx.cpp 2011-09-16 18:32:01 UTC (rev 95307)
@@ -165,6 +165,17 @@
return IntRect(m_data->viewStart.x, m_data->viewStart.y, width, height);
}
+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)
{
wxWindow* win = platformWidget();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
