| 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 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1329 } | 1329 } |
| 1330 | 1330 |
| 1331 void PaintLayerScrollableArea::updateScrollCornerStyle() { | 1331 void PaintLayerScrollableArea::updateScrollCornerStyle() { |
| 1332 if (!m_scrollCorner && !hasScrollbar()) | 1332 if (!m_scrollCorner && !hasScrollbar()) |
| 1333 return; | 1333 return; |
| 1334 if (!m_scrollCorner && hasOverlayScrollbars()) | 1334 if (!m_scrollCorner && hasOverlayScrollbars()) |
| 1335 return; | 1335 return; |
| 1336 | 1336 |
| 1337 const LayoutObject& styleSource = scrollbarStyleSource(box()); | 1337 const LayoutObject& styleSource = scrollbarStyleSource(box()); |
| 1338 RefPtr<ComputedStyle> corner = | 1338 RefPtr<ComputedStyle> corner = |
| 1339 box().hasOverflowClip() | 1339 box().hasOverflowClip() ? styleSource.getUncachedPseudoStyle( |
| 1340 ? styleSource.getUncachedPseudoStyle( | 1340 PseudoStyleRequest(PseudoIdScrollbarCorner), |
| 1341 PseudoStyleRequest(PseudoIdScrollbarCorner), | 1341 styleSource.style()) |
| 1342 styleSource.style()) | 1342 : PassRefPtr<ComputedStyle>(nullptr); |
| 1343 : PassRefPtr<ComputedStyle>(nullptr); | |
| 1344 if (corner) { | 1343 if (corner) { |
| 1345 if (!m_scrollCorner) { | 1344 if (!m_scrollCorner) { |
| 1346 m_scrollCorner = | 1345 m_scrollCorner = |
| 1347 LayoutScrollbarPart::createAnonymous(&box().document(), this); | 1346 LayoutScrollbarPart::createAnonymous(&box().document(), this); |
| 1348 m_scrollCorner->setDangerousOneWayParent(&box()); | 1347 m_scrollCorner->setDangerousOneWayParent(&box()); |
| 1349 } | 1348 } |
| 1350 m_scrollCorner->setStyleWithWritingModeOfParent(std::move(corner)); | 1349 m_scrollCorner->setStyleWithWritingModeOfParent(std::move(corner)); |
| 1351 } else if (m_scrollCorner) { | 1350 } else if (m_scrollCorner) { |
| 1352 m_scrollCorner->destroy(); | 1351 m_scrollCorner->destroy(); |
| 1353 m_scrollCorner = nullptr; | 1352 m_scrollCorner = nullptr; |
| (...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2115 | 2114 |
| 2116 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: | 2115 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 2117 clampScrollableAreas() { | 2116 clampScrollableAreas() { |
| 2118 for (auto& scrollableArea : *s_needsClamp) | 2117 for (auto& scrollableArea : *s_needsClamp) |
| 2119 scrollableArea->clampScrollOffsetAfterOverflowChange(); | 2118 scrollableArea->clampScrollOffsetAfterOverflowChange(); |
| 2120 delete s_needsClamp; | 2119 delete s_needsClamp; |
| 2121 s_needsClamp = nullptr; | 2120 s_needsClamp = nullptr; |
| 2122 } | 2121 } |
| 2123 | 2122 |
| 2124 } // namespace blink | 2123 } // namespace blink |
| OLD | NEW |