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

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: Patch for landing 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
« no previous file with comments | « Source/core/rendering/RenderTable.h ('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) 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 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 void RenderTable::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint& p aintOffset) 726 void RenderTable::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint& p aintOffset)
727 { 727 {
728 if (!paintInfo.shouldPaintWithinRoot(this)) 728 if (!paintInfo.shouldPaintWithinRoot(this))
729 return; 729 return;
730 730
731 LayoutRect rect(paintOffset, size()); 731 LayoutRect rect(paintOffset, size());
732 subtractCaptionRect(rect); 732 subtractCaptionRect(rect);
733 paintBoxDecorationsWithRect(paintInfo, paintOffset, rect); 733 paintBoxDecorationsWithRect(paintInfo, paintOffset, rect);
734 } 734 }
735 735
736 void RenderTable::paintBackgroundWithBorderAndBoxShadow(PaintInfo& paintInfo, co nst LayoutRect& rect, BackgroundBleedAvoidance bleedAvoidance)
737 {
738 paintBackground(paintInfo, rect, bleedAvoidance);
739 paintBoxShadow(paintInfo, rect, style(), Inset);
740
741 if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && !style()->hasAp pearance() && style()->hasBorder() && !collapseBorders())
742 paintBorder(paintInfo, rect, style());
743 }
744
745 void RenderTable::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset ) 736 void RenderTable::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset )
746 { 737 {
747 if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask) 738 if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
748 return; 739 return;
749 740
750 LayoutRect rect(paintOffset, size()); 741 LayoutRect rect(paintOffset, size());
751 subtractCaptionRect(rect); 742 subtractCaptionRect(rect);
752 743
753 paintMaskImages(paintInfo, rect); 744 paintMaskImages(paintInfo, rect);
754 } 745 }
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1448 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1439 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1449 { 1440 {
1450 ASSERT(cell->isFirstOrLastCellInRow()); 1441 ASSERT(cell->isFirstOrLastCellInRow());
1451 if (hasSameDirectionAs(cell->row())) 1442 if (hasSameDirectionAs(cell->row()))
1452 return style()->borderEnd(); 1443 return style()->borderEnd();
1453 1444
1454 return style()->borderStart(); 1445 return style()->borderStart();
1455 } 1446 }
1456 1447
1457 } 1448 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTable.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698