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

Side by Side Diff: Source/core/style/ComputedStyle.h

Issue 1185753005: Return int from outlineWidth() and outlineSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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/paint/ImagePainter.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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 unsigned borderTopWidth() const { return surround->border.borderTopWidth(); } 512 unsigned borderTopWidth() const { return surround->border.borderTopWidth(); }
513 EBorderStyle borderTopStyle() const { return surround->border.top().style(); } 513 EBorderStyle borderTopStyle() const { return surround->border.top().style(); }
514 unsigned borderBottomWidth() const { return surround->border.borderBottomWid th(); } 514 unsigned borderBottomWidth() const { return surround->border.borderBottomWid th(); }
515 EBorderStyle borderBottomStyle() const { return surround->border.bottom().st yle(); } 515 EBorderStyle borderBottomStyle() const { return surround->border.bottom().st yle(); }
516 516
517 unsigned short borderBeforeWidth() const; 517 unsigned short borderBeforeWidth() const;
518 unsigned short borderAfterWidth() const; 518 unsigned short borderAfterWidth() const;
519 unsigned short borderStartWidth() const; 519 unsigned short borderStartWidth() const;
520 unsigned short borderEndWidth() const; 520 unsigned short borderEndWidth() const;
521 521
522 unsigned short outlineSize() const { return max(0, outlineWidth() + outlineO ffset()); } 522 int outlineSize() const { return max(0, outlineWidth() + outlineOffset()); }
523 unsigned short outlineWidth() const 523 int outlineWidth() const
524 { 524 {
525 if (m_background->outline().style() == BNONE) 525 if (m_background->outline().style() == BNONE)
526 return 0; 526 return 0;
527 return m_background->outline().width(); 527 return m_background->outline().width();
528 } 528 }
529 bool hasOutline() const { return outlineWidth() > 0 && outlineStyle() > BHID DEN; } 529 bool hasOutline() const { return outlineWidth() > 0 && outlineStyle() > BHID DEN; }
530 EBorderStyle outlineStyle() const { return m_background->outline().style(); } 530 EBorderStyle outlineStyle() const { return m_background->outline().style(); }
531 OutlineIsAuto outlineStyleIsAuto() const { return static_cast<OutlineIsAuto> (m_background->outline().isAuto()); } 531 OutlineIsAuto outlineStyleIsAuto() const { return static_cast<OutlineIsAuto> (m_background->outline().isAuto()); }
532 int outlineOutset() const; 532 int outlineOutset() const;
533 533
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1915 } 1915 }
1916 1916
1917 inline bool ComputedStyle::hasPseudoElementStyle() const 1917 inline bool ComputedStyle::hasPseudoElementStyle() const
1918 { 1918 {
1919 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1919 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1920 } 1920 }
1921 1921
1922 } // namespace blink 1922 } // namespace blink
1923 1923
1924 #endif // ComputedStyle_h 1924 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « Source/core/paint/ImagePainter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698