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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

Issue 2447843002: Revert "Allow to set display "inline" on legend element" (Closed)
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 } 223 }
224 224
225 if (isHTMLRTElement(element)) { 225 if (isHTMLRTElement(element)) {
226 // Ruby text does not support float or position. This might change with 226 // Ruby text does not support float or position. This might change with
227 // evolution of the specification. 227 // evolution of the specification.
228 style.setPosition(StaticPosition); 228 style.setPosition(StaticPosition);
229 style.setFloating(EFloat::None); 229 style.setFloating(EFloat::None);
230 return; 230 return;
231 } 231 }
232 232
233 if (isHTMLLegendElement(element)) {
234 style.setDisplay(EDisplay::Block);
235 return;
236 }
237
233 if (isHTMLMarqueeElement(element)) { 238 if (isHTMLMarqueeElement(element)) {
234 // For now, <marquee> requires an overflow clip to work properly. 239 // For now, <marquee> requires an overflow clip to work properly.
235 style.setOverflowX(OverflowHidden); 240 style.setOverflowX(OverflowHidden);
236 style.setOverflowY(OverflowHidden); 241 style.setOverflowY(OverflowHidden);
237 return; 242 return;
238 } 243 }
239 244
240 if (isHTMLTextAreaElement(element)) { 245 if (isHTMLTextAreaElement(element)) {
241 // Textarea considers overflow visible as auto. 246 // Textarea considers overflow visible as auto.
242 style.setOverflowX(style.overflowX() == OverflowVisible 247 style.setOverflowX(style.overflowX() == OverflowVisible
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 style.setDisplay(EDisplay::Block); 460 style.setDisplay(EDisplay::Block);
456 461
457 // Columns don't apply to svg text elements. 462 // Columns don't apply to svg text elements.
458 if (isSVGTextElement(*element)) 463 if (isSVGTextElement(*element))
459 style.clearMultiCol(); 464 style.clearMultiCol();
460 } 465 }
461 adjustStyleForAlignment(style, parentStyle); 466 adjustStyleForAlignment(style, parentStyle);
462 } 467 }
463 468
464 } // namespace blink 469 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698