| 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 2536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2547 if (fillWithRed) | 2547 if (fillWithRed) |
| 2548 p->fillRect(rect, Color(0xFF, 0, 0)); | 2548 p->fillRect(rect, Color(0xFF, 0, 0)); |
| 2549 #endif | 2549 #endif |
| 2550 | 2550 |
| 2551 RenderView* renderView = this->renderView(); | 2551 RenderView* renderView = this->renderView(); |
| 2552 if (!renderView) { | 2552 if (!renderView) { |
| 2553 WTF_LOG_ERROR("called FrameView::paint with nil renderer"); | 2553 WTF_LOG_ERROR("called FrameView::paint with nil renderer"); |
| 2554 return; | 2554 return; |
| 2555 } | 2555 } |
| 2556 | 2556 |
| 2557 ASSERT(!needsLayout()); | 2557 RELEASE_ASSERT(!needsLayout()); |
| 2558 if (needsLayout()) | |
| 2559 return; | |
| 2560 | 2558 |
| 2561 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Paint", "data"
, InspectorPaintEvent::data(renderView, rect, 0)); | 2559 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Paint", "data"
, InspectorPaintEvent::data(renderView, rect, 0)); |
| 2562 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", "stack", InspectorCallStackEvent::currentCallStack()); | 2560 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", "stack", InspectorCallStackEvent::currentCallStack()); |
| 2563 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli
ne migrates to tracing. | 2561 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli
ne migrates to tracing. |
| 2564 InspectorInstrumentation::willPaint(renderView, 0); | 2562 InspectorInstrumentation::willPaint(renderView, 0); |
| 2565 | 2563 |
| 2566 bool isTopLevelPainter = !s_inPaintContents; | 2564 bool isTopLevelPainter = !s_inPaintContents; |
| 2567 s_inPaintContents = true; | 2565 s_inPaintContents = true; |
| 2568 | 2566 |
| 2569 FontCachePurgePreventer fontCachePurgePreventer; | 2567 FontCachePurgePreventer fontCachePurgePreventer; |
| (...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3133 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3131 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
| 3134 { | 3132 { |
| 3135 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3133 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3136 if (AXObjectCache* cache = axObjectCache()) { | 3134 if (AXObjectCache* cache = axObjectCache()) { |
| 3137 cache->remove(scrollbar); | 3135 cache->remove(scrollbar); |
| 3138 cache->handleScrollbarUpdate(this); | 3136 cache->handleScrollbarUpdate(this); |
| 3139 } | 3137 } |
| 3140 } | 3138 } |
| 3141 | 3139 |
| 3142 } // namespace blink | 3140 } // namespace blink |
| OLD | NEW |