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 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
676 ASSERT(!m_isPainting); | 676 ASSERT(!m_isPainting); |
677 m_isPainting = true; | 677 m_isPainting = true; |
678 | 678 |
679 RenderLayer* rootLayer = renderView->layer(); | 679 RenderLayer* rootLayer = renderView->layer(); |
680 | 680 |
681 #if ENABLE(ASSERT) | 681 #if ENABLE(ASSERT) |
682 renderView->assertSubtreeIsLaidOut(); | 682 renderView->assertSubtreeIsLaidOut(); |
683 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer-
>renderer()); | 683 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer-
>renderer()); |
684 #endif | 684 #endif |
685 | 685 |
686 rootLayer->paint(context, rect); | 686 // TODO(ojan): Is this rect passed down correct or even needed? |
| 687 renderView->paintLayer(context, rootLayer, pixelSnappedIntRect(renderView->v
iewRect())); |
687 | 688 |
688 m_isPainting = false; | 689 m_isPainting = false; |
689 m_lastPaintTime = currentTime(); | 690 m_lastPaintTime = currentTime(); |
690 | 691 |
691 if (isTopLevelPainter) { | 692 if (isTopLevelPainter) { |
692 // Everything that happens after paintContents completions is considered | 693 // Everything that happens after paintContents completions is considered |
693 // to be part of the next frame. | 694 // to be part of the next frame. |
694 s_currentFrameTimeStamp = currentTime(); | 695 s_currentFrameTimeStamp = currentTime(); |
695 s_inPaintContents = false; | 696 s_inPaintContents = false; |
696 } | 697 } |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 totalObjects = 0; | 814 totalObjects = 0; |
814 | 815 |
815 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { | 816 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { |
816 ++totalObjects; | 817 ++totalObjects; |
817 if (o->needsLayout()) | 818 if (o->needsLayout()) |
818 ++needsLayoutObjects; | 819 ++needsLayoutObjects; |
819 } | 820 } |
820 } | 821 } |
821 | 822 |
822 } // namespace blink | 823 } // namespace blink |
OLD | NEW |