Chromium Code Reviews

Side by Side Diff: Source/core/rendering/RenderThemeChromiumSkia.cpp

Issue 205743004: Expand system font values during font property parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and fix up unittest use of systemFont() Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumSkia.h ('k') | Source/web/tests/DragImageTest.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) 2007 Apple Inc. 2 * Copyright (C) 2007 Apple Inc.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2008 Collabora Ltd. 4 * Copyright (C) 2008 Collabora Ltd.
5 * Copyright (C) 2008, 2009 Google Inc. 5 * Copyright (C) 2008, 2009 Google Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 109 matching lines...)
120 double RenderThemeChromiumSkia::caretBlinkInterval() const 120 double RenderThemeChromiumSkia::caretBlinkInterval() const
121 { 121 {
122 // Disable the blinking caret in layout test mode, as it introduces 122 // Disable the blinking caret in layout test mode, as it introduces
123 // a race condition for the pixel tests. http://b/1198440 123 // a race condition for the pixel tests. http://b/1198440
124 if (isRunningLayoutTest()) 124 if (isRunningLayoutTest())
125 return 0; 125 return 0;
126 126
127 return caretBlinkIntervalInternal(); 127 return caretBlinkIntervalInternal();
128 } 128 }
129 129
130 void RenderThemeChromiumSkia::systemFont(CSSValueID valueID, FontDescription& fo ntDescription) const 130 void RenderThemeChromiumSkia::systemFont(CSSValueID systemFontID, FontStyle& fon tStyle, FontWeight& fontWeight, float& fontSize, AtomicString& fontFamily) const
131 { 131 {
132 RenderThemeChromiumFontProvider::systemFont(valueID, fontDescription); 132 RenderThemeChromiumFontProvider::systemFont(systemFontID, fontStyle, fontWei ght, fontSize, fontFamily);
133 } 133 }
134 134
135 int RenderThemeChromiumSkia::minimumMenuListSize(RenderStyle* style) const 135 int RenderThemeChromiumSkia::minimumMenuListSize(RenderStyle* style) const
136 { 136 {
137 return 0; 137 return 0;
138 } 138 }
139 139
140 // These are the default dimensions of radio buttons and checkboxes. 140 // These are the default dimensions of radio buttons and checkboxes.
141 static const int widgetStandardWidth = 13; 141 static const int widgetStandardWidth = 13;
142 static const int widgetStandardHeight = 13; 142 static const int widgetStandardHeight = 13;
(...skipping 333 matching lines...)
476 } 476 }
477 477
478 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope() 478 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope()
479 { 479 {
480 if (!m_needsFlipping) 480 if (!m_needsFlipping)
481 return; 481 return;
482 m_paintInfo.context->restore(); 482 m_paintInfo.context->restore();
483 } 483 }
484 484
485 } // namespace WebCore 485 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumSkia.h ('k') | Source/web/tests/DragImageTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine