Source/core/css/resolver/FontBuilder.h - Issue 20112002: Have const StyleResolverState return const RenderStyle

Side by Side Diff: Source/core/css/resolver/FontBuilder.h

Issue 20112002: Have const StyleResolverState return const RenderStyle (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/css/CSSToStyleMap.cpp ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.	3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

4 * Copyright (C) 2013 Google Inc. All rights reserved.	4 * Copyright (C) 2013 Google Inc. All rights reserved.

5 *	5 *

6 * This library is free software; you can redistribute it and/or	6 * This library is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Library General Public	7 * modify it under the terms of the GNU Library General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2 of the License, or (at your option) any later version.	9 * version 2 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51	51

52 void inheritFrom(const FontDescription&);	52 void inheritFrom(const FontDescription&);

53 void fromSystemFont(CSSValueID, float effectiveZoom);	53 void fromSystemFont(CSSValueID, float effectiveZoom);

54	54

55 void setFontFamilyInitial(float effectiveZoom);	55 void setFontFamilyInitial(float effectiveZoom);

56 void setFontFamilyInherit(const FontDescription&);	56 void setFontFamilyInherit(const FontDescription&);

57 void setFontFamilyValue(CSSValue*, float effectiveZoom);	57 void setFontFamilyValue(CSSValue*, float effectiveZoom);

58	58

59 void setFontSizeInitial(float effectiveZoom);	59 void setFontSizeInitial(float effectiveZoom);

60 void setFontSizeInherit(const FontDescription&, float effectiveZoom);	60 void setFontSizeInherit(const FontDescription&, float effectiveZoom);

61 void setFontSizeValue(CSSValue, RenderStyle parentStyle, RenderStyle* root ElementStyle, float effectiveZoom);	61 void setFontSizeValue(CSSValue, RenderStyle parentStyle, const RenderStyle * rootElementStyle, float effectiveZoom);

62	62

63 void setWeight(FontWeight);	63 void setWeight(FontWeight);

64 void setWeightBolder();	64 void setWeightBolder();

65 void setWeightLighter();	65 void setWeightLighter();

66	66

67 void setFontVariantLigaturesInitial();	67 void setFontVariantLigaturesInitial();

68 void setFontVariantLigaturesInherit(const FontDescription&);	68 void setFontVariantLigaturesInherit(const FontDescription&);

69 void setFontVariantLigaturesValue(CSSValue*);	69 void setFontVariantLigaturesValue(CSSValue*);

70	70

71 void setFeatureSettingsNormal();	71 void setFeatureSettingsNormal();

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
114 // object on RenderStyle from various other font-related	114 // object on RenderStyle from various other font-related

115 // properties on RenderStyle. Whenever one of those	115 // properties on RenderStyle. Whenever one of those

116 // is changed, FontBuilder tracks the need to update	116 // is changed, FontBuilder tracks the need to update

117 // style->font() with this bool.	117 // style->font() with this bool.

118 bool m_fontDirty;	118 bool m_fontDirty;

119 };	119 };

120	120

121 }	121 }

122	122

123 #endif	123 #endif

OLD	NEW