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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 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 * This file is part of the theme implementation for form controls in WebCore. 2 * This file is part of the theme implementation for form controls in WebCore.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 style->setMinHeight(minControlSize.height()); 181 style->setMinHeight(minControlSize.height());
182 182
183 // Font 183 // Font
184 FontDescription controlFont = m_platformTheme->controlFont(part, style-> font().fontDescription(), style->effectiveZoom()); 184 FontDescription controlFont = m_platformTheme->controlFont(part, style-> font().fontDescription(), style->effectiveZoom());
185 if (controlFont != style->font().fontDescription()) { 185 if (controlFont != style->font().fontDescription()) {
186 // Reset our line-height 186 // Reset our line-height
187 style->setLineHeight(RenderStyle::initialLineHeight()); 187 style->setLineHeight(RenderStyle::initialLineHeight());
188 188
189 // Now update our font. 189 // Now update our font.
190 if (style->setFontDescription(controlFont)) 190 if (style->setFontDescription(controlFont))
191 style->font().update(0); 191 style->font().update(nullptr);
192 } 192 }
193 } 193 }
194 default: 194 default:
195 break; 195 break;
196 } 196 }
197 #endif 197 #endif
198 198
199 // Call the appropriate style adjustment method based off the appearance val ue. 199 // Call the appropriate style adjustment method based off the appearance val ue.
200 switch (style->appearance()) { 200 switch (style->appearance()) {
201 #if !USE(NEW_THEME) 201 #if !USE(NEW_THEME)
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 1267
1268 // padding - not honored by WinIE, needs to be removed. 1268 // padding - not honored by WinIE, needs to be removed.
1269 style->resetPadding(); 1269 style->resetPadding();
1270 1270
1271 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme) 1271 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
1272 // for now, we will not honor it. 1272 // for now, we will not honor it.
1273 style->resetBorder(); 1273 style->resetBorder();
1274 } 1274 }
1275 1275
1276 } // namespace WebCore 1276 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTextFragment.cpp ('k') | Source/core/rendering/RenderThemeChromiumMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698