Index: Source/core/css/CSSComputedStyleDeclaration.cpp |
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp |
index ee703d108e29d60f646e6deb6f933e59a52cb1b5..c1d62e4721f4e252afc50ca47f4d9f57f1e119fb 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 |
@@ -146,6 +147,10 @@ static const CSSPropertyID staticComputableProperties[] = { |
CSSPropertyMaxWidth, |
CSSPropertyMinHeight, |
CSSPropertyMinWidth, |
+ CSSPropertyNavDown, |
+ CSSPropertyNavLeft, |
+ CSSPropertyNavRight, |
+ CSSPropertyNavUp, |
CSSPropertyMixBlendMode, |
CSSPropertyOpacity, |
CSSPropertyOrphans, |
@@ -1421,6 +1426,15 @@ static PassRefPtr<CSSValue> counterToCSSValue(const RenderStyle* style, CSSPrope |
return list.release(); |
} |
+static PassRefPtr<CSSValue> navDirectionToCSSValue(const StyleNavigationValue& navValue) |
+{ |
+ 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, ()); |
@@ -2064,6 +2078,14 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert |
return zoomAdjustedPixelValueForLength(marginLeft, style.get()); |
return zoomAdjustedPixelValue(toRenderBox(renderer)->marginLeft(), style.get()); |
} |
+ case CSSPropertyNavDown: |
+ return navDirectionToCSSValue(style->navDown()); |
+ case CSSPropertyNavLeft: |
+ return navDirectionToCSSValue(style->navLeft()); |
+ case CSSPropertyNavRight: |
+ return navDirectionToCSSValue(style->navRight()); |
+ case CSSPropertyNavUp: |
+ return navDirectionToCSSValue(style->navUp()); |
case CSSPropertyWebkitMarqueeDirection: |
return cssValuePool().createValue(style->marqueeDirection()); |
case CSSPropertyWebkitMarqueeIncrement: |