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

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 months 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/RenderListMarker.h ('k') | Source/core/rendering/RenderMenuList.h » ('j') | 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) 6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
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 1639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1650 } 1650 }
1651 marginStart = -marginEnd - minPreferredLogicalWidth(); 1651 marginStart = -marginEnd - minPreferredLogicalWidth();
1652 } 1652 }
1653 1653
1654 } 1654 }
1655 1655
1656 style()->setMarginStart(Length(marginStart, Fixed)); 1656 style()->setMarginStart(Length(marginStart, Fixed));
1657 style()->setMarginEnd(Length(marginEnd, Fixed)); 1657 style()->setMarginEnd(Length(marginEnd, Fixed));
1658 } 1658 }
1659 1659
1660 LayoutUnit RenderListMarker::lineHeight(bool firstLine, LineDirectionMode direct ion, LinePositionMode linePositionMode) const 1660 LayoutUnit RenderListMarker::lineHeight(OwnOrFirstLineStyle firstLine, LineDirec tionMode direction, LinePositionMode linePositionMode) const
1661 { 1661 {
1662 if (!isImage()) 1662 if (!isImage())
1663 return m_listItem->lineHeight(firstLine, direction, PositionOfInteriorLi neBoxes); 1663 return m_listItem->lineHeight(firstLine, direction, PositionOfInteriorLi neBoxes);
1664 return RenderBox::lineHeight(firstLine, direction, linePositionMode); 1664 return RenderBox::lineHeight(firstLine, direction, linePositionMode);
1665 } 1665 }
1666 1666
1667 int RenderListMarker::baselinePosition(FontBaseline baselineType, bool firstLine , LineDirectionMode direction, LinePositionMode linePositionMode) const 1667 int RenderListMarker::baselinePosition(FontBaseline baselineType, OwnOrFirstLine Style firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
1668 { 1668 {
1669 ASSERT(linePositionMode == PositionOnContainingLine); 1669 ASSERT(linePositionMode == PositionOnContainingLine);
1670 if (!isImage()) 1670 if (!isImage())
1671 return m_listItem->baselinePosition(baselineType, firstLine, direction, PositionOfInteriorLineBoxes); 1671 return m_listItem->baselinePosition(baselineType, firstLine, direction, PositionOfInteriorLineBoxes);
1672 return RenderBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode); 1672 return RenderBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode);
1673 } 1673 }
1674 1674
1675 String RenderListMarker::suffix() const 1675 String RenderListMarker::suffix() const
1676 { 1676 {
1677 EListStyleType type = style()->listStyleType(); 1677 EListStyleType type = style()->listStyleType();
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1837 1837
1838 if (clipToVisibleContent) 1838 if (clipToVisibleContent)
1839 mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect); 1839 mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect);
1840 else 1840 else
1841 rect = localToContainerQuad(FloatRect(rect), paintInvalidationContainer) .enclosingBoundingBox(); 1841 rect = localToContainerQuad(FloatRect(rect), paintInvalidationContainer) .enclosingBoundingBox();
1842 1842
1843 return rect; 1843 return rect;
1844 } 1844 }
1845 1845
1846 } // namespace WebCore 1846 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListMarker.h ('k') | Source/core/rendering/RenderMenuList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698