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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTheme.cpp

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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
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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // Padding 160 // Padding
161 LengthBox paddingBox = m_platformTheme->controlPadding( 161 LengthBox paddingBox = m_platformTheme->controlPadding(
162 part, style.font().getFontDescription(), style.paddingBox(), 162 part, style.font().getFontDescription(), style.paddingBox(),
163 style.effectiveZoom()); 163 style.effectiveZoom());
164 if (paddingBox != style.paddingBox()) 164 if (paddingBox != style.paddingBox())
165 style.setPaddingBox(paddingBox); 165 style.setPaddingBox(paddingBox);
166 166
167 // Whitespace 167 // Whitespace
168 if (m_platformTheme->controlRequiresPreWhiteSpace(part)) 168 if (m_platformTheme->controlRequiresPreWhiteSpace(part))
169 style.setWhiteSpace(EWhiteSpace::Pre); 169 style.setWhiteSpace(EWhiteSpace::kPre);
170 170
171 // Width / Height 171 // Width / Height
172 // The width and height here are affected by the zoom. 172 // The width and height here are affected by the zoom.
173 // FIXME: Check is flawed, since it doesn't take min-width/max-width 173 // FIXME: Check is flawed, since it doesn't take min-width/max-width
174 // into account. 174 // into account.
175 LengthSize controlSize = m_platformTheme->controlSize( 175 LengthSize controlSize = m_platformTheme->controlSize(
176 part, style.font().getFontDescription(), 176 part, style.font().getFontDescription(),
177 LengthSize(style.width(), style.height()), style.effectiveZoom()); 177 LengthSize(style.width(), style.height()), style.effectiveZoom());
178 if (controlSize.width() != style.width()) 178 if (controlSize.width() != style.width())
179 style.setWidth(controlSize.width()); 179 style.setWidth(controlSize.width());
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 // padding - not honored by WinIE, needs to be removed. 912 // padding - not honored by WinIE, needs to be removed.
913 style.resetPadding(); 913 style.resetPadding();
914 914
915 // border - honored by WinIE, but looks terrible (just paints in the control 915 // border - honored by WinIE, but looks terrible (just paints in the control
916 // box and turns off the Windows XP theme) 916 // box and turns off the Windows XP theme)
917 // for now, we will not honor it. 917 // for now, we will not honor it.
918 style.resetBorder(); 918 style.resetBorder();
919 } 919 }
920 920
921 } // namespace blink 921 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTextTest.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutThemeMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698