Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Side by Side Diff: sky/engine/core/frame/FrameView.cpp

Issue 957643002: Fix clipping of content outside the bounds of the window. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 ASSERT(m_frame->document()->lifecycle().state() >= DocumentLifecycle::StyleA ndLayoutClean); 640 ASSERT(m_frame->document()->lifecycle().state() >= DocumentLifecycle::StyleA ndLayoutClean);
641 641
642 bool isTopLevelPainter = !s_inPaintContents; 642 bool isTopLevelPainter = !s_inPaintContents;
643 s_inPaintContents = true; 643 s_inPaintContents = true;
644 644
645 FontCachePurgePreventer fontCachePurgePreventer; 645 FontCachePurgePreventer fontCachePurgePreventer;
646 646
647 ASSERT(!m_isPainting); 647 ASSERT(!m_isPainting);
648 m_isPainting = true; 648 m_isPainting = true;
649 649
650 RenderLayer* rootLayer = renderView->layer();
651
652 #if ENABLE(ASSERT) 650 #if ENABLE(ASSERT)
653 renderView->assertSubtreeIsLaidOut(); 651 renderView->assertSubtreeIsLaidOut();
654 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer- >renderer()); 652 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*renderView );
655 #endif 653 #endif
656 654
657 // TODO(ojan): Is this rect passed down correct or even needed? 655 LayerPaintingInfo paintingInfo(renderView->layer(),
658 renderView->paintLayer(context, rootLayer, pixelSnappedIntRect(renderView->v iewRect())); 656 pixelSnappedIntRect(renderView->viewRect()), LayoutSize());
657 renderView->paintLayer(context, paintingInfo);
659 658
660 m_isPainting = false; 659 m_isPainting = false;
661 m_lastPaintTime = currentTime(); 660 m_lastPaintTime = currentTime();
662 661
663 if (isTopLevelPainter) { 662 if (isTopLevelPainter) {
664 // Everything that happens after paintContents completions is considered 663 // Everything that happens after paintContents completions is considered
665 // to be part of the next frame. 664 // to be part of the next frame.
666 s_currentFrameTimeStamp = currentTime(); 665 s_currentFrameTimeStamp = currentTime();
667 s_inPaintContents = false; 666 s_inPaintContents = false;
668 } 667 }
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 totalObjects = 0; 784 totalObjects = 0;
786 785
787 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { 786 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
788 ++totalObjects; 787 ++totalObjects;
789 if (o->needsLayout()) 788 if (o->needsLayout())
790 ++needsLayoutObjects; 789 ++needsLayoutObjects;
791 } 790 }
792 } 791 }
793 792
794 } // namespace blink 793 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698