diff options
| -rw-r--r-- | chrome/renderer/render_widget.cc | 15 | ||||
| -rw-r--r-- | webkit/tools/test_shell/webwidget_host_win.cc | 6 |
2 files changed, 10 insertions, 11 deletions
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 5929a7d..911e86e 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -480,8 +480,11 @@ void RenderWidget::DidInvalidateRect(WebWidget* webwidget, void RenderWidget::DidScrollRect(WebWidget* webwidget, int dx, int dy, const gfx::Rect& clip_rect) { - // We only support scrolling along one axis at a time. - DCHECK((dx && !dy) || (!dx && dy)); + if (dx != 0 && dy != 0) { + // We only support scrolling along one axis at a time. + DidScrollRect(webwidget, 0, dy, clip_rect); + dy = 0; + } bool intersects_with_painting = paint_rect_.Intersects(clip_rect); @@ -597,15 +600,7 @@ void RenderWidget::GetRootWindowRect(WebWidget* webwidget, gfx::Rect* rect) { void RenderWidget::GetRootWindowResizerRect(WebWidget* webwidget, gfx::Rect* rect) { - // This is disabled to verify if WebKit is responsible for the slow down - // that was witnessed in the page cycler tests when the resize corner - // code was commited... -#if defined(OS_MACOSX) - // ...we need it enabled on Mac so scrollbars are usable. *rect = resizer_rect_; -#elif defined(OS_WIN) || defined(OS_LINUX) - *rect = gfx::Rect(); // resizer_rect_; -#endif } void RenderWidget::OnImeSetInputMode(bool is_active) { diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc index 9fcb96b..a81ed21 100644 --- a/webkit/tools/test_shell/webwidget_host_win.cc +++ b/webkit/tools/test_shell/webwidget_host_win.cc @@ -142,7 +142,11 @@ void WebWidgetHost::DidInvalidateRect(const gfx::Rect& damaged_rect) { } void WebWidgetHost::DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect) { - DCHECK(dx || dy); + if (dx != 0 && dy != 0) { + // We only support uni-directional scroll + DidScrollRect(0, dy, clip_rect); + dy = 0; + } // If we already have a pending scroll operation or if this scroll operation // intersects the existing paint region, then just failover to invalidating. |