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

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

Issue 639963005: Remove CachedUAStyle::hasAppearance. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | Source/core/rendering/style/CachedUAStyle.h » ('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 * 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // Force inline and table display styles to be inline-block (except for tabl e- which is block) 92 // Force inline and table display styles to be inline-block (except for tabl e- which is block)
93 ControlPart part = style->appearance(); 93 ControlPart part = style->appearance();
94 if (style->display() == INLINE || style->display() == INLINE_TABLE || style- >display() == TABLE_ROW_GROUP 94 if (style->display() == INLINE || style->display() == INLINE_TABLE || style- >display() == TABLE_ROW_GROUP
95 || style->display() == TABLE_HEADER_GROUP || style->display() == TABLE_F OOTER_GROUP 95 || style->display() == TABLE_HEADER_GROUP || style->display() == TABLE_F OOTER_GROUP
96 || style->display() == TABLE_ROW || style->display() == TABLE_COLUMN_GRO UP || style->display() == TABLE_COLUMN 96 || style->display() == TABLE_ROW || style->display() == TABLE_COLUMN_GRO UP || style->display() == TABLE_COLUMN
97 || style->display() == TABLE_CELL || style->display() == TABLE_CAPTION) 97 || style->display() == TABLE_CELL || style->display() == TABLE_CAPTION)
98 style->setDisplay(INLINE_BLOCK); 98 style->setDisplay(INLINE_BLOCK);
99 else if (style->display() == LIST_ITEM || style->display() == TABLE) 99 else if (style->display() == LIST_ITEM || style->display() == TABLE)
100 style->setDisplay(BLOCK); 100 style->setDisplay(BLOCK);
101 101
102 if (uaStyle && uaStyle->hasAppearance && isControlStyled(style, uaStyle)) { 102 if (uaStyle && isControlStyled(style, uaStyle)) {
103 if (part == MenulistPart) { 103 if (part == MenulistPart) {
104 style->setAppearance(MenulistButtonPart); 104 style->setAppearance(MenulistButtonPart);
105 part = MenulistButtonPart; 105 part = MenulistButtonPart;
106 } else 106 } else
107 style->setAppearance(NoControlPart); 107 style->setAppearance(NoControlPart);
108 } 108 }
109 109
110 if (!style->hasAppearance()) 110 if (!style->hasAppearance())
111 return; 111 return;
112 112
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 1201
1202 // padding - not honored by WinIE, needs to be removed. 1202 // padding - not honored by WinIE, needs to be removed.
1203 style->resetPadding(); 1203 style->resetPadding();
1204 1204
1205 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme) 1205 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
1206 // for now, we will not honor it. 1206 // for now, we will not honor it.
1207 style->resetBorder(); 1207 style->resetBorder();
1208 } 1208 }
1209 1209
1210 } // namespace blink 1210 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/style/CachedUAStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698