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

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

Issue 53373003: Remove display:run-in as per https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/_tHSX… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix test Created 7 years, 1 month 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 void RenderTheme::adjustStyle(RenderStyle* style, Element* e, const CachedUAStyl e& uaStyle) 97 void RenderTheme::adjustStyle(RenderStyle* style, Element* e, const CachedUAStyl e& uaStyle)
98 { 98 {
99 // Force inline and table display styles to be inline-block (except for tabl e- which is block) 99 // Force inline and table display styles to be inline-block (except for tabl e- which is block)
100 ControlPart part = style->appearance(); 100 ControlPart part = style->appearance();
101 if (style->display() == INLINE || style->display() == INLINE_TABLE || style- >display() == TABLE_ROW_GROUP 101 if (style->display() == INLINE || style->display() == INLINE_TABLE || style- >display() == TABLE_ROW_GROUP
102 || style->display() == TABLE_HEADER_GROUP || style->display() == TABLE_F OOTER_GROUP 102 || style->display() == TABLE_HEADER_GROUP || style->display() == TABLE_F OOTER_GROUP
103 || style->display() == TABLE_ROW || style->display() == TABLE_COLUMN_GRO UP || style->display() == TABLE_COLUMN 103 || style->display() == TABLE_ROW || style->display() == TABLE_COLUMN_GRO UP || style->display() == TABLE_COLUMN
104 || style->display() == TABLE_CELL || style->display() == TABLE_CAPTION) 104 || style->display() == TABLE_CELL || style->display() == TABLE_CAPTION)
105 style->setDisplay(INLINE_BLOCK); 105 style->setDisplay(INLINE_BLOCK);
106 else if (style->display() == COMPACT || style->display() == RUN_IN || style- >display() == LIST_ITEM || style->display() == TABLE) 106 else if (style->display() == COMPACT || style->display() == LIST_ITEM || sty le->display() == TABLE)
107 style->setDisplay(BLOCK); 107 style->setDisplay(BLOCK);
108 108
109 if (uaStyle.hasAppearance && isControlStyled(style, uaStyle)) { 109 if (uaStyle.hasAppearance && isControlStyled(style, uaStyle)) {
110 if (part == MenulistPart) { 110 if (part == MenulistPart) {
111 style->setAppearance(MenulistButtonPart); 111 style->setAppearance(MenulistButtonPart);
112 part = MenulistButtonPart; 112 part = MenulistButtonPart;
113 } else 113 } else
114 style->setAppearance(NoControlPart); 114 style->setAppearance(NoControlPart);
115 } 115 }
116 116
(...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1314 1314
1315 // padding - not honored by WinIE, needs to be removed. 1315 // padding - not honored by WinIE, needs to be removed.
1316 style->resetPadding(); 1316 style->resetPadding();
1317 1317
1318 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme) 1318 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
1319 // for now, we will not honor it. 1319 // for now, we will not honor it.
1320 style->resetBorder(); 1320 style->resetBorder();
1321 } 1321 }
1322 1322
1323 } // namespace WebCore 1323 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTextControl.cpp ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698