OLD | NEW |
---|---|
1 | 1 |
2 /* | 2 /* |
3 * Copyright (C) 2012 Google, Inc. All rights reserved. | 3 * Copyright (C) 2012 Google, Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
459 // CSSPropertyImageOrientation has been removed, was return 397; | 459 // CSSPropertyImageOrientation has been removed, was return 397; |
460 // CSSPropertyImageResolution has been removed, was return 398; | 460 // CSSPropertyImageResolution has been removed, was return 398; |
461 #if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING | 461 #if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING |
462 case CSSPropertyWebkitBlendMode: return 399; | 462 case CSSPropertyWebkitBlendMode: return 399; |
463 case CSSPropertyWebkitBackgroundBlendMode: return 400; | 463 case CSSPropertyWebkitBackgroundBlendMode: return 400; |
464 #endif | 464 #endif |
465 case CSSPropertyTextDecorationLine: return 401; | 465 case CSSPropertyTextDecorationLine: return 401; |
466 case CSSPropertyTextDecorationStyle: return 402; | 466 case CSSPropertyTextDecorationStyle: return 402; |
467 case CSSPropertyTextDecorationColor: return 403; | 467 case CSSPropertyTextDecorationColor: return 403; |
468 #if defined(ENABLE_CSS3_TEXT) && ENABLE_CSS3_TEXT | 468 #if defined(ENABLE_CSS3_TEXT) && ENABLE_CSS3_TEXT |
469 case CSSPropertyWebkitTextAlignLast: return 404; | |
470 case CSSPropertyWebkitTextUnderlinePosition: return 405; | 469 case CSSPropertyWebkitTextUnderlinePosition: return 405; |
471 #endif | 470 #endif |
472 case CSSPropertyMaxZoom: return 406; | 471 case CSSPropertyMaxZoom: return 406; |
473 case CSSPropertyMinZoom: return 407; | 472 case CSSPropertyMinZoom: return 407; |
474 case CSSPropertyOrientation: return 408; | 473 case CSSPropertyOrientation: return 408; |
475 case CSSPropertyUserZoom: return 409; | 474 case CSSPropertyUserZoom: return 409; |
476 #if defined(ENABLE_DASHBOARD_SUPPORT) && ENABLE_DASHBOARD_SUPPORT | 475 #if defined(ENABLE_DASHBOARD_SUPPORT) && ENABLE_DASHBOARD_SUPPORT |
477 case CSSPropertyWebkitDashboardRegion: return 410; | 476 case CSSPropertyWebkitDashboardRegion: return 410; |
478 #endif | 477 #endif |
479 // CSSPropertyWebkitOverflowScrolling was 411. | 478 // CSSPropertyWebkitOverflowScrolling was 411. |
480 case CSSPropertyWebkitAppRegion: return 412; | 479 case CSSPropertyWebkitAppRegion: return 412; |
481 case CSSPropertyWebkitFilter: return 413; | 480 case CSSPropertyWebkitFilter: return 413; |
482 case CSSPropertyWebkitBoxDecorationBreak: return 414; | 481 case CSSPropertyWebkitBoxDecorationBreak: return 414; |
483 case CSSPropertyWebkitTapHighlightColor: return 415; | 482 case CSSPropertyWebkitTapHighlightColor: return 415; |
484 case CSSPropertyBufferedRendering: return 416; | 483 case CSSPropertyBufferedRendering: return 416; |
485 case CSSPropertyGridAutoRows: return 417; | 484 case CSSPropertyGridAutoRows: return 417; |
486 case CSSPropertyGridAutoColumns: return 418; | 485 case CSSPropertyGridAutoColumns: return 418; |
487 case CSSPropertyBackgroundBlendMode: return 419; | 486 case CSSPropertyBackgroundBlendMode: return 419; |
488 case CSSPropertyMixBlendMode: return 420; | 487 case CSSPropertyMixBlendMode: return 420; |
489 case CSSPropertyTouchAction: return 421; | 488 case CSSPropertyTouchAction: return 421; |
490 case CSSPropertyGridArea: return 422; | 489 case CSSPropertyGridArea: return 422; |
490 case CSSPropertyTextAlignLast: return 423; | |
Julien - ping for review
2013/07/12 00:18:00
That's wrong, you shouldn't be changing the return
dw.im
2013/07/12 00:21:04
I've done this as a patch set #2 just before you l
| |
491 | |
491 | 492 |
492 // Add new features above this line (don't change the assigned numbers of th e existing | 493 // Add new features above this line (don't change the assigned numbers of th e existing |
493 // items) and update maximumCSSSampleId() with the new maximum value. | 494 // items) and update maximumCSSSampleId() with the new maximum value. |
494 | 495 |
495 case CSSPropertyInvalid: | 496 case CSSPropertyInvalid: |
496 case CSSPropertyVariable: | 497 case CSSPropertyVariable: |
497 ASSERT_NOT_REACHED(); | 498 ASSERT_NOT_REACHED(); |
498 return 0; | 499 return 0; |
499 } | 500 } |
500 | 501 |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
674 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) | 675 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) |
675 { | 676 { |
676 // FIXME: We may want to handle stylesheets that have multiple owners | 677 // FIXME: We may want to handle stylesheets that have multiple owners |
677 // http://crbug.com/242125 | 678 // http://crbug.com/242125 |
678 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode()) | 679 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode()) |
679 return getFrom(sheetContents->singleOwnerDocument()); | 680 return getFrom(sheetContents->singleOwnerDocument()); |
680 return 0; | 681 return 0; |
681 } | 682 } |
682 | 683 |
683 } // namespace WebCore | 684 } // namespace WebCore |
OLD | NEW |