| 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 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1027 // let the compositor pick which to actually draw. | 1027 // let the compositor pick which to actually draw. |
| 1028 // See http://crbug.com/306706 | 1028 // See http://crbug.com/306706 |
| 1029 void FrameView::invalidateTree(RenderObject* root) | 1029 void FrameView::invalidateTree(RenderObject* root) |
| 1030 { | 1030 { |
| 1031 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled()); | 1031 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled()); |
| 1032 ASSERT(!root->needsLayout()); | 1032 ASSERT(!root->needsLayout()); |
| 1033 // We should only invalidate paints for the outer most layout. This works as | 1033 // We should only invalidate paints for the outer most layout. This works as |
| 1034 // we continue to track paint invalidation rects until this function is call
ed. | 1034 // we continue to track paint invalidation rects until this function is call
ed. |
| 1035 ASSERT(!m_nestedLayoutCount); | 1035 ASSERT(!m_nestedLayoutCount); |
| 1036 | 1036 |
| 1037 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "FrameView::in
validateTree", | 1037 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", TRACE_STR_COPY(ro
ot->debugName().ascii().data())); |
| 1038 "root", TRACE_STR_COPY(root->debugName().ascii().data())); | |
| 1039 | 1038 |
| 1040 // FIXME: really, we're in the paint invalidation phase here, and the compos
iting queries are legal. | 1039 // FIXME: really, we're in the paint invalidation phase here, and the compos
iting queries are legal. |
| 1041 // Until those states are fully fledged, I'll just disable the ASSERTS. | 1040 // Until those states are fully fledged, I'll just disable the ASSERTS. |
| 1042 DisableCompositingQueryAsserts compositingQueryAssertsDisabler; | 1041 DisableCompositingQueryAsserts compositingQueryAssertsDisabler; |
| 1043 | 1042 |
| 1044 RootLayoutStateScope rootLayoutStateScope(*root); | 1043 RootLayoutStateScope rootLayoutStateScope(*root); |
| 1045 | 1044 |
| 1046 root->invalidateTreeAfterLayout(*root->containerForRepaint()); | 1045 root->invalidateTreeAfterLayout(*root->containerForRepaint()); |
| 1047 | 1046 |
| 1048 // Invalidate the paint of the frameviews scrollbars if needed | 1047 // Invalidate the paint of the frameviews scrollbars if needed |
| (...skipping 2214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3263 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3262 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
| 3264 { | 3263 { |
| 3265 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3264 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3266 if (AXObjectCache* cache = axObjectCache()) { | 3265 if (AXObjectCache* cache = axObjectCache()) { |
| 3267 cache->remove(scrollbar); | 3266 cache->remove(scrollbar); |
| 3268 cache->handleScrollbarUpdate(this); | 3267 cache->handleScrollbarUpdate(this); |
| 3269 } | 3268 } |
| 3270 } | 3269 } |
| 3271 | 3270 |
| 3272 } // namespace WebCore | 3271 } // namespace WebCore |
| OLD | NEW |