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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 19954010: Clip accelerated descendants of an accelerated layer having border radius and clip overflow (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Adding back clipPath condition ommited when rebased Created 7 years, 1 month 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 | « Source/core/rendering/CompositedLayerMapping.cpp ('k') | no next file » | 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 2142 matching lines...) Expand 10 before | Expand all | Expand 10 after
2153 paintBoxDecorations(paintInfo, paintOffset); 2153 paintBoxDecorations(paintInfo, paintOffset);
2154 if (hasColumns() && !paintInfo.paintRootBackgroundOnly()) 2154 if (hasColumns() && !paintInfo.paintRootBackgroundOnly())
2155 paintColumnRules(paintInfo, scrolledOffset); 2155 paintColumnRules(paintInfo, scrolledOffset);
2156 } 2156 }
2157 2157
2158 if (paintPhase == PaintPhaseMask && style()->visibility() == VISIBLE) { 2158 if (paintPhase == PaintPhaseMask && style()->visibility() == VISIBLE) {
2159 paintMask(paintInfo, paintOffset); 2159 paintMask(paintInfo, paintOffset);
2160 return; 2160 return;
2161 } 2161 }
2162 2162
2163 if (paintPhase == PaintPhaseClippingMask && style()->visibility() == VISIBLE ) {
2164 paintClippingMask(paintInfo, paintOffset);
2165 return;
2166 }
2167
2163 // We're done. We don't bother painting any children. 2168 // We're done. We don't bother painting any children.
2164 if (paintPhase == PaintPhaseBlockBackground || paintInfo.paintRootBackground Only()) 2169 if (paintPhase == PaintPhaseBlockBackground || paintInfo.paintRootBackground Only())
2165 return; 2170 return;
2166 2171
2167 // 2. paint contents 2172 // 2. paint contents
2168 if (paintPhase != PaintPhaseSelfOutline) { 2173 if (paintPhase != PaintPhaseSelfOutline) {
2169 if (hasColumns()) 2174 if (hasColumns())
2170 paintColumnContents(paintInfo, scrolledOffset); 2175 paintColumnContents(paintInfo, scrolledOffset);
2171 else 2176 else
2172 paintContents(paintInfo, scrolledOffset); 2177 paintContents(paintInfo, scrolledOffset);
(...skipping 3610 matching lines...) Expand 10 before | Expand all | Expand 10 after
5783 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5788 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5784 { 5789 {
5785 showRenderObject(); 5790 showRenderObject();
5786 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5791 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5787 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5792 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5788 } 5793 }
5789 5794
5790 #endif 5795 #endif
5791 5796
5792 } // namespace WebCore 5797 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/CompositedLayerMapping.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698