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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 837633003: Delete dead painting code around m_pendingSheetLayout. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « sky/engine/core/dom/Document.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 651
652 if (paintPhase == PaintPhaseMask) { 652 if (paintPhase == PaintPhaseMask) {
653 paintMask(paintInfo, paintOffset); 653 paintMask(paintInfo, paintOffset);
654 return; 654 return;
655 } 655 }
656 656
657 // We're done. We don't bother painting any children. 657 // We're done. We don't bother painting any children.
658 if (paintPhase == PaintPhaseBlockBackground) 658 if (paintPhase == PaintPhaseBlockBackground)
659 return; 659 return;
660 660
661 if (paintPhase != PaintPhaseSelfOutline) { 661 if (paintPhase != PaintPhaseSelfOutline)
662 // Avoid painting descendants of the root element when stylesheets haven 't loaded. This eliminates FOUC. 662 paintContents(paintInfo, scrolledOffset);
663 // It's ok not to draw, because later on, when all the stylesheets do lo ad, styleResolverChanged() on the Document
664 // will do a full paint invalidation.
665 if (!document().didLayoutWithPendingStylesheets() || isRenderView())
666 paintContents(paintInfo, scrolledOffset);
667 }
668 663
669 paintSelection(paintInfo, scrolledOffset); // Fill in gaps in selection on l ines and between blocks. 664 paintSelection(paintInfo, scrolledOffset); // Fill in gaps in selection on l ines and between blocks.
670 665
671 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) 666 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline)
672 && style()->hasOutline() && !style()->outlineStyleIsAuto()) { 667 && style()->hasOutline() && !style()->outlineStyleIsAuto()) {
673 paintOutline(paintInfo, LayoutRect(paintOffset, size())); 668 paintOutline(paintInfo, LayoutRect(paintOffset, size()));
674 } 669 }
675 670
676 // If the caret's node's render object's containing block is this block, and the paint action is PaintPhaseForeground, 671 // If the caret's node's render object's containing block is this block, and the paint action is PaintPhaseForeground,
677 // then paint the caret. 672 // then paint the caret.
(...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1984 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 1979 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
1985 { 1980 {
1986 showRenderObject(); 1981 showRenderObject();
1987 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 1982 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
1988 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 1983 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
1989 } 1984 }
1990 1985
1991 #endif 1986 #endif
1992 1987
1993 } // namespace blink 1988 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Document.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698