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

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

Issue 23465021: Revert 157745 "Add support for the object-position CSS property." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 3 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 /* 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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 case CSSPropertyAnimationDirection: return 426; 488 case CSSPropertyAnimationDirection: return 426;
489 case CSSPropertyAnimationDuration: return 427; 489 case CSSPropertyAnimationDuration: return 427;
490 case CSSPropertyAnimationFillMode: return 428; 490 case CSSPropertyAnimationFillMode: return 428;
491 case CSSPropertyAnimationIterationCount: return 429; 491 case CSSPropertyAnimationIterationCount: return 429;
492 case CSSPropertyAnimationName: return 430; 492 case CSSPropertyAnimationName: return 430;
493 case CSSPropertyAnimationPlayState: return 431; 493 case CSSPropertyAnimationPlayState: return 431;
494 case CSSPropertyAnimationTimingFunction: return 432; 494 case CSSPropertyAnimationTimingFunction: return 432;
495 case CSSPropertyObjectFit: return 433; 495 case CSSPropertyObjectFit: return 433;
496 case CSSPropertyPaintOrder: return 434; 496 case CSSPropertyPaintOrder: return 434;
497 case CSSPropertyMaskSourceType: return 435; 497 case CSSPropertyMaskSourceType: return 435;
498 case CSSPropertyObjectPosition: return 436;
499 498
500 // Add new features above this line (don't change the assigned numbers of th e existing 499 // Add new features above this line (don't change the assigned numbers of th e existing
501 // items) and update maximumCSSSampleId() with the new maximum value. 500 // items) and update maximumCSSSampleId() with the new maximum value.
502 501
503 case CSSPropertyInvalid: 502 case CSSPropertyInvalid:
504 case CSSPropertyVariable: 503 case CSSPropertyVariable:
505 ASSERT_NOT_REACHED(); 504 ASSERT_NOT_REACHED();
506 return 0; 505 return 0;
507 } 506 }
508 507
509 ASSERT_NOT_REACHED(); 508 ASSERT_NOT_REACHED();
510 return 0; 509 return 0;
511 } 510 }
512 511
513 static int maximumCSSSampleId() { return 436; } 512 static int maximumCSSSampleId() { return 434; }
514 513
515 UseCounter::UseCounter() 514 UseCounter::UseCounter()
516 { 515 {
517 m_CSSFeatureBits.ensureSize(lastCSSProperty + 1); 516 m_CSSFeatureBits.ensureSize(lastCSSProperty + 1);
518 m_CSSFeatureBits.clearAll(); 517 m_CSSFeatureBits.clearAll();
519 } 518 }
520 519
521 UseCounter::~UseCounter() 520 UseCounter::~UseCounter()
522 { 521 {
523 // We always log PageDestruction so that we have a scale for the rest of the features. 522 // We always log PageDestruction so that we have a scale for the rest of the features.
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 706 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
708 { 707 {
709 // FIXME: We may want to handle stylesheets that have multiple owners 708 // FIXME: We may want to handle stylesheets that have multiple owners
710 // http://crbug.com/242125 709 // http://crbug.com/242125
711 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode()) 710 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode())
712 return getFrom(sheetContents->singleOwnerDocument()); 711 return getFrom(sheetContents->singleOwnerDocument());
713 return 0; 712 return 0;
714 } 713 }
715 714
716 } // namespace WebCore 715 } // namespace WebCore
OLDNEW
« no previous file with comments | « trunk/Source/core/page/RuntimeCSSEnabled.cpp ('k') | trunk/Source/core/page/animation/CSSPropertyAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698