Source/core/layout/style/LayoutStyle.h - Issue 943463002: Initial implementation of font-size-adjust

Side by Side Diff: Source/core/layout/style/LayoutStyle.h

Issue 943463002: Initial implementation of font-size-adjust (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: ExpectedResultForLinuxIsUpdated Created 5 years, 10 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

« LayoutTests/fast/text/font-size-adjust.html ('K') | « Source/core/frame/UseCounter.cpp ('k') | Source/core/layout/style/LayoutStyle.cpp » ('j') | no next file with comments »

OLD	NEW
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 529 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
540 EClear clear() const { return static_cast<EClear>(noninherited_flags.clear); }	540 EClear clear() const { return static_cast<EClear>(noninherited_flags.clear); }

541 ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninher ited_flags.tableLayout); }	541 ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninher ited_flags.tableLayout); }

542 bool isFixedTableLayout() const { return tableLayout() == TFIXED && !logical Width().isAuto(); }	542 bool isFixedTableLayout() const { return tableLayout() == TFIXED && !logical Width().isAuto(); }

543	543

544 const Font& font() const;	544 const Font& font() const;

545 const FontMetrics& fontMetrics() const;	545 const FontMetrics& fontMetrics() const;

546 const FontDescription& fontDescription() const;	546 const FontDescription& fontDescription() const;

547 float specifiedFontSize() const;	547 float specifiedFontSize() const;

548 float computedFontSize() const;	548 float computedFontSize() const;

549 int fontSize() const;	549 int fontSize() const;

	550 float fontSizeAdjust() const;

	551 bool hasFontSizeAdjust() const;

550 FontWeight fontWeight() const;	552 FontWeight fontWeight() const;

551 FontStretch fontStretch() const;	553 FontStretch fontStretch() const;

552	554

553 float textAutosizingMultiplier() const { return inherited->textAutosizingMul tiplier; }	555 float textAutosizingMultiplier() const { return inherited->textAutosizingMul tiplier; }

554	556

555 const Length& textIndent() const { return rareInheritedData->indent; }	557 const Length& textIndent() const { return rareInheritedData->indent; }

556 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }	558 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }

557 TextIndentType textIndentType() const { return static_cast<TextIndentType>(r areInheritedData->m_textIndentType); }	559 TextIndentType textIndentType() const { return static_cast<TextIndentType>(r areInheritedData->m_textIndentType); }

558 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }	560 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }

559 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }	561 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }

(...skipping 1294 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1854 }	1856 }

1855	1857

1856 inline bool LayoutStyle::hasPseudoElementStyle() const	1858 inline bool LayoutStyle::hasPseudoElementStyle() const

1857 {	1859 {

1858 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;	1860 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;

1859 }	1861 }

1860	1862

1861 } // namespace blink	1863 } // namespace blink

1862	1864

1863 #endif // LayoutStyle_h	1865 #endif // LayoutStyle_h

OLD	NEW