| 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 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 state.Style()->SetTextEmphasisFill(value.ConvertTo<TextEmphasisFill>()); | 606 state.Style()->SetTextEmphasisFill(value.ConvertTo<TextEmphasisFill>()); |
| 607 else | 607 else |
| 608 state.Style()->SetTextEmphasisMark(value.ConvertTo<TextEmphasisMark>()); | 608 state.Style()->SetTextEmphasisMark(value.ConvertTo<TextEmphasisMark>()); |
| 609 } | 609 } |
| 610 state.Style()->SetTextEmphasisCustomMark(g_null_atom); | 610 state.Style()->SetTextEmphasisCustomMark(g_null_atom); |
| 611 return; | 611 return; |
| 612 } | 612 } |
| 613 | 613 |
| 614 if (value.IsStringValue()) { | 614 if (value.IsStringValue()) { |
| 615 state.Style()->SetTextEmphasisFill(TextEmphasisFill::kFilled); | 615 state.Style()->SetTextEmphasisFill(TextEmphasisFill::kFilled); |
| 616 state.Style()->SetTextEmphasisMark(kTextEmphasisMarkCustom); | 616 state.Style()->SetTextEmphasisMark(TextEmphasisMark::kCustom); |
| 617 state.Style()->SetTextEmphasisCustomMark( | 617 state.Style()->SetTextEmphasisCustomMark( |
| 618 AtomicString(ToCSSStringValue(value).Value())); | 618 AtomicString(ToCSSStringValue(value).Value())); |
| 619 return; | 619 return; |
| 620 } | 620 } |
| 621 | 621 |
| 622 const CSSIdentifierValue& identifier_value = ToCSSIdentifierValue(value); | 622 const CSSIdentifierValue& identifier_value = ToCSSIdentifierValue(value); |
| 623 | 623 |
| 624 state.Style()->SetTextEmphasisCustomMark(g_null_atom); | 624 state.Style()->SetTextEmphasisCustomMark(g_null_atom); |
| 625 | 625 |
| 626 if (identifier_value.GetValueID() == CSSValueFilled || | 626 if (identifier_value.GetValueID() == CSSValueFilled || |
| 627 identifier_value.GetValueID() == CSSValueOpen) { | 627 identifier_value.GetValueID() == CSSValueOpen) { |
| 628 state.Style()->SetTextEmphasisFill( | 628 state.Style()->SetTextEmphasisFill( |
| 629 identifier_value.ConvertTo<TextEmphasisFill>()); | 629 identifier_value.ConvertTo<TextEmphasisFill>()); |
| 630 state.Style()->SetTextEmphasisMark(kTextEmphasisMarkAuto); | 630 state.Style()->SetTextEmphasisMark(TextEmphasisMark::kAuto); |
| 631 } else { | 631 } else { |
| 632 state.Style()->SetTextEmphasisFill(TextEmphasisFill::kFilled); | 632 state.Style()->SetTextEmphasisFill(TextEmphasisFill::kFilled); |
| 633 state.Style()->SetTextEmphasisMark( | 633 state.Style()->SetTextEmphasisMark( |
| 634 identifier_value.ConvertTo<TextEmphasisMark>()); | 634 identifier_value.ConvertTo<TextEmphasisMark>()); |
| 635 } | 635 } |
| 636 } | 636 } |
| 637 | 637 |
| 638 void StyleBuilderFunctions::applyInitialCSSPropertyWillChange( | 638 void StyleBuilderFunctions::applyInitialCSSPropertyWillChange( |
| 639 StyleResolverState& state) { | 639 StyleResolverState& state) { |
| 640 state.Style()->SetWillChangeContents(false); | 640 state.Style()->SetWillChangeContents(false); |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 987 state.Style()->SetCaretColor( | 987 state.Style()->SetCaretColor( |
| 988 StyleBuilderConverter::ConvertStyleAutoColor(state, value)); | 988 StyleBuilderConverter::ConvertStyleAutoColor(state, value)); |
| 989 } | 989 } |
| 990 if (state.ApplyPropertyToVisitedLinkStyle()) { | 990 if (state.ApplyPropertyToVisitedLinkStyle()) { |
| 991 state.Style()->SetVisitedLinkCaretColor( | 991 state.Style()->SetVisitedLinkCaretColor( |
| 992 StyleBuilderConverter::ConvertStyleAutoColor(state, value, true)); | 992 StyleBuilderConverter::ConvertStyleAutoColor(state, value, true)); |
| 993 } | 993 } |
| 994 } | 994 } |
| 995 | 995 |
| 996 } // namespace blink | 996 } // namespace blink |
| OLD | NEW |