Chromium Code Reviews| 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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 478 case CSSPropertyWebkitBoxDecorationBreak: return 414; | 478 case CSSPropertyWebkitBoxDecorationBreak: return 414; |
| 479 case CSSPropertyWebkitTapHighlightColor: return 415; | 479 case CSSPropertyWebkitTapHighlightColor: return 415; |
| 480 case CSSPropertyBufferedRendering: return 416; | 480 case CSSPropertyBufferedRendering: return 416; |
| 481 case CSSPropertyGridAutoRows: return 417; | 481 case CSSPropertyGridAutoRows: return 417; |
| 482 case CSSPropertyGridAutoColumns: return 418; | 482 case CSSPropertyGridAutoColumns: return 418; |
| 483 case CSSPropertyBackgroundBlendMode: return 419; | 483 case CSSPropertyBackgroundBlendMode: return 419; |
| 484 case CSSPropertyMixBlendMode: return 420; | 484 case CSSPropertyMixBlendMode: return 420; |
| 485 case CSSPropertyTouchAction: return 421; | 485 case CSSPropertyTouchAction: return 421; |
| 486 case CSSPropertyGridArea: return 422; | 486 case CSSPropertyGridArea: return 422; |
| 487 case CSSPropertyGridTemplate: return 423; | 487 case CSSPropertyGridTemplate: return 423; |
| 488 case CSSPropertyAnimation: return 424; | |
| 489 case CSSPropertyAnimationDelay: return 425; | |
| 490 case CSSPropertyAnimationDirection: return 426; | |
| 491 case CSSPropertyAnimationDuration: return 427; | |
| 492 case CSSPropertyAnimationFillMode: return 428; | |
| 493 case CSSPropertyAnimationIterationCount: return 429; | |
| 494 case CSSPropertyAnimationName: return 430; | |
| 495 case CSSPropertyAnimationPlayState: return 431; | |
| 496 case CSSPropertyAnimationTimingFunction: return 432; | |
|
eseidel
2013/08/13 17:49:15
This isn't error prone at all. :p
darktears
2013/08/13 18:08:54
:D
| |
| 488 | 497 |
| 489 // Add new features above this line (don't change the assigned numbers of th e existing | 498 // Add new features above this line (don't change the assigned numbers of th e existing |
| 490 // items) and update maximumCSSSampleId() with the new maximum value. | 499 // items) and update maximumCSSSampleId() with the new maximum value. |
| 491 | 500 |
| 492 case CSSPropertyInvalid: | 501 case CSSPropertyInvalid: |
| 493 case CSSPropertyVariable: | 502 case CSSPropertyVariable: |
| 494 ASSERT_NOT_REACHED(); | 503 ASSERT_NOT_REACHED(); |
| 495 return 0; | 504 return 0; |
| 496 } | 505 } |
| 497 | 506 |
| 498 ASSERT_NOT_REACHED(); | 507 ASSERT_NOT_REACHED(); |
| 499 return 0; | 508 return 0; |
| 500 } | 509 } |
| 501 | 510 |
| 502 static int maximumCSSSampleId() { return 423; } | 511 static int maximumCSSSampleId() { return 432; } |
| 503 | 512 |
| 504 UseCounter::UseCounter() | 513 UseCounter::UseCounter() |
| 505 { | 514 { |
| 506 m_CSSFeatureBits.ensureSize(lastCSSProperty + 1); | 515 m_CSSFeatureBits.ensureSize(lastCSSProperty + 1); |
| 507 m_CSSFeatureBits.clearAll(); | 516 m_CSSFeatureBits.clearAll(); |
| 508 } | 517 } |
| 509 | 518 |
| 510 UseCounter::~UseCounter() | 519 UseCounter::~UseCounter() |
| 511 { | 520 { |
| 512 // We always log PageDestruction so that we have a scale for the rest of the features. | 521 // We always log PageDestruction so that we have a scale for the rest of the features. |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 690 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) | 699 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) |
| 691 { | 700 { |
| 692 // FIXME: We may want to handle stylesheets that have multiple owners | 701 // FIXME: We may want to handle stylesheets that have multiple owners |
| 693 // http://crbug.com/242125 | 702 // http://crbug.com/242125 |
| 694 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode()) | 703 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode()) |
| 695 return getFrom(sheetContents->singleOwnerDocument()); | 704 return getFrom(sheetContents->singleOwnerDocument()); |
| 696 return 0; | 705 return 0; |
| 697 } | 706 } |
| 698 | 707 |
| 699 } // namespace WebCore | 708 } // namespace WebCore |
| OLD | NEW |