 Chromium Code Reviews
 Chromium Code Reviews Issue 566083003:
  Implementation of subresource integrity attribute for secure origins.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master
    
  
    Issue 566083003:
  Implementation of subresource integrity attribute for secure origins.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW | 
|---|---|
| 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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 488 SVGStyleElementTitle = 519, | 488 SVGStyleElementTitle = 519, | 
| 489 PictureSourceSrc = 520, | 489 PictureSourceSrc = 520, | 
| 490 // The above items are available in M38 branch. | 490 // The above items are available in M38 branch. | 
| 491 | 491 | 
| 492 Picture = 521, | 492 Picture = 521, | 
| 493 Sizes = 522, | 493 Sizes = 522, | 
| 494 SrcsetXDescriptor = 523, | 494 SrcsetXDescriptor = 523, | 
| 495 SrcsetWDescriptor = 524, | 495 SrcsetWDescriptor = 524, | 
| 496 SelectionContainsNode = 525, | 496 SelectionContainsNode = 525, | 
| 497 MediaStreamEnded = 526, | 497 MediaStreamEnded = 526, | 
| 498 SRIElementWithMatchingIntegrityAttribute = 527, | |
| 499 SRIElementWithNonMatchingIntegrityAttribute = 527, | |
| 500 SRIElementWithUnparsableIntegrityAttribute = 528, | |
| 501 SRIElementWithIntegrityAttributeAndInsecureOrigin = 529, | |
| 502 SRIElementWithIntegrityAttributeAndInsecureResource = 530, | |
| 
Mike West
2014/09/17 07:19:05
You'll need to rebase this. :)
 | |
| 498 // Add new features immediately above this line. Don't change assigned | 503 // Add new features immediately above this line. Don't change assigned | 
| 499 // numbers of any item, and don't reuse removed slots. | 504 // numbers of any item, and don't reuse removed slots. | 
| 500 // Also, run update_use_counter_feature_enum.py in chromium/src/tools/me trics/histograms/ | 505 // Also, run update_use_counter_feature_enum.py in chromium/src/tools/me trics/histograms/ | 
| 501 // to update the UMA mapping. | 506 // to update the UMA mapping. | 
| 502 NumberOfFeatures, // This enum value must be last. | 507 NumberOfFeatures, // This enum value must be last. | 
| 503 }; | 508 }; | 
| 504 | 509 | 
| 505 // "count" sets the bit for this feature to 1. Repeated calls are ignored. | 510 // "count" sets the bit for this feature to 1. Repeated calls are ignored. | 
| 506 static void count(const Document&, Feature); | 511 static void count(const Document&, Feature); | 
| 507 // This doesn't count for ExecutionContexts for shared workers and service | 512 // This doesn't count for ExecutionContexts for shared workers and service | 
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 558 | 563 | 
| 559 void updateMeasurements(); | 564 void updateMeasurements(); | 
| 560 | 565 | 
| 561 OwnPtr<BitVector> m_countBits; | 566 OwnPtr<BitVector> m_countBits; | 
| 562 BitVector m_CSSFeatureBits; | 567 BitVector m_CSSFeatureBits; | 
| 563 }; | 568 }; | 
| 564 | 569 | 
| 565 } // namespace blink | 570 } // namespace blink | 
| 566 | 571 | 
| 567 #endif // UseCounter_h | 572 #endif // UseCounter_h | 
| OLD | NEW |