| 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 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 prevContent = nextContent; | 747 prevContent = nextContent; |
| 748 } | 748 } |
| 749 DCHECK(firstContent); | 749 DCHECK(firstContent); |
| 750 state.style()->setContent(firstContent); | 750 state.style()->setContent(firstContent); |
| 751 } | 751 } |
| 752 | 752 |
| 753 void StyleBuilderFunctions::applyValueCSSPropertyWebkitLocale(StyleResolverState
& state, const CSSValue& value) | 753 void StyleBuilderFunctions::applyValueCSSPropertyWebkitLocale(StyleResolverState
& state, const CSSValue& value) |
| 754 { | 754 { |
| 755 if (value.isPrimitiveValue()) { | 755 if (value.isPrimitiveValue()) { |
| 756 DCHECK_EQ(toCSSPrimitiveValue(value).getValueID(), CSSValueAuto); | 756 DCHECK_EQ(toCSSPrimitiveValue(value).getValueID(), CSSValueAuto); |
| 757 state.fontBuilder().setLocale(nullAtom); | 757 state.fontBuilder().setLocale(nullptr); |
| 758 } else { | 758 } else { |
| 759 state.fontBuilder().setLocale(AtomicString(toCSSStringValue(value).value
())); | 759 state.fontBuilder().setLocale(LayoutLocale::get(AtomicString(toCSSString
Value(value).value()))); |
| 760 } | 760 } |
| 761 } | 761 } |
| 762 | 762 |
| 763 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitAppRegion(StyleResolver
State&) | 763 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitAppRegion(StyleResolver
State&) |
| 764 { | 764 { |
| 765 } | 765 } |
| 766 | 766 |
| 767 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitAppRegion(StyleResolver
State&) | 767 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitAppRegion(StyleResolver
State&) |
| 768 { | 768 { |
| 769 } | 769 } |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 } | 858 } |
| 859 } | 859 } |
| 860 | 860 |
| 861 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState&
state) | 861 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState&
state) |
| 862 { | 862 { |
| 863 if (!state.parentNode()->isDocumentNode()) | 863 if (!state.parentNode()->isDocumentNode()) |
| 864 state.style()->setPosition(state.parentStyle()->position()); | 864 state.style()->setPosition(state.parentStyle()->position()); |
| 865 } | 865 } |
| 866 | 866 |
| 867 } // namespace blink | 867 } // namespace blink |
| OLD | NEW |