| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. |
| 3 * | 3 * |
| 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 5 * | 5 * |
| 6 * Other contributors: | 6 * Other contributors: |
| 7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
| 9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
| 10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
| (...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 IntRect hBarRect = rectForHorizontalScrollbar(borderBox); | 1030 IntRect hBarRect = rectForHorizontalScrollbar(borderBox); |
| 1031 hBarRect.move(offsetFromRoot); | 1031 hBarRect.move(offsetFromRoot); |
| 1032 horizontalScrollbar->setFrameRect(hBarRect); | 1032 horizontalScrollbar->setFrameRect(hBarRect); |
| 1033 } | 1033 } |
| 1034 | 1034 |
| 1035 const IntRect& scrollCorner = scrollCornerRect(); | 1035 const IntRect& scrollCorner = scrollCornerRect(); |
| 1036 if (m_scrollCorner) | 1036 if (m_scrollCorner) |
| 1037 m_scrollCorner->setFrameRect(LayoutRect(scrollCorner)); | 1037 m_scrollCorner->setFrameRect(LayoutRect(scrollCorner)); |
| 1038 | 1038 |
| 1039 if (m_resizer) | 1039 if (m_resizer) |
| 1040 m_resizer->setFrameRect(resizerCornerRect(borderBox, ResizerForPointer))
; | 1040 m_resizer->setFrameRect(LayoutRect(resizerCornerRect(borderBox, ResizerF
orPointer))); |
| 1041 | 1041 |
| 1042 // FIXME, this should eventually be removed, once we are certain that compos
ited | 1042 // FIXME, this should eventually be removed, once we are certain that compos
ited |
| 1043 // controls get correctly positioned on a compositor update. For now, conser
vatively | 1043 // controls get correctly positioned on a compositor update. For now, conser
vatively |
| 1044 // leaving this unchanged. | 1044 // leaving this unchanged. |
| 1045 if (layer()->hasCompositedLayerMapping()) | 1045 if (layer()->hasCompositedLayerMapping()) |
| 1046 layer()->compositedLayerMapping()->positionOverflowControlsLayers(offset
FromRoot); | 1046 layer()->compositedLayerMapping()->positionOverflowControlsLayers(offset
FromRoot); |
| 1047 } | 1047 } |
| 1048 | 1048 |
| 1049 void LayerScrollableArea::updateScrollCornerStyle() | 1049 void LayerScrollableArea::updateScrollCornerStyle() |
| 1050 { | 1050 { |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1382 void LayerScrollableArea::setTopmostScrollChild(Layer* scrollChild) | 1382 void LayerScrollableArea::setTopmostScrollChild(Layer* scrollChild) |
| 1383 { | 1383 { |
| 1384 // We only want to track the topmost scroll child for scrollable areas with | 1384 // We only want to track the topmost scroll child for scrollable areas with |
| 1385 // overlay scrollbars. | 1385 // overlay scrollbars. |
| 1386 if (!hasOverlayScrollbars()) | 1386 if (!hasOverlayScrollbars()) |
| 1387 return; | 1387 return; |
| 1388 m_nextTopmostScrollChild = scrollChild; | 1388 m_nextTopmostScrollChild = scrollChild; |
| 1389 } | 1389 } |
| 1390 | 1390 |
| 1391 } // namespace blink | 1391 } // namespace blink |
| OLD | NEW |