Chromium Code Reviews| Index: Source/core/css/CSSComputedStyleDeclaration.cpp |
| diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp |
| index 64defa56deadd233156d5206a76a7e3b2f516fb8..7c9b6e9586a8c4cf7064fbc86ef80d6ebb128388 100644 |
| --- a/Source/core/css/CSSComputedStyleDeclaration.cpp |
| +++ b/Source/core/css/CSSComputedStyleDeclaration.cpp |
| @@ -4,6 +4,7 @@ |
| * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| * Copyright (C) 2011 Sencha, Inc. All rights reserved. |
| + * Copyright (C) 2013 Opera Software ASA. All rights reserved. |
| * |
| * This library is free software; you can redistribute it and/or |
| * modify it under the terms of the GNU Lesser General Public |
| @@ -145,6 +146,10 @@ static const CSSPropertyID staticComputableProperties[] = { |
| CSSPropertyMaxWidth, |
| CSSPropertyMinHeight, |
| CSSPropertyMinWidth, |
| + CSSPropertyNavDown, |
| + CSSPropertyNavLeft, |
| + CSSPropertyNavRight, |
| + CSSPropertyNavUp, |
| CSSPropertyMixBlendMode, |
| CSSPropertyOpacity, |
| CSSPropertyOrphans, |
| @@ -1407,6 +1412,15 @@ static PassRefPtr<CSSValue> counterToCSSValue(const RenderStyle* style, CSSPrope |
| return list.release(); |
| } |
| +static PassRefPtr<CSSValue> navDirToCSSValue(const StyleNavigationValue& navValue) |
|
esprehn
2013/06/20 19:45:10
navDirectionToCSSValue
Krzysztof Olczyk
2013/07/22 14:14:16
Done.
|
| +{ |
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); |
| + list->append(cssValuePool().createValue(navValue.id().string(), CSSPrimitiveValue::CSS_STRING)); |
| + list->append(cssValuePool().createValue(navValue.target().string(), CSSPrimitiveValue::CSS_STRING)); |
| + |
| + return list.release(); |
| +} |
| + |
| static void logUnimplementedPropertyID(CSSPropertyID propertyID) |
| { |
| DEFINE_STATIC_LOCAL(HashSet<CSSPropertyID>, propertyIDSet, ()); |
| @@ -2032,6 +2046,14 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert |
| return zoomAdjustedPixelValueForLength(marginLeft, style.get()); |
| return zoomAdjustedPixelValue(toRenderBox(renderer)->marginLeft(), style.get()); |
| } |
| + case CSSPropertyNavDown: |
| + return navDirToCSSValue(style->navDown()); |
| + case CSSPropertyNavLeft: |
| + return navDirToCSSValue(style->navLeft()); |
| + case CSSPropertyNavRight: |
| + return navDirToCSSValue(style->navRight()); |
| + case CSSPropertyNavUp: |
| + return navDirToCSSValue(style->navUp()); |
| case CSSPropertyWebkitMarqueeDirection: |
| return cssValuePool().createValue(style->marqueeDirection()); |
| case CSSPropertyWebkitMarqueeIncrement: |