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

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

Issue 783233002: Get rid of PaintPhaseTextClip. (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/RenderLineBoxList.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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 648
649 void RenderBlock::paintAsInlineBlock(RenderObject* renderer, PaintInfo& paintInf o, const LayoutPoint& childPoint) 649 void RenderBlock::paintAsInlineBlock(RenderObject* renderer, PaintInfo& paintInf o, const LayoutPoint& childPoint)
650 { 650 {
651 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection) 651 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection)
652 return; 652 return;
653 653
654 // Paint all phases atomically, as though the element established its own 654 // Paint all phases atomically, as though the element established its own
655 // stacking context. (See Appendix E.2, section 7.2.1.4 on 655 // stacking context. (See Appendix E.2, section 7.2.1.4 on
656 // inline block/table/replaced elements in the CSS2.1 specification.) 656 // inline block/table/replaced elements in the CSS2.1 specification.)
657 // This is also used by other elements (e.g. flex items). 657 // This is also used by other elements (e.g. flex items).
658 bool preservePhase = paintInfo.phase == PaintPhaseSelection || paintInfo.pha se == PaintPhaseTextClip; 658 bool preservePhase = paintInfo.phase == PaintPhaseSelection;
659 PaintInfo info(paintInfo); 659 PaintInfo info(paintInfo);
660 info.phase = preservePhase ? paintInfo.phase : PaintPhaseBlockBackground; 660 info.phase = preservePhase ? paintInfo.phase : PaintPhaseBlockBackground;
661 renderer->paint(info, childPoint); 661 renderer->paint(info, childPoint);
662 if (!preservePhase) { 662 if (!preservePhase) {
663 info.phase = PaintPhaseChildBlockBackgrounds; 663 info.phase = PaintPhaseChildBlockBackgrounds;
664 renderer->paint(info, childPoint); 664 renderer->paint(info, childPoint);
665 info.phase = PaintPhaseForeground; 665 info.phase = PaintPhaseForeground;
666 renderer->paint(info, childPoint); 666 renderer->paint(info, childPoint);
667 info.phase = PaintPhaseOutline; 667 info.phase = PaintPhaseOutline;
668 renderer->paint(info, childPoint); 668 renderer->paint(info, childPoint);
(...skipping 1375 matching lines...) Expand 10 before | Expand all | Expand 10 after
2044 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
2045 { 2045 {
2046 showRenderObject(); 2046 showRenderObject();
2047 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2047 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2048 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2048 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2049 } 2049 }
2050 2050
2051 #endif 2051 #endif
2052 2052
2053 } // namespace blink 2053 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/PaintPhase.h ('k') | sky/engine/core/rendering/RenderLineBoxList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698