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 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 606 } | 606 } |
| 607 } | 607 } |
| 608 } | 608 } |
| 609 | 609 |
| 610 void FrameView::updateAcceleratedCompositingSettings() | 610 void FrameView::updateAcceleratedCompositingSettings() |
| 611 { | 611 { |
| 612 if (RenderView* renderView = this->renderView()) | 612 if (RenderView* renderView = this->renderView()) |
| 613 renderView->compositor()->updateAcceleratedCompositingSettings(); | 613 renderView->compositor()->updateAcceleratedCompositingSettings(); |
| 614 } | 614 } |
| 615 | 615 |
| 616 void FrameView::recalcOverflowAfterStyleChange() | |
| 617 { | |
| 618 RenderView* renderView = this->renderView(); | |
| 619 if (!renderView || !renderView->needsOverflowRecalcAfterStyleChange()) | |
|
ojan
2014/04/19 02:19:30
Can renderView really ever be null here? We only e
trchen
2014/04/19 05:08:21
Sounds good. Will do it.
| |
| 620 return; | |
| 621 | |
| 622 renderView->recalcOverflowAfterStyleChange(); | |
| 623 | |
| 624 // FIXME: We should adjust frame scrollbar here, but that will make many | |
| 625 // tests flake in debug build. | |
| 626 } | |
| 627 | |
| 616 void FrameView::updateCompositingLayersAfterStyleChange() | 628 void FrameView::updateCompositingLayersAfterStyleChange() |
| 617 { | 629 { |
| 618 TRACE_EVENT0("webkit", "FrameView::updateCompositingLayersAfterStyleChange") ; | 630 TRACE_EVENT0("webkit", "FrameView::updateCompositingLayersAfterStyleChange") ; |
| 619 RenderView* renderView = this->renderView(); | 631 RenderView* renderView = this->renderView(); |
| 620 if (!renderView) | 632 if (!renderView) |
| 621 return; | 633 return; |
| 622 | 634 |
| 623 // If we expect to update compositing after an incipient layout, don't do so here. | 635 // If we expect to update compositing after an incipient layout, don't do so here. |
| 624 if (m_doingPreLayoutStyleUpdate || layoutPending() || renderView->needsLayou t()) | 636 if (m_doingPreLayoutStyleUpdate || layoutPending() || renderView->needsLayou t()) |
| 625 return; | 637 return; |
| (...skipping 2601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3227 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) | 3239 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) |
| 3228 { | 3240 { |
| 3229 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3241 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3230 if (AXObjectCache* cache = axObjectCache()) { | 3242 if (AXObjectCache* cache = axObjectCache()) { |
| 3231 cache->remove(scrollbar); | 3243 cache->remove(scrollbar); |
| 3232 cache->handleScrollbarUpdate(this); | 3244 cache->handleScrollbarUpdate(this); |
| 3233 } | 3245 } |
| 3234 } | 3246 } |
| 3235 | 3247 |
| 3236 } // namespace WebCore | 3248 } // namespace WebCore |
| OLD | NEW |