| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 6 * | 6 * |
| 7 * Other contributors: | 7 * Other contributors: |
| 8 * Robert O'Callahan <roc+@cs.cmu.edu> | 8 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 9 * David Baron <dbaron@fas.harvard.edu> | 9 * David Baron <dbaron@fas.harvard.edu> |
| 10 * Christian Biesinger <cbiesinger@gmail.com> | 10 * Christian Biesinger <cbiesinger@gmail.com> |
| (...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1652 | 1652 |
| 1653 LayoutRect intersect = | 1653 LayoutRect intersect = |
| 1654 localToAbsolute(box(), intersection(layerBounds, localExposeRect)); | 1654 localToAbsolute(box(), intersection(layerBounds, localExposeRect)); |
| 1655 if (intersect.isEmpty() && !layerBounds.isEmpty() && | 1655 if (intersect.isEmpty() && !layerBounds.isEmpty() && |
| 1656 !localExposeRect.isEmpty()) { | 1656 !localExposeRect.isEmpty()) { |
| 1657 return localToAbsolute(box(), localExposeRect); | 1657 return localToAbsolute(box(), localExposeRect); |
| 1658 } | 1658 } |
| 1659 return intersect; | 1659 return intersect; |
| 1660 } | 1660 } |
| 1661 | 1661 |
| 1662 ClientRectList* PaintLayerScrollableArea::nonFastScrollableRects() const { |
| 1663 return layer()->nonFastScrollableRects(); |
| 1664 } |
| 1665 |
| 1662 void PaintLayerScrollableArea::updateScrollableAreaSet(bool hasOverflow) { | 1666 void PaintLayerScrollableArea::updateScrollableAreaSet(bool hasOverflow) { |
| 1663 LocalFrame* frame = box().frame(); | 1667 LocalFrame* frame = box().frame(); |
| 1664 if (!frame) | 1668 if (!frame) |
| 1665 return; | 1669 return; |
| 1666 | 1670 |
| 1667 FrameView* frameView = frame->view(); | 1671 FrameView* frameView = frame->view(); |
| 1668 if (!frameView) | 1672 if (!frameView) |
| 1669 return; | 1673 return; |
| 1670 | 1674 |
| 1671 // FIXME: Does this need to be fixed later for OOPI? | 1675 // FIXME: Does this need to be fixed later for OOPI? |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2117 | 2121 |
| 2118 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: | 2122 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 2119 clampScrollableAreas() { | 2123 clampScrollableAreas() { |
| 2120 for (auto& scrollableArea : *s_needsClamp) | 2124 for (auto& scrollableArea : *s_needsClamp) |
| 2121 scrollableArea->clampScrollOffsetAfterOverflowChange(); | 2125 scrollableArea->clampScrollOffsetAfterOverflowChange(); |
| 2122 delete s_needsClamp; | 2126 delete s_needsClamp; |
| 2123 s_needsClamp = nullptr; | 2127 s_needsClamp = nullptr; |
| 2124 } | 2128 } |
| 2125 | 2129 |
| 2126 } // namespace blink | 2130 } // namespace blink |
| OLD | NEW |