Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(512)

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 1830333002: Correct visual rects for scroll corner/resizer and non-frame composited scroll bars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't create a LayoutScrollbartPart if we've no scrollable area. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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@gmail.com> 9 * Christian Biesinger <cbiesinger@gmail.com>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 { 1088 {
1089 if (!m_scrollCorner && !hasScrollbar()) 1089 if (!m_scrollCorner && !hasScrollbar())
1090 return; 1090 return;
1091 if (!m_scrollCorner && hasOverlayScrollbars()) 1091 if (!m_scrollCorner && hasOverlayScrollbars())
1092 return; 1092 return;
1093 1093
1094 const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(box()); 1094 const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(box());
1095 RefPtr<ComputedStyle> corner = box().hasOverflowClip() ? actualLayoutObject. getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdScrollbarCorner), actualLayout Object.style()) : PassRefPtr<ComputedStyle>(nullptr); 1095 RefPtr<ComputedStyle> corner = box().hasOverflowClip() ? actualLayoutObject. getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdScrollbarCorner), actualLayout Object.style()) : PassRefPtr<ComputedStyle>(nullptr);
1096 if (corner) { 1096 if (corner) {
1097 if (!m_scrollCorner) { 1097 if (!m_scrollCorner) {
1098 m_scrollCorner = LayoutScrollbarPart::createAnonymous(&box().documen t()); 1098 m_scrollCorner = LayoutScrollbarPart::createAnonymous(&box().documen t(), this);
1099 m_scrollCorner->setDangerousOneWayParent(&box()); 1099 m_scrollCorner->setDangerousOneWayParent(&box());
1100 } 1100 }
1101 m_scrollCorner->setStyleWithWritingModeOfParent(corner.release()); 1101 m_scrollCorner->setStyleWithWritingModeOfParent(corner.release());
1102 } else if (m_scrollCorner) { 1102 } else if (m_scrollCorner) {
1103 m_scrollCorner->destroy(); 1103 m_scrollCorner->destroy();
1104 m_scrollCorner = nullptr; 1104 m_scrollCorner = nullptr;
1105 } 1105 }
1106 } 1106 }
1107 1107
1108 bool PaintLayerScrollableArea::hitTestOverflowControls(HitTestResult& result, co nst IntPoint& localPoint) 1108 bool PaintLayerScrollableArea::hitTestOverflowControls(HitTestResult& result, co nst IntPoint& localPoint)
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 1216
1217 void PaintLayerScrollableArea::updateResizerStyle() 1217 void PaintLayerScrollableArea::updateResizerStyle()
1218 { 1218 {
1219 if (!m_resizer && !box().canResize()) 1219 if (!m_resizer && !box().canResize())
1220 return; 1220 return;
1221 1221
1222 const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(box()); 1222 const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(box());
1223 RefPtr<ComputedStyle> resizer = box().hasOverflowClip() ? actualLayoutObject .getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdResizer), actualLayoutObject. style()) : PassRefPtr<ComputedStyle>(nullptr); 1223 RefPtr<ComputedStyle> resizer = box().hasOverflowClip() ? actualLayoutObject .getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdResizer), actualLayoutObject. style()) : PassRefPtr<ComputedStyle>(nullptr);
1224 if (resizer) { 1224 if (resizer) {
1225 if (!m_resizer) { 1225 if (!m_resizer) {
1226 m_resizer = LayoutScrollbarPart::createAnonymous(&box().document()); 1226 m_resizer = LayoutScrollbarPart::createAnonymous(&box().document(), this);
1227 m_resizer->setDangerousOneWayParent(&box()); 1227 m_resizer->setDangerousOneWayParent(&box());
1228 } 1228 }
1229 m_resizer->setStyleWithWritingModeOfParent(resizer.release()); 1229 m_resizer->setStyleWithWritingModeOfParent(resizer.release());
1230 } else if (m_resizer) { 1230 } else if (m_resizer) {
1231 m_resizer->destroy(); 1231 m_resizer->destroy();
1232 m_resizer = nullptr; 1232 m_resizer = nullptr;
1233 } 1233 }
1234 } 1234 }
1235 1235
1236 IntSize PaintLayerScrollableArea::offsetFromResizeCorner(const IntPoint& absolut ePoint) const 1236 IntSize PaintLayerScrollableArea::offsetFromResizeCorner(const IntPoint& absolut ePoint) const
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 } 1584 }
1585 1585
1586 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) 1586 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager)
1587 { 1587 {
1588 visitor->trace(m_scrollableArea); 1588 visitor->trace(m_scrollableArea);
1589 visitor->trace(m_hBar); 1589 visitor->trace(m_hBar);
1590 visitor->trace(m_vBar); 1590 visitor->trace(m_vBar);
1591 } 1591 }
1592 1592
1593 } // namespace blink 1593 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698