| 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 style.setZIndex(0); | 375 style.setZIndex(0); |
| 376 } else if (!style.hasAutoZIndex()) { | 376 } else if (!style.hasAutoZIndex()) { |
| 377 style.setIsStackingContext(true); | 377 style.setIsStackingContext(true); |
| 378 } | 378 } |
| 379 | 379 |
| 380 if (style.overflowX() != OverflowVisible || style.overflowY() != OverflowVis
ible) | 380 if (style.overflowX() != OverflowVisible || style.overflowY() != OverflowVis
ible) |
| 381 adjustOverflow(style); | 381 adjustOverflow(style); |
| 382 | 382 |
| 383 if (doesNotInheritTextDecoration(style, element)) | 383 if (doesNotInheritTextDecoration(style, element)) |
| 384 style.clearAppliedTextDecorations(); | 384 style.clearAppliedTextDecorations(); |
| 385 | 385 else |
| 386 style.restoreParentTextDecorations(parentStyle); |
| 386 style.applyTextDecorations(); | 387 style.applyTextDecorations(); |
| 387 | 388 |
| 388 // Cull out any useless layers and also repeat patterns into additional laye
rs. | 389 // Cull out any useless layers and also repeat patterns into additional laye
rs. |
| 389 style.adjustBackgroundLayers(); | 390 style.adjustBackgroundLayers(); |
| 390 style.adjustMaskLayers(); | 391 style.adjustMaskLayers(); |
| 391 | 392 |
| 392 // Let the theme also have a crack at adjusting the style. | 393 // Let the theme also have a crack at adjusting the style. |
| 393 if (style.hasAppearance()) | 394 if (style.hasAppearance()) |
| 394 LayoutTheme::theme().adjustStyle(style, element); | 395 LayoutTheme::theme().adjustStyle(style, element); |
| 395 | 396 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 410 style.setDisplay(BLOCK); | 411 style.setDisplay(BLOCK); |
| 411 | 412 |
| 412 // Columns don't apply to svg text elements. | 413 // Columns don't apply to svg text elements. |
| 413 if (isSVGTextElement(*element)) | 414 if (isSVGTextElement(*element)) |
| 414 style.clearMultiCol(); | 415 style.clearMultiCol(); |
| 415 } | 416 } |
| 416 adjustStyleForAlignment(style, parentStyle); | 417 adjustStyleForAlignment(style, parentStyle); |
| 417 } | 418 } |
| 418 | 419 |
| 419 } // namespace blink | 420 } // namespace blink |
| OLD | NEW |