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

Side by Side Diff: Source/core/css/FontSize.h

Issue 468793003: Make style building for 'font-size' less custom. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix regression related to FontDescriptions with isAbsolute=true. Created 6 years, 3 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/css/CSSProperties.in ('k') | Source/core/css/FontSize.cpp » ('j') | 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) 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 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 22 matching lines...) Expand all
33 33
34 class FontSize { 34 class FontSize {
35 private: 35 private:
36 FontSize() 36 FontSize()
37 { 37 {
38 } 38 }
39 39
40 public: 40 public:
41 static float getComputedSizeFromSpecifiedSize(const Document*, float zoomFac tor, bool isAbsoluteSize, float specifiedSize, ESmartMinimumForFontSize = UseSma rtMinimumForFontFize); 41 static float getComputedSizeFromSpecifiedSize(const Document*, float zoomFac tor, bool isAbsoluteSize, float specifiedSize, ESmartMinimumForFontSize = UseSma rtMinimumForFontFize);
42 42
43 // Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this fu nction will return 43 // Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this fu nction returns
44 // the correct font size scaled relative to the user's default (medium). 44 // values from '1' to '8'.
45 static float fontSizeForKeyword(const Document*, CSSValueID keyword, FixedPi tchFontType); 45 static unsigned keywordSize(CSSValueID valueID)
46 {
47 ASSERT(valueID >= CSSValueXxSmall && valueID <= CSSValueWebkitXxxLarge);
48 return valueID - CSSValueXxSmall + 1;
49 }
50
51 static unsigned initialKeywordSize() { return 4; } // CSSValueMedium
52
53 // Given a keyword size in the range (1 to 8), this function will return
54 // the correct font size scaled relative to the user's default (4).
55 static float fontSizeForKeyword(const Document*, unsigned keyword, FixedPitc hFontType);
46 56
47 // Given a font size in pixel, this function will return legacy font size be tween 1 and 7. 57 // Given a font size in pixel, this function will return legacy font size be tween 1 and 7.
48 static int legacyFontSize(const Document*, int pixelFontSize, FixedPitchFont Type); 58 static int legacyFontSize(const Document*, int pixelFontSize, FixedPitchFont Type);
49 }; 59 };
50 60
51 } // namespace blink 61 } // namespace blink
52 62
53 #endif // FontSize_h 63 #endif // FontSize_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/FontSize.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698