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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 734813004: Get rid of continuations. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/rendering/RenderObject.cpp ('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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.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 896 matching lines...) Expand 10 before | Expand all | Expand 10 after
907 void setBorderTopStyle(EBorderStyle v) { SET_VAR(surround, border.m_top.m_st yle, v); } 907 void setBorderTopStyle(EBorderStyle v) { SET_VAR(surround, border.m_top.m_st yle, v); }
908 void setBorderTopColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround , border.m_top, v); } 908 void setBorderTopColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround , border.m_top, v); }
909 void setBorderBottomWidth(unsigned v) { SET_VAR(surround, border.m_bottom.m_ width, v); } 909 void setBorderBottomWidth(unsigned v) { SET_VAR(surround, border.m_bottom.m_ width, v); }
910 void setBorderBottomStyle(EBorderStyle v) { SET_VAR(surround, border.m_botto m.m_style, v); } 910 void setBorderBottomStyle(EBorderStyle v) { SET_VAR(surround, border.m_botto m.m_style, v); }
911 void setBorderBottomColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surro und, border.m_bottom, v); } 911 void setBorderBottomColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surro und, border.m_bottom, v); }
912 912
913 void setOutlineWidth(unsigned short v) { SET_VAR(m_background, m_outline.m_w idth, v); } 913 void setOutlineWidth(unsigned short v) { SET_VAR(m_background, m_outline.m_w idth, v); }
914 void setOutlineStyleIsAuto(OutlineIsAuto isAuto) { SET_VAR(m_background, m_o utline.m_isAuto, isAuto); } 914 void setOutlineStyleIsAuto(OutlineIsAuto isAuto) { SET_VAR(m_background, m_o utline.m_isAuto, isAuto); }
915 void setOutlineStyle(EBorderStyle v) { SET_VAR(m_background, m_outline.m_sty le, v); } 915 void setOutlineStyle(EBorderStyle v) { SET_VAR(m_background, m_outline.m_sty le, v); }
916 void setOutlineColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(m_backgrou nd, m_outline, v); } 916 void setOutlineColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(m_backgrou nd, m_outline, v); }
917 bool isOutlineEquivalent(const RenderStyle* otherStyle) const
918 {
919 // No other style, so we don't have an outline then we consider them to be the same.
920 if (!otherStyle)
921 return !hasOutline();
922 return m_background->outline().visuallyEqual(otherStyle->m_background->o utline());
923 }
924 void setOutlineFromStyle(const RenderStyle& o)
925 {
926 ASSERT(!isOutlineEquivalent(&o));
927 m_background.access()->m_outline = o.m_background->m_outline;
928 }
929 917
930 void setOverflowX(EOverflow v) { noninherited_flags.overflowX = v; } 918 void setOverflowX(EOverflow v) { noninherited_flags.overflowX = v; }
931 void setOverflowY(EOverflow v) { noninherited_flags.overflowY = v; } 919 void setOverflowY(EOverflow v) { noninherited_flags.overflowY = v; }
932 void setVisibility(EVisibility v) { inherited_flags._visibility = v; } 920 void setVisibility(EVisibility v) { inherited_flags._visibility = v; }
933 void setVerticalAlign(EVerticalAlign v) { noninherited_flags.verticalAlign = v; } 921 void setVerticalAlign(EVerticalAlign v) { noninherited_flags.verticalAlign = v; }
934 void setVerticalAlignLength(const Length& length) { setVerticalAlign(LENGTH) ; SET_VAR(m_box, m_verticalAlign, length); } 922 void setVerticalAlignLength(const Length& length) { setVerticalAlign(LENGTH) ; SET_VAR(m_box, m_verticalAlign, length); }
935 923
936 void setHasAutoClip() { SET_VAR(visual, hasAutoClip, true); SET_VAR(visual, clip, RenderStyle::initialClip()); } 924 void setHasAutoClip() { SET_VAR(visual, hasAutoClip, true); SET_VAR(visual, clip, RenderStyle::initialClip()); }
937 void setClip(const LengthBox& box) { SET_VAR(visual, hasAutoClip, false); SE T_VAR(visual, clip, box); } 925 void setClip(const LengthBox& box) { SET_VAR(visual, hasAutoClip, false); SE T_VAR(visual, clip, box); }
938 926
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 1428
1441 rareInheritedData.access()->m_textOrientation = textOrientation; 1429 rareInheritedData.access()->m_textOrientation = textOrientation;
1442 return true; 1430 return true;
1443 } 1431 }
1444 1432
1445 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1433 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1446 1434
1447 } // namespace blink 1435 } // namespace blink
1448 1436
1449 #endif // RenderStyle_h 1437 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698