Chromium Code Reviews| 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 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 650 } | 650 } |
| 651 | 651 |
| 652 void StyleBuilderFunctions::applyInheritCSSPropertyContent(StyleResolverState&) | 652 void StyleBuilderFunctions::applyInheritCSSPropertyContent(StyleResolverState&) |
| 653 { | 653 { |
| 654 // FIXME: In CSS3, it will be possible to inherit content. In CSS2 it is not . This | 654 // FIXME: In CSS3, it will be possible to inherit content. In CSS2 it is not . This |
| 655 // note is a reminder that eventually "inherit" needs to be supported. | 655 // note is a reminder that eventually "inherit" needs to be supported. |
| 656 } | 656 } |
| 657 | 657 |
| 658 void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& sta te, CSSValue* value) | 658 void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& sta te, CSSValue* value) |
| 659 { | 659 { |
| 660 if (value->isPrimitiveValue()) { | |
| 661 if (toCSSPrimitiveValue(*value).getValueID() == CSSValueNormal) { | |
|
Timothy Loh
2016/03/24 04:38:41
should be an assert instead since if we get here t
nainar
2016/03/29 00:56:39
Done.
| |
| 662 state.style()->clearContent(); | |
| 663 return; | |
| 664 } | |
| 665 } | |
| 660 // list of string, uri, counter, attr, i | 666 // list of string, uri, counter, attr, i |
| 661 | 667 |
| 662 bool didSet = false; | 668 bool didSet = false; |
| 663 for (auto& item : toCSSValueList(*value)) { | 669 for (auto& item : toCSSValueList(*value)) { |
| 664 if (item->isImageGeneratorValue()) { | 670 if (item->isImageGeneratorValue()) { |
| 665 state.style()->setContent(StyleGeneratedImage::create(toCSSImageGene ratorValue(*item)), didSet); | 671 state.style()->setContent(StyleGeneratedImage::create(toCSSImageGene ratorValue(*item)), didSet); |
| 666 didSet = true; | 672 didSet = true; |
| 667 } else if (item->isImageSetValue()) { | 673 } else if (item->isImageSetValue()) { |
| 668 state.style()->setContent(state.elementStyleResources().setOrPending FromValue(CSSPropertyContent, toCSSImageSetValue(*item)), didSet); | 674 state.style()->setContent(state.elementStyleResources().setOrPending FromValue(CSSPropertyContent, toCSSImageSetValue(*item)), didSet); |
| 669 didSet = true; | 675 didSet = true; |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 842 } | 848 } |
| 843 } | 849 } |
| 844 | 850 |
| 845 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState& state) | 851 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState& state) |
| 846 { | 852 { |
| 847 if (!state.parentNode()->isDocumentNode()) | 853 if (!state.parentNode()->isDocumentNode()) |
| 848 state.style()->setPosition(state.parentStyle()->position()); | 854 state.style()->setPosition(state.parentStyle()->position()); |
| 849 } | 855 } |
| 850 | 856 |
| 851 } // namespace blink | 857 } // namespace blink |
| OLD | NEW |