Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 759 m_horizontalScrollbarMode : m_verticalScrollbarMode; | 759 m_horizontalScrollbarMode : m_verticalScrollbarMode; |
| 760 | 760 |
| 761 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; | 761 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; |
| 762 } | 762 } |
| 763 | 763 |
| 764 bool ScrollView::shouldPlaceVerticalScrollbarOnLeft() const | 764 bool ScrollView::shouldPlaceVerticalScrollbarOnLeft() const |
| 765 { | 765 { |
| 766 return false; | 766 return false; |
| 767 } | 767 } |
| 768 | 768 |
| 769 void ScrollView::repaintContentRectangle(const IntRect& rect) | 769 void ScrollView::invalidatedContentRectangleForPaint(const IntRect& rect) |
|
Julien - ping for review
2014/06/03 01:00:20
contentRectangleForPaintInvalidation?
dsinclair
2014/06/03 14:06:18
Done.
| |
| 770 { | 770 { |
| 771 IntRect paintRect = rect; | 771 IntRect paintRect = rect; |
| 772 if (clipsRepaints() && !paintsEntireContents()) | 772 if (clipsPaintInvalidations() && !paintsEntireContents()) |
| 773 paintRect.intersect(visibleContentRect()); | 773 paintRect.intersect(visibleContentRect()); |
| 774 if (paintRect.isEmpty()) | 774 if (paintRect.isEmpty()) |
| 775 return; | 775 return; |
| 776 | 776 |
| 777 if (HostWindow* window = hostWindow()) | 777 if (HostWindow* window = hostWindow()) |
| 778 window->invalidateContentsAndRootView(contentsToWindow(paintRect)); | 778 window->invalidateContentsAndRootView(contentsToWindow(paintRect)); |
| 779 } | 779 } |
| 780 | 780 |
| 781 IntRect ScrollView::scrollCornerRect() const | 781 IntRect ScrollView::scrollCornerRect() const |
| 782 { | 782 { |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1114 return; | 1114 return; |
| 1115 | 1115 |
| 1116 ScrollableArea::setScrollOrigin(origin); | 1116 ScrollableArea::setScrollOrigin(origin); |
| 1117 | 1117 |
| 1118 // Update if the scroll origin changes, since our position will be different if the content size did not change. | 1118 // Update if the scroll origin changes, since our position will be different if the content size did not change. |
| 1119 if (updatePositionAtAll && updatePositionSynchronously) | 1119 if (updatePositionAtAll && updatePositionSynchronously) |
| 1120 updateScrollbars(scrollOffset()); | 1120 updateScrollbars(scrollOffset()); |
| 1121 } | 1121 } |
| 1122 | 1122 |
| 1123 } // namespace WebCore | 1123 } // namespace WebCore |
| OLD | NEW |