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

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

Issue 1429713004: Implement CSS font-display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 case CSSPropertyRotate: return 505; 540 case CSSPropertyRotate: return 505;
541 case CSSPropertyScale: return 506; 541 case CSSPropertyScale: return 506;
542 case CSSPropertyImageOrientation: return 507; 542 case CSSPropertyImageOrientation: return 507;
543 case CSSPropertyBackdropFilter: return 508; 543 case CSSPropertyBackdropFilter: return 508;
544 case CSSPropertyTextCombineUpright: return 509; 544 case CSSPropertyTextCombineUpright: return 509;
545 case CSSPropertyTextOrientation: return 510; 545 case CSSPropertyTextOrientation: return 510;
546 case CSSPropertyGridColumnGap: return 511; 546 case CSSPropertyGridColumnGap: return 511;
547 case CSSPropertyGridRowGap: return 512; 547 case CSSPropertyGridRowGap: return 512;
548 case CSSPropertyGridGap: return 513; 548 case CSSPropertyGridGap: return 513;
549 case CSSPropertyFontFeatureSettings: return 514; 549 case CSSPropertyFontFeatureSettings: return 514;
550 case CSSPropertyFontDisplay: return 515;
550 551
551 // 1. Add new features above this line (don't change the assigned numbers of the existing 552 // 1. Add new features above this line (don't change the assigned numbers of the existing
552 // items). 553 // items).
553 // 2. Update maximumCSSSampleId() with the new maximum value. 554 // 2. Update maximumCSSSampleId() with the new maximum value.
554 // 3. Run the update_use_counter_css.py script in 555 // 3. Run the update_use_counter_css.py script in
555 // chromium/src/tools/metrics/histograms to update the UMA histogram names. 556 // chromium/src/tools/metrics/histograms to update the UMA histogram names.
556 557
557 case CSSPropertyInvalid: 558 case CSSPropertyInvalid:
558 ASSERT_NOT_REACHED(); 559 ASSERT_NOT_REACHED();
559 return 0; 560 return 0;
560 } 561 }
561 562
562 ASSERT_NOT_REACHED(); 563 ASSERT_NOT_REACHED();
563 return 0; 564 return 0;
564 } 565 }
565 566
566 static int maximumCSSSampleId() { return 514; } 567 static int maximumCSSSampleId() { return 515; }
567 568
568 void UseCounter::muteForInspector() 569 void UseCounter::muteForInspector()
569 { 570 {
570 UseCounter::m_muteCount++; 571 UseCounter::m_muteCount++;
571 } 572 }
572 573
573 void UseCounter::unmuteForInspector() 574 void UseCounter::unmuteForInspector()
574 { 575 {
575 UseCounter::m_muteCount--; 576 UseCounter::m_muteCount--;
576 } 577 }
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 979 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
979 { 980 {
980 // FIXME: We may want to handle stylesheets that have multiple owners 981 // FIXME: We may want to handle stylesheets that have multiple owners
981 // https://crbug.com/242125 982 // https://crbug.com/242125
982 if (sheetContents && sheetContents->hasSingleOwnerNode()) 983 if (sheetContents && sheetContents->hasSingleOwnerNode())
983 return getFrom(sheetContents->singleOwnerDocument()); 984 return getFrom(sheetContents->singleOwnerDocument());
984 return 0; 985 return 0;
985 } 986 }
986 987
987 } // namespace blink 988 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698