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 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 state.Style()->SetTextAlign(state.ParentStyle()->IsLeftToRightDirection() | 447 state.Style()->SetTextAlign(state.ParentStyle()->IsLeftToRightDirection() |
448 ? ETextAlign::kLeft | 448 ? ETextAlign::kLeft |
449 : ETextAlign::kRight); | 449 : ETextAlign::kRight); |
450 } else if (state.ParentStyle()->GetTextAlign() == ETextAlign::kEnd) { | 450 } else if (state.ParentStyle()->GetTextAlign() == ETextAlign::kEnd) { |
451 state.Style()->SetTextAlign(state.ParentStyle()->IsLeftToRightDirection() | 451 state.Style()->SetTextAlign(state.ParentStyle()->IsLeftToRightDirection() |
452 ? ETextAlign::kRight | 452 ? ETextAlign::kRight |
453 : ETextAlign::kLeft); | 453 : ETextAlign::kLeft); |
454 } else { | 454 } else { |
455 state.Style()->SetTextAlign(state.ParentStyle()->GetTextAlign()); | 455 state.Style()->SetTextAlign(state.ParentStyle()->GetTextAlign()); |
456 } | 456 } |
457 state.Style()->SetTextAlignIsInherited(false); | |
458 } | 457 } |
459 | 458 |
460 void StyleBuilderFunctions::applyInheritCSSPropertyTextIndent( | 459 void StyleBuilderFunctions::applyInheritCSSPropertyTextIndent( |
461 StyleResolverState& state) { | 460 StyleResolverState& state) { |
462 state.Style()->SetTextIndent(state.ParentStyle()->TextIndent()); | 461 state.Style()->SetTextIndent(state.ParentStyle()->TextIndent()); |
463 state.Style()->SetTextIndentLine(state.ParentStyle()->GetTextIndentLine()); | 462 state.Style()->SetTextIndentLine(state.ParentStyle()->GetTextIndentLine()); |
464 state.Style()->SetTextIndentType(state.ParentStyle()->GetTextIndentType()); | 463 state.Style()->SetTextIndentType(state.ParentStyle()->GetTextIndentType()); |
465 } | 464 } |
466 | 465 |
467 void StyleBuilderFunctions::applyInitialCSSPropertyTextIndent( | 466 void StyleBuilderFunctions::applyInitialCSSPropertyTextIndent( |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
988 state.Style()->SetCaretColor( | 987 state.Style()->SetCaretColor( |
989 StyleBuilderConverter::ConvertStyleAutoColor(state, value)); | 988 StyleBuilderConverter::ConvertStyleAutoColor(state, value)); |
990 } | 989 } |
991 if (state.ApplyPropertyToVisitedLinkStyle()) { | 990 if (state.ApplyPropertyToVisitedLinkStyle()) { |
992 state.Style()->SetVisitedLinkCaretColor( | 991 state.Style()->SetVisitedLinkCaretColor( |
993 StyleBuilderConverter::ConvertStyleAutoColor(state, value, true)); | 992 StyleBuilderConverter::ConvertStyleAutoColor(state, value, true)); |
994 } | 993 } |
995 } | 994 } |
996 | 995 |
997 } // namespace blink | 996 } // namespace blink |
OLD | NEW |