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

Side by Side Diff: Source/core/frame/UseCounter.h

Issue 684783003: Resolve enum value collision on UseCounter.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 CSSXGetComputedStyleQueries = 566, 537 CSSXGetComputedStyleQueries = 566,
538 SVG1DOM = 567, 538 SVG1DOM = 567,
539 SVGPathSegDOM = 568, 539 SVGPathSegDOM = 568,
540 SVGTransformListConsolidate = 569, 540 SVGTransformListConsolidate = 569,
541 SVGAnimatedTransformListBaseVal = 570, 541 SVGAnimatedTransformListBaseVal = 570,
542 QuotedAnimationName = 571, 542 QuotedAnimationName = 571,
543 QuotedKeyframesRule = 572, 543 QuotedKeyframesRule = 572,
544 SrcsetDroppedCandidate = 573, 544 SrcsetDroppedCandidate = 573,
545 RenderRuby = 574, 545 RenderRuby = 574,
546 546
547 WindowPostMessage = 574, 547 WindowPostMessage = 575,
sof 2014/10/28 10:37:07 It would have been "more correct" to move RenderRu
548 WindowPostMessageWithLegacyTargetOriginArgument = 575, 548 WindowPostMessageWithLegacyTargetOriginArgument = 576,
549 549
550 // Add new features immediately above this line. Don't change assigned 550 // Add new features immediately above this line. Don't change assigned
551 // numbers of any item, and don't reuse removed slots. 551 // numbers of any item, and don't reuse removed slots.
552 // Also, run update_use_counter_feature_enum.py in chromium/src/tools/me trics/histograms/ 552 // Also, run update_use_counter_feature_enum.py in chromium/src/tools/me trics/histograms/
553 // to update the UMA mapping. 553 // to update the UMA mapping.
554 NumberOfFeatures, // This enum value must be last. 554 NumberOfFeatures, // This enum value must be last.
555 }; 555 };
556 556
557 // "count" sets the bit for this feature to 1. Repeated calls are ignored. 557 // "count" sets the bit for this feature to 1. Repeated calls are ignored.
558 static void count(const Document&, Feature); 558 static void count(const Document&, Feature);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 620
621 void updateMeasurements(); 621 void updateMeasurements();
622 622
623 OwnPtr<BitVector> m_countBits; 623 OwnPtr<BitVector> m_countBits;
624 BitVector m_CSSFeatureBits; 624 BitVector m_CSSFeatureBits;
625 }; 625 };
626 626
627 } // namespace blink 627 } // namespace blink
628 628
629 #endif // UseCounter_h 629 #endif // UseCounter_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698