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

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

Issue 2100013002: Implement the new text-size-adjust CSS property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup convertTextSizeAdjust and add a test that better covers it Created 4 years, 5 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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 case CSSPropertyColumnRuleColor: return 526; 556 case CSSPropertyColumnRuleColor: return 526;
557 case CSSPropertyColumnRuleStyle: return 527; 557 case CSSPropertyColumnRuleStyle: return 527;
558 case CSSPropertyColumnRuleWidth: return 528; 558 case CSSPropertyColumnRuleWidth: return 528;
559 case CSSPropertyColumnSpan: return 529; 559 case CSSPropertyColumnSpan: return 529;
560 case CSSPropertyColumnWidth: return 530; 560 case CSSPropertyColumnWidth: return 530;
561 case CSSPropertyColumns: return 531; 561 case CSSPropertyColumns: return 531;
562 case CSSPropertyApplyAtRule: return 532; 562 case CSSPropertyApplyAtRule: return 532;
563 case CSSPropertyFontVariantCaps: return 533; 563 case CSSPropertyFontVariantCaps: return 533;
564 case CSSPropertyHyphens: return 534; 564 case CSSPropertyHyphens: return 534;
565 case CSSPropertyFontVariantNumeric: return 535; 565 case CSSPropertyFontVariantNumeric: return 535;
566 566 case CSSPropertyTextSizeAdjust: return 536;
567 case CSSPropertyAliasWebkitTextSizeAdjust: return 537;
ymalik 2016/07/12 14:40:56 Did you miss running histograms.xml after? I was a
567 568
568 // 1. Add new features above this line (don't change the assigned numbers of the existing 569 // 1. Add new features above this line (don't change the assigned numbers of the existing
569 // items). 570 // items).
570 // 2. Update maximumCSSSampleId() with the new maximum value. 571 // 2. Update maximumCSSSampleId() with the new maximum value.
571 // 3. Run the update_use_counter_css.py script in 572 // 3. Run the update_use_counter_css.py script in
572 // chromium/src/tools/metrics/histograms to update the UMA histogram names. 573 // chromium/src/tools/metrics/histograms to update the UMA histogram names.
573 574
574 case CSSPropertyInvalid: 575 case CSSPropertyInvalid:
575 ASSERT_NOT_REACHED(); 576 ASSERT_NOT_REACHED();
576 return 0; 577 return 0;
577 } 578 }
578 579
579 ASSERT_NOT_REACHED(); 580 ASSERT_NOT_REACHED();
580 return 0; 581 return 0;
581 } 582 }
582 583
583 584
584 static int maximumCSSSampleId() { return 535; } 585 static int maximumCSSSampleId() { return 537; }
585 586
586 static EnumerationHistogram& featureObserverHistogram() 587 static EnumerationHistogram& featureObserverHistogram()
587 { 588 {
588 DEFINE_STATIC_LOCAL(EnumerationHistogram, histogram, ("WebCore.FeatureObserv er", UseCounter::NumberOfFeatures)); 589 DEFINE_STATIC_LOCAL(EnumerationHistogram, histogram, ("WebCore.FeatureObserv er", UseCounter::NumberOfFeatures));
589 return histogram; 590 return histogram;
590 } 591 }
591 592
592 void UseCounter::muteForInspector() 593 void UseCounter::muteForInspector()
593 { 594 {
594 UseCounter::m_muteCount++; 595 UseCounter::m_muteCount++;
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 777 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
777 { 778 {
778 // FIXME: We may want to handle stylesheets that have multiple owners 779 // FIXME: We may want to handle stylesheets that have multiple owners
779 // https://crbug.com/242125 780 // https://crbug.com/242125
780 if (sheetContents && sheetContents->hasSingleOwnerNode()) 781 if (sheetContents && sheetContents->hasSingleOwnerNode())
781 return getFrom(sheetContents->singleOwnerDocument()); 782 return getFrom(sheetContents->singleOwnerDocument());
782 return 0; 783 return 0;
783 } 784 }
784 785
785 } // namespace blink 786 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698