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

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

Issue 786003002: Remove PaintPhaseClippingMask. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/rendering/PaintPhase.h ('k') | 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) 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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 if (paintPhase == PaintPhaseBlockBackground || paintPhase == PaintPhaseChild BlockBackground) { 709 if (paintPhase == PaintPhaseBlockBackground || paintPhase == PaintPhaseChild BlockBackground) {
710 if (hasBoxDecorationBackground()) 710 if (hasBoxDecorationBackground())
711 paintBoxDecorationBackground(paintInfo, paintOffset); 711 paintBoxDecorationBackground(paintInfo, paintOffset);
712 } 712 }
713 713
714 if (paintPhase == PaintPhaseMask) { 714 if (paintPhase == PaintPhaseMask) {
715 paintMask(paintInfo, paintOffset); 715 paintMask(paintInfo, paintOffset);
716 return; 716 return;
717 } 717 }
718 718
719 if (paintPhase == PaintPhaseClippingMask) {
720 paintClippingMask(paintInfo, paintOffset);
721 return;
722 }
723
724 // We're done. We don't bother painting any children. 719 // We're done. We don't bother painting any children.
725 if (paintPhase == PaintPhaseBlockBackground) 720 if (paintPhase == PaintPhaseBlockBackground)
726 return; 721 return;
727 722
728 if (paintPhase != PaintPhaseSelfOutline) { 723 if (paintPhase != PaintPhaseSelfOutline) {
729 // Avoid painting descendants of the root element when stylesheets haven 't loaded. This eliminates FOUC. 724 // Avoid painting descendants of the root element when stylesheets haven 't loaded. This eliminates FOUC.
730 // It's ok not to draw, because later on, when all the stylesheets do lo ad, styleResolverChanged() on the Document 725 // It's ok not to draw, because later on, when all the stylesheets do lo ad, styleResolverChanged() on the Document
731 // will do a full paint invalidation. 726 // will do a full paint invalidation.
732 if (!document().didLayoutWithPendingStylesheets() || isRenderView()) 727 if (!document().didLayoutWithPendingStylesheets() || isRenderView())
733 paintContents(paintInfo, scrolledOffset); 728 paintContents(paintInfo, scrolledOffset);
(...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 2044 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
2050 { 2045 {
2051 showRenderObject(); 2046 showRenderObject();
2052 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2047 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2053 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2048 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2054 } 2049 }
2055 2050
2056 #endif 2051 #endif
2057 2052
2058 } // namespace blink 2053 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/PaintPhase.h ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698