| 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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 // If this layer can't do the scroll we ask the next layer up that can s
croll to try | 661 // If this layer can't do the scroll we ask the next layer up that can s
croll to try |
| 662 IntSize remainingScrollOffset = newScrollOffset - layer()->scrollableAre
a()->adjustedScrollOffset(); | 662 IntSize remainingScrollOffset = newScrollOffset - layer()->scrollableAre
a()->adjustedScrollOffset(); |
| 663 if (!remainingScrollOffset.isZero() && parent()) { | 663 if (!remainingScrollOffset.isZero() && parent()) { |
| 664 if (RenderBox* scrollableBox = enclosingScrollableBox()) | 664 if (RenderBox* scrollableBox = enclosingScrollableBox()) |
| 665 scrollableBox->scrollByRecursively(remainingScrollOffset, clamp)
; | 665 scrollableBox->scrollByRecursively(remainingScrollOffset, clamp)
; |
| 666 | 666 |
| 667 LocalFrame* frame = this->frame(); | 667 LocalFrame* frame = this->frame(); |
| 668 if (frame && frame->page()) | 668 if (frame && frame->page()) |
| 669 frame->page()->autoscrollController().updateAutoscrollRenderer()
; | 669 frame->page()->autoscrollController().updateAutoscrollRenderer()
; |
| 670 } | 670 } |
| 671 } else if (view()->frameView()) { | |
| 672 // If we are here, we were called on a renderer that can be programmatic
ally scrolled, but doesn't | |
| 673 // have an overflow clip. Which means that it is a document node that ca
n be scrolled. | |
| 674 view()->frameView()->scrollBy(delta); | |
| 675 | |
| 676 // FIXME: If we didn't scroll the whole way, do we want to try looking a
t the frames ownerElement? | |
| 677 // https://bugs.webkit.org/show_bug.cgi?id=28237 | |
| 678 } | 671 } |
| 679 } | 672 } |
| 680 | 673 |
| 681 bool RenderBox::needsPreferredWidthsRecalculation() const | 674 bool RenderBox::needsPreferredWidthsRecalculation() const |
| 682 { | 675 { |
| 683 return style()->paddingStart().isPercent() || style()->paddingEnd().isPercen
t(); | 676 return style()->paddingStart().isPercent() || style()->paddingEnd().isPercen
t(); |
| 684 } | 677 } |
| 685 | 678 |
| 686 IntSize RenderBox::scrolledContentOffset() const | 679 IntSize RenderBox::scrolledContentOffset() const |
| 687 { | 680 { |
| (...skipping 3534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4222 | 4215 |
| 4223 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 4216 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 4224 { | 4217 { |
| 4225 backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor); | 4218 backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor); |
| 4226 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 4219 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 4227 ASSERT(hasBackground == style.hasBackground()); | 4220 ASSERT(hasBackground == style.hasBackground()); |
| 4228 hasBorder = style.hasBorder(); | 4221 hasBorder = style.hasBorder(); |
| 4229 } | 4222 } |
| 4230 | 4223 |
| 4231 } // namespace blink | 4224 } // namespace blink |
| OLD | NEW |