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

Side by Side Diff: third_party/WebKit/Source/core/frame/UseCounter.cpp

Issue 1710003002: Unprefix multicol properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase master Created 4 years, 10 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
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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 case CSSPropertyWebkitBoxLines: return 207; 250 case CSSPropertyWebkitBoxLines: return 207;
251 case CSSPropertyWebkitBoxOrdinalGroup: return 208; 251 case CSSPropertyWebkitBoxOrdinalGroup: return 208;
252 case CSSPropertyWebkitBoxOrient: return 209; 252 case CSSPropertyWebkitBoxOrient: return 209;
253 case CSSPropertyWebkitBoxPack: return 210; 253 case CSSPropertyWebkitBoxPack: return 210;
254 case CSSPropertyWebkitBoxReflect: return 211; 254 case CSSPropertyWebkitBoxReflect: return 211;
255 case CSSPropertyAliasWebkitBoxShadow: return 212; 255 case CSSPropertyAliasWebkitBoxShadow: return 212;
256 // CSSPropertyWebkitColumnAxis was 214 256 // CSSPropertyWebkitColumnAxis was 214
257 case CSSPropertyWebkitColumnBreakAfter: return 215; 257 case CSSPropertyWebkitColumnBreakAfter: return 215;
258 case CSSPropertyWebkitColumnBreakBefore: return 216; 258 case CSSPropertyWebkitColumnBreakBefore: return 216;
259 case CSSPropertyWebkitColumnBreakInside: return 217; 259 case CSSPropertyWebkitColumnBreakInside: return 217;
260 case CSSPropertyWebkitColumnCount: return 218; 260 case CSSPropertyAliasWebkitColumnCount: return 218;
261 case CSSPropertyWebkitColumnGap: return 219; 261 case CSSPropertyAliasWebkitColumnGap: return 219;
262 // CSSPropertyWebkitColumnProgression was 220 262 // CSSPropertyWebkitColumnProgression was 220
263 case CSSPropertyWebkitColumnRule: return 221; 263 case CSSPropertyAliasWebkitColumnRule: return 221;
264 case CSSPropertyWebkitColumnRuleColor: return 222; 264 case CSSPropertyAliasWebkitColumnRuleColor: return 222;
265 case CSSPropertyWebkitColumnRuleStyle: return 223; 265 case CSSPropertyAliasWebkitColumnRuleStyle: return 223;
266 case CSSPropertyWebkitColumnRuleWidth: return 224; 266 case CSSPropertyAliasWebkitColumnRuleWidth: return 224;
267 case CSSPropertyWebkitColumnSpan: return 225; 267 case CSSPropertyAliasWebkitColumnSpan: return 225;
268 case CSSPropertyWebkitColumnWidth: return 226; 268 case CSSPropertyAliasWebkitColumnWidth: return 226;
269 case CSSPropertyWebkitColumns: return 227; 269 case CSSPropertyAliasWebkitColumns: return 227;
270 // 228 was CSSPropertyWebkitBoxDecorationBreak (duplicated due to #ifdef). 270 // 228 was CSSPropertyWebkitBoxDecorationBreak (duplicated due to #ifdef).
271 // 229 was CSSPropertyWebkitFilter (duplicated due to #ifdef). 271 // 229 was CSSPropertyWebkitFilter (duplicated due to #ifdef).
272 case CSSPropertyAlignContent: return 230; 272 case CSSPropertyAlignContent: return 230;
273 case CSSPropertyAlignItems: return 231; 273 case CSSPropertyAlignItems: return 231;
274 case CSSPropertyAlignSelf: return 232; 274 case CSSPropertyAlignSelf: return 232;
275 case CSSPropertyFlex: return 233; 275 case CSSPropertyFlex: return 233;
276 case CSSPropertyFlexBasis: return 234; 276 case CSSPropertyFlexBasis: return 234;
277 case CSSPropertyFlexDirection: return 235; 277 case CSSPropertyFlexDirection: return 235;
278 case CSSPropertyFlexFlow: return 236; 278 case CSSPropertyFlexFlow: return 236;
279 case CSSPropertyFlexGrow: return 237; 279 case CSSPropertyFlexGrow: return 237;
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 case CSSPropertyGridGap: return 513; 548 case CSSPropertyGridGap: return 513;
549 case CSSPropertyFontFeatureSettings: return 514; 549 case CSSPropertyFontFeatureSettings: return 514;
550 case CSSPropertyVariable: return 515; 550 case CSSPropertyVariable: return 515;
551 case CSSPropertyFontDisplay: return 516; 551 case CSSPropertyFontDisplay: return 516;
552 case CSSPropertyContain: return 517; 552 case CSSPropertyContain: return 517;
553 case CSSPropertyD: return 518; 553 case CSSPropertyD: return 518;
554 case CSSPropertySnapHeight: return 519; 554 case CSSPropertySnapHeight: return 519;
555 case CSSPropertyBreakAfter: return 520; 555 case CSSPropertyBreakAfter: return 520;
556 case CSSPropertyBreakBefore: return 521; 556 case CSSPropertyBreakBefore: return 521;
557 case CSSPropertyBreakInside: return 522; 557 case CSSPropertyBreakInside: return 522;
558 case CSSPropertyColumnCount: return 523;
559 case CSSPropertyColumnGap: return 524;
560 case CSSPropertyColumnRule: return 525;
561 case CSSPropertyColumnRuleColor: return 526;
562 case CSSPropertyColumnRuleStyle: return 527;
563 case CSSPropertyColumnRuleWidth: return 528;
564 case CSSPropertyColumnSpan: return 529;
565 case CSSPropertyColumnWidth: return 530;
566 case CSSPropertyColumns: return 531;
558 567
559 // 1. Add new features above this line (don't change the assigned numbers of the existing 568 // 1. Add new features above this line (don't change the assigned numbers of the existing
560 // items). 569 // items).
561 // 2. Update maximumCSSSampleId() with the new maximum value. 570 // 2. Update maximumCSSSampleId() with the new maximum value.
562 // 3. Run the update_use_counter_css.py script in 571 // 3. Run the update_use_counter_css.py script in
563 // chromium/src/tools/metrics/histograms to update the UMA histogram names. 572 // chromium/src/tools/metrics/histograms to update the UMA histogram names.
564 573
565 case CSSPropertyInvalid: 574 case CSSPropertyInvalid:
566 ASSERT_NOT_REACHED(); 575 ASSERT_NOT_REACHED();
567 return 0; 576 return 0;
568 } 577 }
569 578
570 ASSERT_NOT_REACHED(); 579 ASSERT_NOT_REACHED();
571 return 0; 580 return 0;
572 } 581 }
573 582
574 static int maximumCSSSampleId() { return 522; } 583 static int maximumCSSSampleId() { return 531; }
575 584
576 static EnumerationHistogram& featureObserverHistogram() 585 static EnumerationHistogram& featureObserverHistogram()
577 { 586 {
578 DEFINE_STATIC_LOCAL(EnumerationHistogram, histogram, ("WebCore.FeatureObserv er", UseCounter::NumberOfFeatures)); 587 DEFINE_STATIC_LOCAL(EnumerationHistogram, histogram, ("WebCore.FeatureObserv er", UseCounter::NumberOfFeatures));
579 return histogram; 588 return histogram;
580 } 589 }
581 590
582 void UseCounter::muteForInspector() 591 void UseCounter::muteForInspector()
583 { 592 {
584 UseCounter::m_muteCount++; 593 UseCounter::m_muteCount++;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 759 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
751 { 760 {
752 // FIXME: We may want to handle stylesheets that have multiple owners 761 // FIXME: We may want to handle stylesheets that have multiple owners
753 // https://crbug.com/242125 762 // https://crbug.com/242125
754 if (sheetContents && sheetContents->hasSingleOwnerNode()) 763 if (sheetContents && sheetContents->hasSingleOwnerNode())
755 return getFrom(sheetContents->singleOwnerDocument()); 764 return getFrom(sheetContents->singleOwnerDocument());
756 return 0; 765 return 0;
757 } 766 }
758 767
759 } // namespace blink 768 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698