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 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 // Menulists should have visible overflow | 395 // Menulists should have visible overflow |
396 if (style->appearance() == MenulistPart) { | 396 if (style->appearance() == MenulistPart) { |
397 style->setOverflowX(OVISIBLE); | 397 style->setOverflowX(OVISIBLE); |
398 style->setOverflowY(OVISIBLE); | 398 style->setOverflowY(OVISIBLE); |
399 } | 399 } |
400 | 400 |
401 // Spec: http://www.w3.org/TR/SVG/masking.html#OverflowProperty | 401 // Spec: http://www.w3.org/TR/SVG/masking.html#OverflowProperty |
402 if (element && element->isSVGElement()) { | 402 if (element && element->isSVGElement()) { |
403 if (style->overflowY() == OSCROLL) | 403 if (style->overflowY() == OSCROLL) |
404 style->setOverflowY(OHIDDEN); | 404 style->setOverflowY(OHIDDEN); |
405 else if (style->overflowY() == OAUTO) | |
406 style->setOverflowY(OVISIBLE); | |
407 | 405 |
408 if (style->overflowX() == OSCROLL) | 406 if (style->overflowX() == OSCROLL) |
409 style->setOverflowX(OHIDDEN); | 407 style->setOverflowX(OHIDDEN); |
410 else if (style->overflowX() == OAUTO) | |
411 style->setOverflowX(OVISIBLE); | |
412 } | 408 } |
413 } | 409 } |
414 | 410 |
415 void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, RenderStyle* paren
tStyle) | 411 void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, RenderStyle* paren
tStyle) |
416 { | 412 { |
417 if (style->display() == BLOCK && !style->isFloating()) | 413 if (style->display() == BLOCK && !style->isFloating()) |
418 return; | 414 return; |
419 | 415 |
420 // FIXME: Don't support this mutation for pseudo styles like first-letter or
first-line, since it's not completely | 416 // FIXME: Don't support this mutation for pseudo styles like first-letter or
first-line, since it's not completely |
421 // clear how that should work. | 417 // clear how that should work. |
(...skipping 27 matching lines...) Expand all Loading... |
449 if (style->writingMode() != TopToBottomWritingMode && (style->display() == B
OX || style->display() == INLINE_BOX)) | 445 if (style->writingMode() != TopToBottomWritingMode && (style->display() == B
OX || style->display() == INLINE_BOX)) |
450 style->setWritingMode(TopToBottomWritingMode); | 446 style->setWritingMode(TopToBottomWritingMode); |
451 | 447 |
452 if (isDisplayFlexibleBox(parentStyle->display()) || isDisplayGridBox(parentS
tyle->display())) { | 448 if (isDisplayFlexibleBox(parentStyle->display()) || isDisplayGridBox(parentS
tyle->display())) { |
453 style->setFloating(NoFloat); | 449 style->setFloating(NoFloat); |
454 style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloa
ting(), !m_useQuirksModeStyles)); | 450 style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloa
ting(), !m_useQuirksModeStyles)); |
455 } | 451 } |
456 } | 452 } |
457 | 453 |
458 } | 454 } |
OLD | NEW |