| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1023 setHasBoxDecorationBackground(true); | 1023 setHasBoxDecorationBackground(true); |
| 1024 } | 1024 } |
| 1025 | 1025 |
| 1026 bool LayoutView::allowsOverflowClip() const | 1026 bool LayoutView::allowsOverflowClip() const |
| 1027 { | 1027 { |
| 1028 return document().settings() && document().settings()->rootLayerScrolls(); | 1028 return document().settings() && document().settings()->rootLayerScrolls(); |
| 1029 } | 1029 } |
| 1030 | 1030 |
| 1031 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize&
delta) | 1031 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize&
delta) |
| 1032 { | 1032 { |
| 1033 // TODO(bokan): This should never get called on the main frame but it | 1033 // TODO(bokan): We shouldn't need this specialization but we currently do |
| 1034 // currently does via the Windows pan scrolling path. That should go through | 1034 // because of the Windows pan scrolling path. That should go through a more |
| 1035 // a more normalized EventHandler-like scrolling path and we should | 1035 // normalized ScrollManager-like scrolling path and we should get rid of |
| 1036 // ASSERT(!frame()->isMainFrame()) here. All main frame scrolling should | 1036 // of this override. All frame scrolling should be handled by |
| 1037 // be handled by the ViewportScrollCallback. | 1037 // ViewportScrollCallback. |
| 1038 | 1038 |
| 1039 if (!frameView()) | 1039 if (!frameView()) |
| 1040 return ScrollResult(false, false, delta.width(), delta.height()); | 1040 return ScrollResult(false, false, delta.width(), delta.height()); |
| 1041 | 1041 |
| 1042 return frameView()->getScrollableArea()->userScroll(granularity, delta); | 1042 return frameView()->getScrollableArea()->userScroll(granularity, delta); |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 } // namespace blink | 1045 } // namespace blink |
| OLD | NEW |