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

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

Issue 111263002: Merge 163220 "Should paint border before background when bleedAv..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1700/
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) 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 1322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1333 paintBorder(paintInfo, paintRect, style(), bleedAvoidance); 1333 paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
1334 1334
1335 paintBackground(paintInfo, paintRect, bleedAvoidance); 1335 paintBackground(paintInfo, paintRect, bleedAvoidance);
1336 1336
1337 if (style()->hasAppearance()) 1337 if (style()->hasAppearance())
1338 RenderTheme::theme().paintDecorations(this, paintInfo, snappedPaintR ect); 1338 RenderTheme::theme().paintDecorations(this, paintInfo, snappedPaintR ect);
1339 } 1339 }
1340 paintBoxShadow(paintInfo, paintRect, style(), Inset); 1340 paintBoxShadow(paintInfo, paintRect, style(), Inset);
1341 1341
1342 // The theme will tell us whether or not we should also paint the CSS border . 1342 // The theme will tell us whether or not we should also paint the CSS border .
1343 if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style()->hasA ppearance() || (!themePainted && RenderTheme::theme().paintBorderOnly(this, pain tInfo, snappedPaintRect))) && style()->hasBorder()) 1343 if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style()->hasA ppearance() || (!themePainted && RenderTheme::theme().paintBorderOnly(this, pain tInfo, snappedPaintRect))) && style()->hasBorder() && !(isTable() && toRenderTab le(this)->collapseBorders()))
1344 paintBorder(paintInfo, paintRect, style(), bleedAvoidance); 1344 paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
1345 } 1345 }
1346 1346
1347 void RenderBox::paintBackground(const PaintInfo& paintInfo, const LayoutRect& pa intRect, BackgroundBleedAvoidance bleedAvoidance) 1347 void RenderBox::paintBackground(const PaintInfo& paintInfo, const LayoutRect& pa intRect, BackgroundBleedAvoidance bleedAvoidance)
1348 { 1348 {
1349 if (isRoot()) { 1349 if (isRoot()) {
1350 paintRootBoxFillLayers(paintInfo); 1350 paintRootBoxFillLayers(paintInfo);
1351 return; 1351 return;
1352 } 1352 }
1353 if (isBody() && skipBodyBackground(this)) 1353 if (isBody() && skipBodyBackground(this))
(...skipping 3621 matching lines...) Expand 10 before | Expand all | Expand 10 after
4975 return 0; 4975 return 0;
4976 4976
4977 if (!layoutState && !flowThreadContainingBlock()) 4977 if (!layoutState && !flowThreadContainingBlock())
4978 return 0; 4978 return 0;
4979 4979
4980 RenderBlock* containerBlock = containingBlock(); 4980 RenderBlock* containerBlock = containingBlock();
4981 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4981 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4982 } 4982 }
4983 4983
4984 } // namespace WebCore 4984 } // 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