The cross-origin checks in the multibuffer code are not sufficient, as they only trigger when a red…

media/blink/url_index.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BLINK_URL_INDEX_H_
 #define MEDIA_BLINK_URL_INDEX_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 79 matching lines @@
   size_t CachedSize();
 
   // Returns our url_index, or nullptr if it's been destroyed.
   UrlIndex* url_index() const { return url_index_.get(); }
 
   // Notifies the url index that this is currently used.
   // The url <-> URLData mapping will be eventually be invalidated if
   // this is not called regularly.
   void Use();
 
+  // Call this before we add some data to the multibuffer().
+  // If the multibuffer is empty, the data origin is set from
+  // |origin| and returns true. If not, it compares |origin|
+  // to the previous origin and returns wheather they match or not.
+  bool ValidateDataOrigin(const GURL& origin);
+
   // Setters.
   void set_length(int64_t length);
   void set_cacheable(bool cacheable);
   void set_valid_until(base::Time valid_until);
   void set_range_supported();
   void set_last_modified(base::Time last_modified);
 
   // A redirect has occured (or we've found a better UrlData for the same
   // resource).
   void RedirectTo(const scoped_refptr<UrlData>& to);
@@ skipping 31 matching lines @@
   friend class UrlIndex;
   friend class base::RefCounted<UrlData>;
 
   void OnEmpty();
   void MergeFrom(const scoped_refptr<UrlData>& other);
 
   // Url we represent, note that there may be multiple UrlData for
   // the same url.
   const GURL url_;
 
+  // Origin of the data, should only be different from the url_.GetOrigin()
+  // when service workers are involved.
+  GURL data_origin_;
+  bool have_data_origin_;
+
   // Cross-origin access mode.
   const CORSMode cors_mode_;
 
   base::WeakPtr<UrlIndex> url_index_;
 
   // Length of resource this url points to. (in bytes)
   int64_t length_;
 
   // Does the server support ranges?
   bool range_supported_;
@@ skipping 74 matching lines @@
   // log2 of block size in multibuffer cache. Defaults to kBlockSizeShift.
   // Currently only changed for testing purposes.
   const int block_shift_;
 
  protected:
   base::WeakPtrFactory<UrlIndex> weak_factory_;
 };
 
 }  // namespace media
 #endif  // MEDIA_BLINK_URL_INDEX_H_