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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/core/page/UseCounter.cpp

Issue 17836006: Merge 153078 "Unprefix Flexbox" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1547/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « Source/core/html/shadow/TextFieldDecorationElement.cpp ('k') | Source/core/page/animation/CSSPropertyAnimation.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google, Inc. All rights reserved. 2 * Copyright (C) 2012 Google, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 case CSSPropertyWebkitColumnRuleWidth: return 224; 275 case CSSPropertyWebkitColumnRuleWidth: return 224;
276 case CSSPropertyWebkitColumnSpan: return 225; 276 case CSSPropertyWebkitColumnSpan: return 225;
277 case CSSPropertyWebkitColumnWidth: return 226; 277 case CSSPropertyWebkitColumnWidth: return 226;
278 case CSSPropertyWebkitColumns: return 227; 278 case CSSPropertyWebkitColumns: return 227;
279 #if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK 279 #if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK
280 case CSSPropertyWebkitBoxDecorationBreak: return 228; 280 case CSSPropertyWebkitBoxDecorationBreak: return 228;
281 #endif 281 #endif
282 #if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS 282 #if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS
283 case CSSPropertyWebkitFilter: return 229; 283 case CSSPropertyWebkitFilter: return 229;
284 #endif 284 #endif
285 case CSSPropertyWebkitAlignContent: return 230; 285 case CSSPropertyAlignContent: return 230;
286 case CSSPropertyWebkitAlignItems: return 231; 286 case CSSPropertyAlignItems: return 231;
287 case CSSPropertyWebkitAlignSelf: return 232; 287 case CSSPropertyAlignSelf: return 232;
288 case CSSPropertyWebkitFlex: return 233; 288 case CSSPropertyFlex: return 233;
289 case CSSPropertyWebkitFlexBasis: return 234; 289 case CSSPropertyFlexBasis: return 234;
290 case CSSPropertyWebkitFlexDirection: return 235; 290 case CSSPropertyFlexDirection: return 235;
291 case CSSPropertyWebkitFlexFlow: return 236; 291 case CSSPropertyFlexFlow: return 236;
292 case CSSPropertyWebkitFlexGrow: return 237; 292 case CSSPropertyFlexGrow: return 237;
293 case CSSPropertyWebkitFlexShrink: return 238; 293 case CSSPropertyFlexShrink: return 238;
294 case CSSPropertyWebkitFlexWrap: return 239; 294 case CSSPropertyFlexWrap: return 239;
295 case CSSPropertyWebkitJustifyContent: return 240; 295 case CSSPropertyJustifyContent: return 240;
296 case CSSPropertyWebkitFontSizeDelta: return 241; 296 case CSSPropertyWebkitFontSizeDelta: return 241;
297 case CSSPropertyGridColumns: return 242; 297 case CSSPropertyGridColumns: return 242;
298 case CSSPropertyGridRows: return 243; 298 case CSSPropertyGridRows: return 243;
299 case CSSPropertyGridStart: return 244; 299 case CSSPropertyGridStart: return 244;
300 case CSSPropertyGridEnd: return 245; 300 case CSSPropertyGridEnd: return 245;
301 case CSSPropertyGridBefore: return 246; 301 case CSSPropertyGridBefore: return 246;
302 case CSSPropertyGridAfter: return 247; 302 case CSSPropertyGridAfter: return 247;
303 case CSSPropertyGridColumn: return 248; 303 case CSSPropertyGridColumn: return 248;
304 case CSSPropertyGridRow: return 249; 304 case CSSPropertyGridRow: return 249;
305 case CSSPropertyGridAutoFlow: return 250; 305 case CSSPropertyGridAutoFlow: return 250;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 case CSSPropertyWebkitMaskPositionY: return 293; 348 case CSSPropertyWebkitMaskPositionY: return 293;
349 case CSSPropertyWebkitMaskRepeat: return 294; 349 case CSSPropertyWebkitMaskRepeat: return 294;
350 case CSSPropertyWebkitMaskRepeatX: return 295; 350 case CSSPropertyWebkitMaskRepeatX: return 295;
351 case CSSPropertyWebkitMaskRepeatY: return 296; 351 case CSSPropertyWebkitMaskRepeatY: return 296;
352 case CSSPropertyWebkitMaskSize: return 297; 352 case CSSPropertyWebkitMaskSize: return 297;
353 case CSSPropertyWebkitMaxLogicalWidth: return 298; 353 case CSSPropertyWebkitMaxLogicalWidth: return 298;
354 case CSSPropertyWebkitMaxLogicalHeight: return 299; 354 case CSSPropertyWebkitMaxLogicalHeight: return 299;
355 case CSSPropertyWebkitMinLogicalWidth: return 300; 355 case CSSPropertyWebkitMinLogicalWidth: return 300;
356 case CSSPropertyWebkitMinLogicalHeight: return 301; 356 case CSSPropertyWebkitMinLogicalHeight: return 301;
357 // WebkitNbspMode has been deleted, was return 302; 357 // WebkitNbspMode has been deleted, was return 302;
358 case CSSPropertyWebkitOrder: return 303; 358 case CSSPropertyOrder: return 303;
359 case CSSPropertyWebkitPaddingAfter: return 304; 359 case CSSPropertyWebkitPaddingAfter: return 304;
360 case CSSPropertyWebkitPaddingBefore: return 305; 360 case CSSPropertyWebkitPaddingBefore: return 305;
361 case CSSPropertyWebkitPaddingEnd: return 306; 361 case CSSPropertyWebkitPaddingEnd: return 306;
362 case CSSPropertyWebkitPaddingStart: return 307; 362 case CSSPropertyWebkitPaddingStart: return 307;
363 case CSSPropertyWebkitPerspective: return 308; 363 case CSSPropertyWebkitPerspective: return 308;
364 case CSSPropertyWebkitPerspectiveOrigin: return 309; 364 case CSSPropertyWebkitPerspectiveOrigin: return 309;
365 case CSSPropertyWebkitPerspectiveOriginX: return 310; 365 case CSSPropertyWebkitPerspectiveOriginX: return 310;
366 case CSSPropertyWebkitPerspectiveOriginY: return 311; 366 case CSSPropertyWebkitPerspectiveOriginY: return 311;
367 case CSSPropertyWebkitPrintColorAdjust: return 312; 367 case CSSPropertyWebkitPrintColorAdjust: return 312;
368 case CSSPropertyWebkitRtlOrdering: return 313; 368 case CSSPropertyWebkitRtlOrdering: return 313;
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 671 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
672 { 672 {
673 // FIXME: We may want to handle stylesheets that have multiple owners 673 // FIXME: We may want to handle stylesheets that have multiple owners
674 // http://crbug.com/242125 674 // http://crbug.com/242125
675 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode()) 675 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode())
676 return getFrom(sheetContents->singleOwnerDocument()); 676 return getFrom(sheetContents->singleOwnerDocument());
677 return 0; 677 return 0;
678 } 678 }
679 679
680 } // namespace WebCore 680 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/shadow/TextFieldDecorationElement.cpp ('k') | Source/core/page/animation/CSSPropertyAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698