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

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

Issue 1016863002: Fix integer overflow in ComputedStyle::computedLineHeight (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add tests Created 5 years, 8 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
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 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 581
582 float zoom() const { return visual->m_zoom; } 582 float zoom() const { return visual->m_zoom; }
583 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; } 583 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; }
584 584
585 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); } 585 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); }
586 bool isLeftToRightDirection() const { return direction() == LTR; } 586 bool isLeftToRightDirection() const { return direction() == LTR; }
587 bool selfOrAncestorHasDirAutoAttribute() const { return rareInheritedData->m _selfOrAncestorHasDirAutoAttribute; } 587 bool selfOrAncestorHasDirAutoAttribute() const { return rareInheritedData->m _selfOrAncestorHasDirAutoAttribute; }
588 588
589 const Length& specifiedLineHeight() const; 589 const Length& specifiedLineHeight() const;
590 Length lineHeight() const; 590 Length lineHeight() const;
591 int computedLineHeight() const; 591 LayoutUnit computedLineHeight() const;
592 592
593 EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(inherited_f lags._white_space); } 593 EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(inherited_f lags._white_space); }
594 static bool autoWrap(EWhiteSpace ws) 594 static bool autoWrap(EWhiteSpace ws)
595 { 595 {
596 // Nowrap and pre don't automatically wrap. 596 // Nowrap and pre don't automatically wrap.
597 return ws != NOWRAP && ws != PRE; 597 return ws != NOWRAP && ws != PRE;
598 } 598 }
599 599
600 bool autoWrap() const 600 bool autoWrap() const
601 { 601 {
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 } 1874 }
1875 1875
1876 inline bool ComputedStyle::hasPseudoElementStyle() const 1876 inline bool ComputedStyle::hasPseudoElementStyle() const
1877 { 1877 {
1878 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1878 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1879 } 1879 }
1880 1880
1881 } // namespace blink 1881 } // namespace blink
1882 1882
1883 #endif // ComputedStyle_h 1883 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698