| Index: third_party/WebKit/Source/core/layout/LayoutView.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutView.cpp b/third_party/WebKit/Source/core/layout/LayoutView.cpp
|
| index a7defe62442d95a8acd772bed76ca37ba1ae9b30..0fc2e4519123d7005a10b7863ab065341dc0b530 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutView.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutView.cpp
|
| @@ -997,11 +997,11 @@ bool LayoutView::allowsOverflowClip() const
|
|
|
| ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize& delta)
|
| {
|
| - // TODO(bokan): This should never get called on the main frame but it
|
| - // currently does via the Windows pan scrolling path. That should go through
|
| - // a more normalized EventHandler-like scrolling path and we should
|
| - // ASSERT(!frame()->isMainFrame()) here. All main frame scrolling should
|
| - // be handled by the ViewportScrollCallback.
|
| + // TODO(bokan): We shouldn't need this specialization but we currently do
|
| + // because of the Windows pan scrolling path. That should go through a more
|
| + // normalized ScrollManager-like scrolling path and we should get rid of
|
| + // of this override. All frame scrolling should be handled by
|
| + // ViewportScrollCallback.
|
|
|
| if (!frameView())
|
| return ScrollResult(false, false, delta.width(), delta.height());
|
|
|