| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. |
| 7 * All rights reserved. | 7 * All rights reserved. |
| 8 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 8 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 9 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 9 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 10 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 10 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 state.style()->setTextAlign(state.parentStyle()->isLeftToRightDirection() | 479 state.style()->setTextAlign(state.parentStyle()->isLeftToRightDirection() |
| 480 ? ETextAlign::kLeft | 480 ? ETextAlign::kLeft |
| 481 : ETextAlign::kRight); | 481 : ETextAlign::kRight); |
| 482 } else if (state.parentStyle()->textAlign() == ETextAlign::kEnd) { | 482 } else if (state.parentStyle()->textAlign() == ETextAlign::kEnd) { |
| 483 state.style()->setTextAlign(state.parentStyle()->isLeftToRightDirection() | 483 state.style()->setTextAlign(state.parentStyle()->isLeftToRightDirection() |
| 484 ? ETextAlign::kRight | 484 ? ETextAlign::kRight |
| 485 : ETextAlign::kLeft); | 485 : ETextAlign::kLeft); |
| 486 } else { | 486 } else { |
| 487 state.style()->setTextAlign(state.parentStyle()->textAlign()); | 487 state.style()->setTextAlign(state.parentStyle()->textAlign()); |
| 488 } | 488 } |
| 489 state.style()->setTextAlignIsInherited(false); |
| 489 } | 490 } |
| 490 | 491 |
| 491 void StyleBuilderFunctions::applyInheritCSSPropertyTextIndent( | 492 void StyleBuilderFunctions::applyInheritCSSPropertyTextIndent( |
| 492 StyleResolverState& state) { | 493 StyleResolverState& state) { |
| 493 state.style()->setTextIndent(state.parentStyle()->textIndent()); | 494 state.style()->setTextIndent(state.parentStyle()->textIndent()); |
| 494 state.style()->setTextIndentLine(state.parentStyle()->getTextIndentLine()); | 495 state.style()->setTextIndentLine(state.parentStyle()->getTextIndentLine()); |
| 495 state.style()->setTextIndentType(state.parentStyle()->getTextIndentType()); | 496 state.style()->setTextIndentType(state.parentStyle()->getTextIndentType()); |
| 496 } | 497 } |
| 497 | 498 |
| 498 void StyleBuilderFunctions::applyInitialCSSPropertyTextIndent( | 499 void StyleBuilderFunctions::applyInitialCSSPropertyTextIndent( |
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1029 state.style()->setCaretColor( | 1030 state.style()->setCaretColor( |
| 1030 StyleBuilderConverter::convertStyleAutoColor(state, value)); | 1031 StyleBuilderConverter::convertStyleAutoColor(state, value)); |
| 1031 } | 1032 } |
| 1032 if (state.applyPropertyToVisitedLinkStyle()) { | 1033 if (state.applyPropertyToVisitedLinkStyle()) { |
| 1033 state.style()->setVisitedLinkCaretColor( | 1034 state.style()->setVisitedLinkCaretColor( |
| 1034 StyleBuilderConverter::convertStyleAutoColor(state, value, true)); | 1035 StyleBuilderConverter::convertStyleAutoColor(state, value, true)); |
| 1035 } | 1036 } |
| 1036 } | 1037 } |
| 1037 | 1038 |
| 1038 } // namespace blink | 1039 } // namespace blink |
| OLD | NEW |