| 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 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 791 item->isImageValue()) { | 791 item->isImageValue()) { |
| 792 nextContent = | 792 nextContent = |
| 793 ContentData::create(state.styleImage(CSSPropertyContent, *item)); | 793 ContentData::create(state.styleImage(CSSPropertyContent, *item)); |
| 794 } else if (item->isCounterValue()) { | 794 } else if (item->isCounterValue()) { |
| 795 const CSSCounterValue* counterValue = toCSSCounterValue(item.get()); | 795 const CSSCounterValue* counterValue = toCSSCounterValue(item.get()); |
| 796 EListStyleType listStyleType = EListStyleType::NoneListStyle; | 796 EListStyleType listStyleType = EListStyleType::NoneListStyle; |
| 797 CSSValueID listStyleIdent = counterValue->listStyle(); | 797 CSSValueID listStyleIdent = counterValue->listStyle(); |
| 798 if (listStyleIdent != CSSValueNone) | 798 if (listStyleIdent != CSSValueNone) |
| 799 listStyleType = | 799 listStyleType = |
| 800 static_cast<EListStyleType>(listStyleIdent - CSSValueDisc); | 800 static_cast<EListStyleType>(listStyleIdent - CSSValueDisc); |
| 801 std::unique_ptr<CounterContent> counter = wrapUnique(new CounterContent( | 801 std::unique_ptr<CounterContent> counter = |
| 802 AtomicString(counterValue->identifier()), listStyleType, | 802 WTF::wrapUnique(new CounterContent( |
| 803 AtomicString(counterValue->separator()))); | 803 AtomicString(counterValue->identifier()), listStyleType, |
| 804 AtomicString(counterValue->separator()))); |
| 804 nextContent = ContentData::create(std::move(counter)); | 805 nextContent = ContentData::create(std::move(counter)); |
| 805 } else if (item->isIdentifierValue()) { | 806 } else if (item->isIdentifierValue()) { |
| 806 QuoteType quoteType; | 807 QuoteType quoteType; |
| 807 switch (toCSSIdentifierValue(*item).getValueID()) { | 808 switch (toCSSIdentifierValue(*item).getValueID()) { |
| 808 default: | 809 default: |
| 809 NOTREACHED(); | 810 NOTREACHED(); |
| 810 case CSSValueOpenQuote: | 811 case CSSValueOpenQuote: |
| 811 quoteType = OPEN_QUOTE; | 812 quoteType = OPEN_QUOTE; |
| 812 break; | 813 break; |
| 813 case CSSValueCloseQuote: | 814 case CSSValueCloseQuote: |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1067 state.style()->setCaretColor( | 1068 state.style()->setCaretColor( |
| 1068 StyleBuilderConverter::convertStyleAutoColor(state, value)); | 1069 StyleBuilderConverter::convertStyleAutoColor(state, value)); |
| 1069 } | 1070 } |
| 1070 if (state.applyPropertyToVisitedLinkStyle()) { | 1071 if (state.applyPropertyToVisitedLinkStyle()) { |
| 1071 state.style()->setVisitedLinkCaretColor( | 1072 state.style()->setVisitedLinkCaretColor( |
| 1072 StyleBuilderConverter::convertStyleAutoColor(state, value, true)); | 1073 StyleBuilderConverter::convertStyleAutoColor(state, value, true)); |
| 1073 } | 1074 } |
| 1074 } | 1075 } |
| 1075 | 1076 |
| 1076 } // namespace blink | 1077 } // namespace blink |
| OLD | NEW |