- try to fix GTK and Qt builds
* platform/win/ScrollViewWin.cpp:
(WebCore::ScrollView::scroll): Improve logic slightly for the case of
vertical scrolling when there's no vertical scroll bar.
* platform/gtk/ScrollViewGtk.cpp:
(WebCore::ScrollView::scroll): Copy the code from Windows. Maybe this
should be factored differently.
* platform/qt/ScrollViewQt.cpp:
(WebCore::ScrollView::scroll): Ditto.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29099
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2008-01-02 Darin Adler <darin@apple.com>
+
+ Reviewed by Alice and Tim.
+
+ - try to fix GTK and Qt builds
+
+ * platform/win/ScrollViewWin.cpp:
+ (WebCore::ScrollView::scroll): Improve logic slightly for the case of
+ vertical scrolling when there's no vertical scroll bar.
+
+ * platform/gtk/ScrollViewGtk.cpp:
+ (WebCore::ScrollView::scroll): Copy the code from Windows. Maybe this
+ should be factored differently.
+ * platform/qt/ScrollViewQt.cpp:
+ (WebCore::ScrollView::scroll): Ditto.
+
2008-01-02 Darin Adler <darin@apple.com>
Reviewed by Anders.
(*current)->geometryChanged();
}
-void ScrollView::scroll(ScrollDirection direction, ScrollGranularity granularity)
+bool ScrollView::scroll(ScrollDirection direction, ScrollGranularity granularity)
{
- if ((direction == ScrollUp || direction == ScrollDown) && m_data->vBar)
- m_data->vBar->scroll(direction, granularity);
- else if (m_data->hBar)
- m_data->hBar->scroll(direction, granularity);
+ if (direction == ScrollUp || direction == ScrollDown) {
+ if (m_data->vBar)
+ return m_data->vBar->scroll(direction, granularity);
+ } else {
+ if (m_data->hBar)
+ return m_data->hBar->scroll(direction, granularity);
+ }
+ return false;
}
void ScrollView::addToDirtyRegion(const IntRect& containingWindowRect)
scrollBy(-e.deltaX() * LINE_STEP, -e.deltaY() * LINE_STEP);
}
-void ScrollView::scroll(ScrollDirection direction, ScrollGranularity granularity)
+bool ScrollView::scroll(ScrollDirection direction, ScrollGranularity granularity)
{
- if ((direction == ScrollUp || direction == ScrollDown) && m_data->m_vBar)
- m_data->m_vBar->scroll(direction, granularity);
- else if (m_data->m_hBar)
- m_data->m_hBar->scroll(direction, granularity);
+ if (direction == ScrollUp || direction == ScrollDown) {
+ if (m_data->m_vBar)
+ return m_data->m_vBar->scroll(direction, granularity);
+ } else {
+ if (m_data->m_hBar)
+ return m_data->m_hBar->scroll(direction, granularity);
+ }
+ return false;
}
IntRect ScrollView::windowResizerRect()
bool ScrollView::scroll(ScrollDirection direction, ScrollGranularity granularity)
{
- if ((direction == ScrollUp || direction == ScrollDown) && m_data->m_vBar)
- return m_data->m_vBar->scroll(direction, granularity);
- else if (m_data->m_hBar)
- return m_data->m_hBar->scroll(direction, granularity);
+ if (direction == ScrollUp || direction == ScrollDown) {
+ if (m_data->m_vBar)
+ return m_data->m_vBar->scroll(direction, granularity);
+ } else {
+ if (m_data->m_hBar)
+ return m_data->m_hBar->scroll(direction, granularity);
+ }
+ return false;
}
IntRect ScrollView::windowResizerRect()