| 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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 RELEASE_ASSERT(!needsLayout()); | 718 RELEASE_ASSERT(!needsLayout()); |
| 719 ASSERT(document->lifecycle().state() >= DocumentLifecycle::StyleAndLayoutCle
an); | 719 ASSERT(document->lifecycle().state() >= DocumentLifecycle::StyleAndLayoutCle
an); |
| 720 | 720 |
| 721 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Paint", "data"
, InspectorPaintEvent::data(renderView, rect)); | 721 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Paint", "data"
, InspectorPaintEvent::data(renderView, rect)); |
| 722 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current
CallStack()); | 722 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current
CallStack()); |
| 723 | 723 |
| 724 bool isTopLevelPainter = !s_inPaintContents; | 724 bool isTopLevelPainter = !s_inPaintContents; |
| 725 s_inPaintContents = true; | 725 s_inPaintContents = true; |
| 726 | 726 |
| 727 FontCachePurgePreventer fontCachePurgePreventer; | 727 FontCachePurgePreventer fontCachePurgePreventer; |
| 728 document->markers().invalidateRenderedRectsForMarkersInRect(rect); | |
| 729 | 728 |
| 730 ASSERT(!m_isPainting); | 729 ASSERT(!m_isPainting); |
| 731 m_isPainting = true; | 730 m_isPainting = true; |
| 732 | 731 |
| 733 // m_nodeToDraw is used to draw only one element (and its descendants) | 732 // m_nodeToDraw is used to draw only one element (and its descendants) |
| 734 RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; | 733 RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; |
| 735 RenderLayer* rootLayer = renderView->layer(); | 734 RenderLayer* rootLayer = renderView->layer(); |
| 736 | 735 |
| 737 #if ENABLE(ASSERT) | 736 #if ENABLE(ASSERT) |
| 738 renderView->assertSubtreeIsLaidOut(); | 737 renderView->assertSubtreeIsLaidOut(); |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 totalObjects = 0; | 899 totalObjects = 0; |
| 901 | 900 |
| 902 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { | 901 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { |
| 903 ++totalObjects; | 902 ++totalObjects; |
| 904 if (o->needsLayout()) | 903 if (o->needsLayout()) |
| 905 ++needsLayoutObjects; | 904 ++needsLayoutObjects; |
| 906 } | 905 } |
| 907 } | 906 } |
| 908 | 907 |
| 909 } // namespace blink | 908 } // namespace blink |
| OLD | NEW |