| OLD | NEW |
| 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.
All rights reserved. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
| 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 } else if (style->overflowY() == OVISIBLE && style->overflowX() != OVISIBLE)
{ | 238 } else if (style->overflowY() == OVISIBLE && style->overflowX() != OVISIBLE)
{ |
| 239 style->setOverflowY(OAUTO); | 239 style->setOverflowY(OAUTO); |
| 240 } | 240 } |
| 241 } | 241 } |
| 242 | 242 |
| 243 void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, RenderStyle* paren
tStyle) | 243 void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, RenderStyle* paren
tStyle) |
| 244 { | 244 { |
| 245 if (style->display() == BLOCK) | 245 if (style->display() == BLOCK) |
| 246 return; | 246 return; |
| 247 | 247 |
| 248 // FIXME: Don't support this mutation for pseudo styles like first-letter or
first-line, since it's not completely | |
| 249 // clear how that should work. | |
| 250 if (style->display() == INLINE && style->styleType() == NOPSEUDO && style->w
ritingMode() != parentStyle->writingMode()) | |
| 251 style->setDisplay(INLINE_BLOCK); | |
| 252 | |
| 253 if (parentStyle->isDisplayFlexibleOrGridBox()) { | 248 if (parentStyle->isDisplayFlexibleOrGridBox()) { |
| 254 style->setDisplay(equivalentBlockDisplay(style->display())); | 249 style->setDisplay(equivalentBlockDisplay(style->display())); |
| 255 } | 250 } |
| 256 } | 251 } |
| 257 | 252 |
| 258 } | 253 } |
| OLD | NEW |