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 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1035 // let the compositor pick which to actually draw. | 1035 // let the compositor pick which to actually draw. |
| 1036 // See http://crbug.com/306706 | 1036 // See http://crbug.com/306706 |
| 1037 void FrameView::invalidateTree(RenderObject* root) | 1037 void FrameView::invalidateTree(RenderObject* root) |
| 1038 { | 1038 { |
| 1039 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled()); | 1039 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled()); |
| 1040 ASSERT(!root->needsLayout()); | 1040 ASSERT(!root->needsLayout()); |
| 1041 // We should only invalidate paints for the outer most layout. This works as | 1041 // We should only invalidate paints for the outer most layout. This works as |
| 1042 // we continue to track paint invalidation rects until this function is call ed. | 1042 // we continue to track paint invalidation rects until this function is call ed. |
| 1043 ASSERT(!m_nestedLayoutCount); | 1043 ASSERT(!m_nestedLayoutCount); |
| 1044 | 1044 |
| 1045 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "FrameView::in validateTree", | 1045 const char* debugData = "unknown"; |
| 1046 "root", TRACE_STR_COPY(root->debugName().ascii().data())); | 1046 bool isTracing; |
| 1047 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("blink.invalida tion"), &isTracing); | |
| 1048 if (isTracing) | |
| 1049 debugData = root->debugName().ascii().data(); | |
|
esprehn
2014/06/07 02:20:40
All you're trying to do is save the one virtual ca
| |
| 1050 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", TRACE_STR_COPY(de bugData)); | |
| 1047 | 1051 |
| 1048 // FIXME: really, we're in the paint invalidation phase here, and the compos iting queries are legal. | 1052 // FIXME: really, we're in the paint invalidation phase here, and the compos iting queries are legal. |
| 1049 // Until those states are fully fledged, I'll just disable the ASSERTS. | 1053 // Until those states are fully fledged, I'll just disable the ASSERTS. |
| 1050 DisableCompositingQueryAsserts compositingQueryAssertsDisabler; | 1054 DisableCompositingQueryAsserts compositingQueryAssertsDisabler; |
| 1051 | 1055 |
| 1052 RootLayoutStateScope rootLayoutStateScope(*root); | 1056 RootLayoutStateScope rootLayoutStateScope(*root); |
| 1053 | 1057 |
| 1054 root->invalidateTreeAfterLayout(*root->containerForRepaint()); | 1058 root->invalidateTreeAfterLayout(*root->containerForRepaint()); |
| 1055 | 1059 |
| 1056 // Invalidate the paint of the frameviews scrollbars if needed | 1060 // Invalidate the paint of the frameviews scrollbars if needed |
| (...skipping 2216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3273 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) | 3277 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) |
| 3274 { | 3278 { |
| 3275 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3279 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3276 if (AXObjectCache* cache = axObjectCache()) { | 3280 if (AXObjectCache* cache = axObjectCache()) { |
| 3277 cache->remove(scrollbar); | 3281 cache->remove(scrollbar); |
| 3278 cache->handleScrollbarUpdate(this); | 3282 cache->handleScrollbarUpdate(this); |
| 3279 } | 3283 } |
| 3280 } | 3284 } |
| 3281 | 3285 |
| 3282 } // namespace WebCore | 3286 } // namespace WebCore |
| OLD | NEW |