Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: third_party/WebKit/WebCore/css/CSSComputedStyleDeclaration.cpp

Issue 39293: WebKit merge 41447:41498 [third_party/WebKit] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove CRLF Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 list->append(propertyValue); 1243 list->append(propertyValue);
1244 } 1244 }
1245 } else 1245 } else
1246 list->append(CSSPrimitiveValue::createIdentifier(CSSValueAll)); 1246 list->append(CSSPrimitiveValue::createIdentifier(CSSValueAll));
1247 return list.release(); 1247 return list.release();
1248 } 1248 }
1249 case CSSPropertyWebkitTransitionTimingFunction: 1249 case CSSPropertyWebkitTransitionTimingFunction:
1250 return getTimingFunctionValue(style->transitions()); 1250 return getTimingFunctionValue(style->transitions());
1251 case CSSPropertyPointerEvents: 1251 case CSSPropertyPointerEvents:
1252 return CSSPrimitiveValue::create(style->pointerEvents()); 1252 return CSSPrimitiveValue::create(style->pointerEvents());
1253
1254 /* Shorthand properties, currently not supported see bug 13658*/
1253 case CSSPropertyBackground: 1255 case CSSPropertyBackground:
1254 case CSSPropertyBorder: 1256 case CSSPropertyBorder:
1255 case CSSPropertyBorderBottom: 1257 case CSSPropertyBorderBottom:
1256 case CSSPropertyBorderColor: 1258 case CSSPropertyBorderColor:
1257 case CSSPropertyBorderLeft: 1259 case CSSPropertyBorderLeft:
1258 case CSSPropertyBorderRight: 1260 case CSSPropertyBorderRight:
1259 case CSSPropertyBorderStyle: 1261 case CSSPropertyBorderStyle:
1260 case CSSPropertyBorderTop: 1262 case CSSPropertyBorderTop:
1261 case CSSPropertyBorderWidth: 1263 case CSSPropertyBorderWidth:
1262 case CSSPropertyContent:
1263 case CSSPropertyCounterIncrement:
1264 case CSSPropertyCounterReset:
1265 case CSSPropertyFont: 1264 case CSSPropertyFont:
1266 case CSSPropertyFontStretch:
1267 case CSSPropertyListStyle: 1265 case CSSPropertyListStyle:
1268 case CSSPropertyMargin: 1266 case CSSPropertyMargin:
1269 case CSSPropertyOutline:
1270 case CSSPropertyOutlineOffset:
1271 case CSSPropertyPadding: 1267 case CSSPropertyPadding:
1272 case CSSPropertyPage: 1268 break;
1273 case CSSPropertyQuotes: 1269
1274 case CSSPropertyScrollbar3dlightColor: 1270 /* Unimplemented CSS 3 properties (including CSS3 shorthand properties) */
1275 case CSSPropertyScrollbarArrowColor:
1276 case CSSPropertyScrollbarDarkshadowColor:
1277 case CSSPropertyScrollbarFaceColor:
1278 case CSSPropertyScrollbarHighlightColor:
1279 case CSSPropertyScrollbarShadowColor:
1280 case CSSPropertyScrollbarTrackColor:
1281 case CSSPropertySrc: // Only used in @font-face rules.
1282 case CSSPropertySize:
1283 case CSSPropertyTextLineThrough: 1271 case CSSPropertyTextLineThrough:
1284 case CSSPropertyTextLineThroughColor: 1272 case CSSPropertyTextLineThroughColor:
1285 case CSSPropertyTextLineThroughMode: 1273 case CSSPropertyTextLineThroughMode:
1286 case CSSPropertyTextLineThroughStyle: 1274 case CSSPropertyTextLineThroughStyle:
1287 case CSSPropertyTextLineThroughWidth: 1275 case CSSPropertyTextLineThroughWidth:
1288 case CSSPropertyTextOverflow: 1276 case CSSPropertyTextOverflow:
1289 case CSSPropertyTextOverline: 1277 case CSSPropertyTextOverline:
1290 case CSSPropertyTextOverlineColor: 1278 case CSSPropertyTextOverlineColor:
1291 case CSSPropertyTextOverlineMode: 1279 case CSSPropertyTextOverlineMode:
1292 case CSSPropertyTextOverlineStyle: 1280 case CSSPropertyTextOverlineStyle:
1293 case CSSPropertyTextOverlineWidth: 1281 case CSSPropertyTextOverlineWidth:
1294 case CSSPropertyTextUnderline: 1282 case CSSPropertyTextUnderline:
1295 case CSSPropertyTextUnderlineColor: 1283 case CSSPropertyTextUnderlineColor:
1296 case CSSPropertyTextUnderlineMode: 1284 case CSSPropertyTextUnderlineMode:
1297 case CSSPropertyTextUnderlineStyle: 1285 case CSSPropertyTextUnderlineStyle:
1298 case CSSPropertyTextUnderlineWidth: 1286 case CSSPropertyTextUnderlineWidth:
1299 case CSSPropertyUnicodeRange: // Only used in @font-face rules. 1287 break;
1288
1289 /* Unimplemented @font-face properties */
1290 case CSSPropertyFontStretch:
1291 case CSSPropertySrc:
1292 case CSSPropertyUnicodeRange:
1293 break;
1294
1295 /* Other unimplemented properties */
1296 case CSSPropertyContent: // FIXME: needs implementation, bug 23668
1297 case CSSPropertyCounterIncrement:
1298 case CSSPropertyCounterReset:
1299 case CSSPropertyOutline: // FIXME: needs implementation
1300 case CSSPropertyOutlineOffset: // FIXME: needs implementation
1301 case CSSPropertyPage: // for @page
1302 case CSSPropertyQuotes: // FIXME: needs implementation
1303 case CSSPropertySize: // for @page
1304 break;
1305
1306 /* Unimplemented -webkit- properties */
1300 case CSSPropertyWebkitAnimation: 1307 case CSSPropertyWebkitAnimation:
1301 case CSSPropertyWebkitBorderRadius: 1308 case CSSPropertyWebkitBorderRadius:
1302 case CSSPropertyWebkitColumns: 1309 case CSSPropertyWebkitColumns:
1303 case CSSPropertyWebkitColumnRule: 1310 case CSSPropertyWebkitColumnRule:
1304 case CSSPropertyWebkitMarginCollapse: 1311 case CSSPropertyWebkitMarginCollapse:
1305 case CSSPropertyWebkitMarginStart: 1312 case CSSPropertyWebkitMarginStart:
1306 case CSSPropertyWebkitMarquee: 1313 case CSSPropertyWebkitMarquee:
1307 case CSSPropertyWebkitMarqueeSpeed: 1314 case CSSPropertyWebkitMarqueeSpeed:
1308 case CSSPropertyWebkitMask: 1315 case CSSPropertyWebkitMask:
1309 case CSSPropertyWebkitPaddingStart: 1316 case CSSPropertyWebkitPaddingStart:
1310 case CSSPropertyWebkitTextStroke: 1317 case CSSPropertyWebkitTextStroke:
1311 case CSSPropertyWebkitTransition: 1318 case CSSPropertyWebkitTransition:
1312 case CSSPropertyWebkitVariableDeclarationBlock: 1319 case CSSPropertyWebkitVariableDeclarationBlock:
1313 // FIXME: The above are unimplemented.
1314 break; 1320 break;
1315 #if ENABLE(SVG) 1321 #if ENABLE(SVG)
1316 // FIXME: This default case ruins the point of using an enum for 1322 // FIXME: This default case ruins the point of using an enum for
1317 // properties -- it prevents us from getting a warning when we 1323 // properties -- it prevents us from getting a warning when we
1318 // forget to list a property above. 1324 // forget to list a property above.
1319 default: 1325 default:
1320 return getSVGPropertyCSSValue(propertyID, DoNotUpdateLayout); 1326 return getSVGPropertyCSSValue(propertyID, DoNotUpdateLayout);
1321 #endif 1327 #endif
1322 } 1328 }
1323 1329
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1429 return copyPropertiesInSet(computedProperties, numComputedProperties); 1435 return copyPropertiesInSet(computedProperties, numComputedProperties);
1430 } 1436 }
1431 1437
1432 PassRefPtr<CSSMutableStyleDeclaration> CSSComputedStyleDeclaration::makeMutable( ) 1438 PassRefPtr<CSSMutableStyleDeclaration> CSSComputedStyleDeclaration::makeMutable( )
1433 { 1439 {
1434 return copy(); 1440 return copy();
1435 } 1441 }
1436 1442
1437 } // namespace WebCore 1443 } // namespace WebCore
1438 1444
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/bindings/scripts/CodeGeneratorJS.pm ('k') | third_party/WebKit/WebCore/css/CSSParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698