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 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 670 Vector<CSSPropertyID> willChangeProperties; | 670 Vector<CSSPropertyID> willChangeProperties; |
| 671 | 671 |
| 672 for (auto& willChangeValue : toCSSValueList(*value)) { | 672 for (auto& willChangeValue : toCSSValueList(*value)) { |
| 673 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(willChangeValue. get()); | 673 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(willChangeValue. get()); |
| 674 if (primitiveValue->isPropertyID()) | 674 if (primitiveValue->isPropertyID()) |
| 675 willChangeProperties.append(primitiveValue->getPropertyID()); | 675 willChangeProperties.append(primitiveValue->getPropertyID()); |
| 676 else if (primitiveValue->getValueID() == CSSValueContents) | 676 else if (primitiveValue->getValueID() == CSSValueContents) |
| 677 willChangeContents = true; | 677 willChangeContents = true; |
| 678 else if (primitiveValue->getValueID() == CSSValueScrollPosition) | 678 else if (primitiveValue->getValueID() == CSSValueScrollPosition) |
| 679 willChangeScrollPosition = true; | 679 willChangeScrollPosition = true; |
| 680 else | 680 else if (primitiveValue->getValueID() != CSSValueAuto) |
|
alancutter (OOO until 2018)
2015/09/11 07:53:49
It's weird to be changing behaviour in a refactor
| |
| 681 ASSERT_NOT_REACHED(); | 681 ASSERT_NOT_REACHED(); |
| 682 } | 682 } |
| 683 state.style()->setWillChangeContents(willChangeContents); | 683 state.style()->setWillChangeContents(willChangeContents); |
| 684 state.style()->setWillChangeScrollPosition(willChangeScrollPosition); | 684 state.style()->setWillChangeScrollPosition(willChangeScrollPosition); |
| 685 state.style()->setWillChangeProperties(willChangeProperties); | 685 state.style()->setWillChangeProperties(willChangeProperties); |
| 686 state.style()->setSubtreeWillChangeContents(willChangeContents || state.pare ntStyle()->subtreeWillChangeContents()); | 686 state.style()->setSubtreeWillChangeContents(willChangeContents || state.pare ntStyle()->subtreeWillChangeContents()); |
| 687 } | 687 } |
| 688 | 688 |
| 689 void StyleBuilderFunctions::applyInitialCSSPropertyContent(StyleResolverState& s tate) | 689 void StyleBuilderFunctions::applyInitialCSSPropertyContent(StyleResolverState& s tate) |
| 690 { | 690 { |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 844 return; | 844 return; |
| 845 case CSSValueSuper: | 845 case CSSValueSuper: |
| 846 svgStyle.setBaselineShift(BS_SUPER); | 846 svgStyle.setBaselineShift(BS_SUPER); |
| 847 return; | 847 return; |
| 848 default: | 848 default: |
| 849 ASSERT_NOT_REACHED(); | 849 ASSERT_NOT_REACHED(); |
| 850 } | 850 } |
| 851 } | 851 } |
| 852 | 852 |
| 853 } // namespace blink | 853 } // namespace blink |
| OLD | NEW |