Chromium Code Reviews| 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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 427 { | 427 { |
| 428 return frame().contentLayoutObject(); | 428 return frame().contentLayoutObject(); |
| 429 } | 429 } |
| 430 | 430 |
| 431 ScrollingCoordinator* FrameView::scrollingCoordinator() const | 431 ScrollingCoordinator* FrameView::scrollingCoordinator() const |
| 432 { | 432 { |
| 433 Page* p = page(); | 433 Page* p = page(); |
| 434 return p ? p->scrollingCoordinator() : 0; | 434 return p ? p->scrollingCoordinator() : 0; |
| 435 } | 435 } |
| 436 | 436 |
| 437 CompositorAnimationTimeline* FrameView::compositorAnimationTimeline() const | |
| 438 { | |
| 439 ScrollingCoordinator* c = scrollingCoordinator(); | |
| 440 return c ? c->compositorAnimationTimeline() : 0; | |
|
jbroman
2016/03/14 17:35:32
Prefer nullptr to 0.
ymalik
2016/03/14 21:45:39
Done.
| |
| 441 } | |
| 442 | |
| 437 void FrameView::setCanHaveScrollbars(bool canHaveScrollbars) | 443 void FrameView::setCanHaveScrollbars(bool canHaveScrollbars) |
| 438 { | 444 { |
| 439 m_canHaveScrollbars = canHaveScrollbars; | 445 m_canHaveScrollbars = canHaveScrollbars; |
| 440 | 446 |
| 441 ScrollbarMode newVerticalMode = m_verticalScrollbarMode; | 447 ScrollbarMode newVerticalMode = m_verticalScrollbarMode; |
| 442 if (canHaveScrollbars && m_verticalScrollbarMode == ScrollbarAlwaysOff) | 448 if (canHaveScrollbars && m_verticalScrollbarMode == ScrollbarAlwaysOff) |
| 443 newVerticalMode = ScrollbarAuto; | 449 newVerticalMode = ScrollbarAuto; |
| 444 else if (!canHaveScrollbars) | 450 else if (!canHaveScrollbars) |
| 445 newVerticalMode = ScrollbarAlwaysOff; | 451 newVerticalMode = ScrollbarAlwaysOff; |
| 446 | 452 |
| (...skipping 3663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4110 return m_hiddenForThrottling && m_crossOriginForThrottling; | 4116 return m_hiddenForThrottling && m_crossOriginForThrottling; |
| 4111 } | 4117 } |
| 4112 | 4118 |
| 4113 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4119 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
| 4114 { | 4120 { |
| 4115 ASSERT(layoutView()); | 4121 ASSERT(layoutView()); |
| 4116 return *layoutView(); | 4122 return *layoutView(); |
| 4117 } | 4123 } |
| 4118 | 4124 |
| 4119 } // namespace blink | 4125 } // namespace blink |
| OLD | NEW |