| 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 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 463 // FIXME: We should just make this a converter | 463 // FIXME: We should just make this a converter |
| 464 TransformOperations operations; | 464 TransformOperations operations; |
| 465 TransformBuilder::createTransformOperations(*value, state.cssToLengthConvers
ionData(), operations); | 465 TransformBuilder::createTransformOperations(*value, state.cssToLengthConvers
ionData(), operations); |
| 466 state.style()->setTransform(operations); | 466 state.style()->setTransform(operations); |
| 467 } | 467 } |
| 468 | 468 |
| 469 void StyleBuilderFunctions::applyInheritCSSPropertyVerticalAlign(StyleResolverSt
ate& state) | 469 void StyleBuilderFunctions::applyInheritCSSPropertyVerticalAlign(StyleResolverSt
ate& state) |
| 470 { | 470 { |
| 471 EVerticalAlign verticalAlign = state.parentStyle()->verticalAlign(); | 471 EVerticalAlign verticalAlign = state.parentStyle()->verticalAlign(); |
| 472 state.style()->setVerticalAlign(verticalAlign); | 472 state.style()->setVerticalAlign(verticalAlign); |
| 473 if (verticalAlign == LENGTH) | 473 if (verticalAlign == VerticalAlignLength) |
| 474 state.style()->setVerticalAlignLength(state.parentStyle()->verticalAlign
Length()); | 474 state.style()->setVerticalAlignLength(state.parentStyle()->getVerticalAl
ignLength()); |
| 475 } | 475 } |
| 476 | 476 |
| 477 void StyleBuilderFunctions::applyValueCSSPropertyVerticalAlign(StyleResolverStat
e& state, CSSValue* value) | 477 void StyleBuilderFunctions::applyValueCSSPropertyVerticalAlign(StyleResolverStat
e& state, CSSValue* value) |
| 478 { | 478 { |
| 479 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); | 479 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
| 480 | 480 |
| 481 if (primitiveValue->getValueID()) | 481 if (primitiveValue->getValueID()) |
| 482 state.style()->setVerticalAlign(primitiveValue->convertTo<EVerticalAlign
>()); | 482 state.style()->setVerticalAlign(primitiveValue->convertTo<EVerticalAlign
>()); |
| 483 else | 483 else |
| 484 state.style()->setVerticalAlignLength(primitiveValue->convertToLength(st
ate.cssToLengthConversionData())); | 484 state.style()->setVerticalAlignLength(primitiveValue->convertToLength(st
ate.cssToLengthConversionData())); |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 842 } | 842 } |
| 843 } | 843 } |
| 844 | 844 |
| 845 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState&
state) | 845 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState&
state) |
| 846 { | 846 { |
| 847 if (!state.parentNode()->isDocumentNode()) | 847 if (!state.parentNode()->isDocumentNode()) |
| 848 state.style()->setPosition(state.parentStyle()->position()); | 848 state.style()->setPosition(state.parentStyle()->position()); |
| 849 } | 849 } |
| 850 | 850 |
| 851 } // namespace blink | 851 } // namespace blink |
| OLD | NEW |