| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 2468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2479 if (!cornerStyle) { | 2479 if (!cornerStyle) { |
| 2480 // If the <body> didn't have a custom style, then the root element m
ight. | 2480 // If the <body> didn't have a custom style, then the root element m
ight. |
| 2481 if (Element* docElement = doc->documentElement()) { | 2481 if (Element* docElement = doc->documentElement()) { |
| 2482 if (LayoutObject* layoutObject = docElement->layoutObject()) | 2482 if (LayoutObject* layoutObject = docElement->layoutObject()) |
| 2483 cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoSty
leRequest(PseudoIdScrollbarCorner), layoutObject->style()); | 2483 cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoSty
leRequest(PseudoIdScrollbarCorner), layoutObject->style()); |
| 2484 } | 2484 } |
| 2485 } | 2485 } |
| 2486 | 2486 |
| 2487 if (!cornerStyle) { | 2487 if (!cornerStyle) { |
| 2488 // If we have an owning ipage/LocalFrame element, then it can set th
e custom scrollbar also. | 2488 // If we have an owning ipage/LocalFrame element, then it can set th
e custom scrollbar also. |
| 2489 if (LayoutPart* layoutObject = m_frame->ownerLayoutObject()) | 2489 LayoutPartItem layoutItem = m_frame->ownerLayoutItem(); |
| 2490 cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRe
quest(PseudoIdScrollbarCorner), layoutObject->style()); | 2490 if (!layoutItem.isNull()) |
| 2491 cornerStyle = layoutItem.getUncachedPseudoStyle(PseudoStyleReque
st(PseudoIdScrollbarCorner), layoutItem.style()); |
| 2491 } | 2492 } |
| 2492 } | 2493 } |
| 2493 | 2494 |
| 2494 if (cornerStyle) { | 2495 if (cornerStyle) { |
| 2495 if (!m_scrollCorner) | 2496 if (!m_scrollCorner) |
| 2496 m_scrollCorner = LayoutScrollbarPart::createAnonymous(doc, this); | 2497 m_scrollCorner = LayoutScrollbarPart::createAnonymous(doc, this); |
| 2497 m_scrollCorner->setStyleWithWritingModeOfParent(cornerStyle.release()); | 2498 m_scrollCorner->setStyleWithWritingModeOfParent(cornerStyle.release()); |
| 2498 setScrollCornerNeedsPaintInvalidation(); | 2499 setScrollCornerNeedsPaintInvalidation(); |
| 2499 } else if (m_scrollCorner) { | 2500 } else if (m_scrollCorner) { |
| 2500 m_scrollCorner->destroy(); | 2501 m_scrollCorner->destroy(); |
| (...skipping 1919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4420 } | 4421 } |
| 4421 | 4422 |
| 4422 bool FrameView::canThrottleRendering() const | 4423 bool FrameView::canThrottleRendering() const |
| 4423 { | 4424 { |
| 4424 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) | 4425 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) |
| 4425 return false; | 4426 return false; |
| 4426 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot
tling); | 4427 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot
tling); |
| 4427 } | 4428 } |
| 4428 | 4429 |
| 4429 } // namespace blink | 4430 } // namespace blink |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2374613003:
[Layout API] Use ownerLayoutItem in updateScrollCorner() (Closed)
