| 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.
All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
| (...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 ContentData* nextContent = nullptr; | 676 ContentData* nextContent = nullptr; |
| 677 if (item->isImageGeneratorValue() || item->isImageSetValue() || item->is
ImageValue()) { | 677 if (item->isImageGeneratorValue() || item->isImageSetValue() || item->is
ImageValue()) { |
| 678 nextContent = ContentData::create(state.styleImage(CSSPropertyConten
t, *item)); | 678 nextContent = ContentData::create(state.styleImage(CSSPropertyConten
t, *item)); |
| 679 } else if (item->isCounterValue()) { | 679 } else if (item->isCounterValue()) { |
| 680 CSSCounterValue* counterValue = toCSSCounterValue(item.get()); | 680 CSSCounterValue* counterValue = toCSSCounterValue(item.get()); |
| 681 EListStyleType listStyleType = NoneListStyle; | 681 EListStyleType listStyleType = NoneListStyle; |
| 682 CSSValueID listStyleIdent = counterValue->listStyle(); | 682 CSSValueID listStyleIdent = counterValue->listStyle(); |
| 683 if (listStyleIdent != CSSValueNone) | 683 if (listStyleIdent != CSSValueNone) |
| 684 listStyleType = static_cast<EListStyleType>(listStyleIdent - CSS
ValueDisc); | 684 listStyleType = static_cast<EListStyleType>(listStyleIdent - CSS
ValueDisc); |
| 685 OwnPtr<CounterContent> counter = adoptPtr(new CounterContent(AtomicS
tring(counterValue->identifier()), listStyleType, AtomicString(counterValue->sep
arator()))); | 685 OwnPtr<CounterContent> counter = adoptPtr(new CounterContent(AtomicS
tring(counterValue->identifier()), listStyleType, AtomicString(counterValue->sep
arator()))); |
| 686 nextContent = ContentData::create(counter.release()); | 686 nextContent = ContentData::create(std::move(counter)); |
| 687 } else if (item->isPrimitiveValue()) { | 687 } else if (item->isPrimitiveValue()) { |
| 688 QuoteType quoteType; | 688 QuoteType quoteType; |
| 689 switch (toCSSPrimitiveValue(*item).getValueID()) { | 689 switch (toCSSPrimitiveValue(*item).getValueID()) { |
| 690 default: | 690 default: |
| 691 ASSERT_NOT_REACHED(); | 691 ASSERT_NOT_REACHED(); |
| 692 case CSSValueOpenQuote: | 692 case CSSValueOpenQuote: |
| 693 quoteType = OPEN_QUOTE; | 693 quoteType = OPEN_QUOTE; |
| 694 break; | 694 break; |
| 695 case CSSValueCloseQuote: | 695 case CSSValueCloseQuote: |
| 696 quoteType = CLOSE_QUOTE; | 696 quoteType = CLOSE_QUOTE; |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 } | 846 } |
| 847 } | 847 } |
| 848 | 848 |
| 849 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState&
state) | 849 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState&
state) |
| 850 { | 850 { |
| 851 if (!state.parentNode()->isDocumentNode()) | 851 if (!state.parentNode()->isDocumentNode()) |
| 852 state.style()->setPosition(state.parentStyle()->position()); | 852 state.style()->setPosition(state.parentStyle()->position()); |
| 853 } | 853 } |
| 854 | 854 |
| 855 } // namespace blink | 855 } // namespace blink |
| OLD | NEW |