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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. 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 | Annotate | Revision Log
OLDNEW
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } 91 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }
92 static FontStretch initialStretch() { return FontStretchNormal; } 92 static FontStretch initialStretch() { return FontStretchNormal; }
93 static FontWeight initialWeight() { return FontWeightNormal; } 93 static FontWeight initialWeight() { return FontWeightNormal; }
94 94
95 friend class FontDescriptionChangeScope; 95 friend class FontDescriptionChangeScope;
96 96
97 private: 97 private:
98 98
99 void setFamilyDescription(FontDescription&, const FontDescription::FamilyDes cription&); 99 void setFamilyDescription(FontDescription&, const FontDescription::FamilyDes cription&);
100 void setSize(FontDescription&, const FontDescription::Size&); 100 void setSize(FontDescription&, const FontDescription::Size&);
101 void checkForOrientationChange(RenderStyle*); 101 void checkForOrientationChange(const RenderStyle*);
102 // This function fixes up the default font size if it detects that the curre nt generic font family has changed. -dwh 102 // This function fixes up the default font size if it detects that the curre nt generic font family has changed. -dwh
103 void checkForGenericFamilyChange(RenderStyle*, const RenderStyle* parentStyl e); 103 void checkForGenericFamilyChange(const RenderStyle*, const RenderStyle* pare ntStyle);
104 void updateComputedSize(RenderStyle*, const RenderStyle* parentStyle); 104 void updateComputedSize(const RenderStyle*, const RenderStyle* parentStyle);
105 void updateComputedSize(FontDescription&, RenderStyle*); 105 void updateComputedSize(FontDescription&, const RenderStyle*);
106 106
107 float getComputedSizeFromSpecifiedSize(FontDescription&, float effectiveZoom , float specifiedSize); 107 float getComputedSizeFromSpecifiedSize(FontDescription&, float effectiveZoom , float specifiedSize);
108 108
109 const Document& m_document; 109 const Document& m_document;
110 FontDescription m_fontDescription; 110 FontDescription m_fontDescription;
111 111
112 // Fontbuilder is responsbile for creating the Font() 112 // Fontbuilder is responsbile for creating the Font()
113 // object on RenderStyle from various other font-related 113 // object on RenderStyle from various other font-related
114 // properties on RenderStyle. Whenever one of those 114 // properties on RenderStyle. Whenever one of those
115 // is changed, FontBuilder tracks the need to update 115 // is changed, FontBuilder tracks the need to update
116 // style->font() with this bool. 116 // style->font() with this bool.
117 bool m_fontDirty; 117 bool m_fontDirty;
118 }; 118 };
119 119
120 } 120 }
121 121
122 #endif 122 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698