| 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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 horizontalScrollbar->setFrameRect(hBarRect); | 863 horizontalScrollbar->setFrameRect(hBarRect); |
| 864 } | 864 } |
| 865 | 865 |
| 866 const IntRect& scrollCorner = scrollCornerRect(); | 866 const IntRect& scrollCorner = scrollCornerRect(); |
| 867 if (m_scrollCorner) | 867 if (m_scrollCorner) |
| 868 m_scrollCorner->setFrameRect(scrollCorner); | 868 m_scrollCorner->setFrameRect(scrollCorner); |
| 869 | 869 |
| 870 if (m_resizer) | 870 if (m_resizer) |
| 871 m_resizer->setFrameRect(resizerCornerRect(borderBox, ResizerForPointer))
; | 871 m_resizer->setFrameRect(resizerCornerRect(borderBox, ResizerForPointer))
; |
| 872 | 872 |
| 873 // FIXME, this should eventually be removed, once we are certain that compos
ited |
| 874 // controls get correctly positioned on a compositor update. For now, conser
vatively |
| 875 // leaving this unchanged. |
| 873 if (m_box->compositedLayerMapping()) | 876 if (m_box->compositedLayerMapping()) |
| 874 m_box->compositedLayerMapping()->positionOverflowControlsLayers(offsetFr
omRoot); | 877 m_box->compositedLayerMapping()->positionOverflowControlsLayers(offsetFr
omRoot); |
| 875 } | 878 } |
| 876 | 879 |
| 877 void RenderLayerScrollableArea::updateScrollCornerStyle() | 880 void RenderLayerScrollableArea::updateScrollCornerStyle() |
| 878 { | 881 { |
| 879 RenderObject* actualRenderer = rendererForScrollbar(m_box); | 882 RenderObject* actualRenderer = rendererForScrollbar(m_box); |
| 880 RefPtr<RenderStyle> corner = m_box->hasOverflowClip() ? actualRenderer->getU
ncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), actualRenderer->style()
) : PassRefPtr<RenderStyle>(0); | 883 RefPtr<RenderStyle> corner = m_box->hasOverflowClip() ? actualRenderer->getU
ncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), actualRenderer->style()
) : PassRefPtr<RenderStyle>(0); |
| 881 if (corner) { | 884 if (corner) { |
| 882 if (!m_scrollCorner) { | 885 if (!m_scrollCorner) { |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1269 baseHeight = baseHeight / zoomFactor; | 1272 baseHeight = baseHeight / zoomFactor; |
| 1270 element->setInlineStyleProperty(CSSPropertyHeight, roundToInt(baseHeight
+ difference.height()), CSSPrimitiveValue::CSS_PX); | 1273 element->setInlineStyleProperty(CSSPropertyHeight, roundToInt(baseHeight
+ difference.height()), CSSPrimitiveValue::CSS_PX); |
| 1271 } | 1274 } |
| 1272 | 1275 |
| 1273 document.updateLayout(); | 1276 document.updateLayout(); |
| 1274 | 1277 |
| 1275 // FIXME (Radar 4118564): We should also autoscroll the window as necessary
to keep the point under the cursor in view. | 1278 // FIXME (Radar 4118564): We should also autoscroll the window as necessary
to keep the point under the cursor in view. |
| 1276 } | 1279 } |
| 1277 | 1280 |
| 1278 } // Namespace WebCore | 1281 } // Namespace WebCore |
| OLD | NEW |