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

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

Issue 26997002: Should paint border before background when bleedAvoidance is BackgroundBleedBackgroundOverBorder (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 void RenderTable::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint& p aintOffset) 727 void RenderTable::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint& p aintOffset)
728 { 728 {
729 if (!paintInfo.shouldPaintWithinRoot(this)) 729 if (!paintInfo.shouldPaintWithinRoot(this))
730 return; 730 return;
731 731
732 LayoutRect rect(paintOffset, size()); 732 LayoutRect rect(paintOffset, size());
733 subtractCaptionRect(rect); 733 subtractCaptionRect(rect);
734 paintBoxDecorationsWithRect(paintInfo, paintOffset, rect); 734 paintBoxDecorationsWithRect(paintInfo, paintOffset, rect);
735 } 735 }
736 736
737 void RenderTable::paintBackgroundWithBorderAndBoxShadow(PaintInfo& paintInfo, co nst LayoutRect& rect, BackgroundBleedAvoidance bleedAvoidance)
738 {
739 paintBackground(paintInfo, rect, bleedAvoidance);
740 paintBoxShadow(paintInfo, rect, style(), Inset);
741
742 if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && !style()->hasAp pearance() && style()->hasBorder() && !collapseBorders())
743 paintBorder(paintInfo, rect, style());
744 }
745
746 void RenderTable::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset ) 737 void RenderTable::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset )
747 { 738 {
748 if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask) 739 if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
749 return; 740 return;
750 741
751 LayoutRect rect(paintOffset, size()); 742 LayoutRect rect(paintOffset, size());
752 subtractCaptionRect(rect); 743 subtractCaptionRect(rect);
753 744
754 paintMaskImages(paintInfo, rect); 745 paintMaskImages(paintInfo, rect);
755 } 746 }
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1440 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1450 { 1441 {
1451 ASSERT(cell->isFirstOrLastCellInRow()); 1442 ASSERT(cell->isFirstOrLastCellInRow());
1452 if (hasSameDirectionAs(cell->row())) 1443 if (hasSameDirectionAs(cell->row()))
1453 return style()->borderEnd(); 1444 return style()->borderEnd();
1454 1445
1455 return style()->borderStart(); 1446 return style()->borderStart();
1456 } 1447 }
1457 1448
1458 } 1449 }
OLDNEW
« Source/core/rendering/RenderBox.cpp ('K') | « Source/core/rendering/RenderTable.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698