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

Side by Side Diff: Source/core/rendering/RenderBox.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
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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 paintBorder(paintInfo, paintRect, style(), bleedAvoidance); 1339 paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
1340 1340
1341 paintBackground(paintInfo, paintRect, bleedAvoidance); 1341 paintBackground(paintInfo, paintRect, bleedAvoidance);
1342 1342
1343 if (style()->hasAppearance()) 1343 if (style()->hasAppearance())
1344 RenderTheme::theme().paintDecorations(this, paintInfo, snappedPaintR ect); 1344 RenderTheme::theme().paintDecorations(this, paintInfo, snappedPaintR ect);
1345 } 1345 }
1346 paintBoxShadow(paintInfo, paintRect, style(), Inset); 1346 paintBoxShadow(paintInfo, paintRect, style(), Inset);
1347 1347
1348 // The theme will tell us whether or not we should also paint the CSS border . 1348 // The theme will tell us whether or not we should also paint the CSS border .
1349 if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style()->hasA ppearance() || (!themePainted && RenderTheme::theme().paintBorderOnly(this, pain tInfo, snappedPaintRect))) && style()->hasBorder()) 1349 if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style()->hasA ppearance() || (!themePainted && RenderTheme::theme().paintBorderOnly(this, pain tInfo, snappedPaintRect))) && style()->hasBorder() && !(isTable() && toRenderTab le(this)->collapseBorders()))
1350 paintBorder(paintInfo, paintRect, style(), bleedAvoidance); 1350 paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
1351 } 1351 }
1352 1352
1353 void RenderBox::paintBackground(const PaintInfo& paintInfo, const LayoutRect& pa intRect, BackgroundBleedAvoidance bleedAvoidance) 1353 void RenderBox::paintBackground(const PaintInfo& paintInfo, const LayoutRect& pa intRect, BackgroundBleedAvoidance bleedAvoidance)
1354 { 1354 {
1355 if (isRoot()) { 1355 if (isRoot()) {
1356 paintRootBoxFillLayers(paintInfo); 1356 paintRootBoxFillLayers(paintInfo);
1357 return; 1357 return;
1358 } 1358 }
1359 if (isBody() && skipBodyBackground(this)) 1359 if (isBody() && skipBodyBackground(this))
(...skipping 3625 matching lines...) Expand 10 before | Expand all | Expand 10 after
4985 return 0; 4985 return 0;
4986 4986
4987 if (!layoutState && !flowThreadContainingBlock()) 4987 if (!layoutState && !flowThreadContainingBlock())
4988 return 0; 4988 return 0;
4989 4989
4990 RenderBlock* containerBlock = containingBlock(); 4990 RenderBlock* containerBlock = containingBlock();
4991 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4991 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4992 } 4992 }
4993 4993
4994 } // namespace WebCore 4994 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/platform/linux/fast/table/table-with-border-radius-expected.png ('k') | Source/core/rendering/RenderTable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698