Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. |
| 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 770 } | 770 } |
| 771 | 771 |
| 772 RenderBox* RenderBox::findAutoscrollable(RenderObject* renderer) | 772 RenderBox* RenderBox::findAutoscrollable(RenderObject* renderer) |
| 773 { | 773 { |
| 774 while (renderer && !(renderer->isBox() && toRenderBox(renderer)->canAutoscro ll())) { | 774 while (renderer && !(renderer->isBox() && toRenderBox(renderer)->canAutoscro ll())) { |
| 775 if (!renderer->parent() && renderer->node() == renderer->document() && r enderer->document().ownerElement()) | 775 if (!renderer->parent() && renderer->node() == renderer->document() && r enderer->document().ownerElement()) |
| 776 renderer = renderer->document().ownerElement()->renderer(); | 776 renderer = renderer->document().ownerElement()->renderer(); |
| 777 else | 777 else |
| 778 renderer = renderer->parent(); | 778 renderer = renderer->parent(); |
| 779 } | 779 } |
| 780 | |
|
tkent
2014/07/08 02:20:59
This change looks unnecessary.
keishi
2014/07/10 09:48:04
Done.
| |
| 781 return renderer && renderer->isBox() ? toRenderBox(renderer) : 0; | 780 return renderer && renderer->isBox() ? toRenderBox(renderer) : 0; |
| 782 } | 781 } |
| 783 | 782 |
| 784 static inline int adjustedScrollDelta(int beginningDelta) | 783 static inline int adjustedScrollDelta(int beginningDelta) |
| 785 { | 784 { |
| 786 // This implemention matches Firefox's. | 785 // This implemention matches Firefox's. |
| 787 // http://mxr.mozilla.org/firefox/source/toolkit/content/widgets/browser.xml #856. | 786 // http://mxr.mozilla.org/firefox/source/toolkit/content/widgets/browser.xml #856. |
| 788 const int speedReducer = 12; | 787 const int speedReducer = 12; |
| 789 | 788 |
| 790 int adjustedDelta = beginningDelta / speedReducer; | 789 int adjustedDelta = beginningDelta / speedReducer; |
| (...skipping 3876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4667 return 0; | 4666 return 0; |
| 4668 | 4667 |
| 4669 if (!layoutState && !flowThreadContainingBlock()) | 4668 if (!layoutState && !flowThreadContainingBlock()) |
| 4670 return 0; | 4669 return 0; |
| 4671 | 4670 |
| 4672 RenderBlock* containerBlock = containingBlock(); | 4671 RenderBlock* containerBlock = containingBlock(); |
| 4673 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); | 4672 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); |
| 4674 } | 4673 } |
| 4675 | 4674 |
| 4676 } // namespace WebCore | 4675 } // namespace WebCore |
| OLD | NEW |