Tie multibuffers to URLs

media/blink/multibuffer.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_MULTIBUFFER_H_
 #define MEDIA_BLINK_MULTIBUFFER_H_
 
 #include <stdint.h>
 
 #include <limits>
@@ skipping 38 matching lines @@
 // Uninitialized MultiBufferBlockIds will have a url equal to
 // kUnknownUrlData. We also use kUnknownUrlData together with
 // a block id of maxint/minint to represent the maximum and
 // minimum possible MultiBufferBlockId.  Examples, in sorted
 // order:
 // { url=kUnknownUrlData, block_num=-maxint }  // minimum possible value
 // { url=kUnknownUrlData, block_num=0 }        // uninitialized
 // { url=valid, block_num=1 }                // valid value
 // { url=valid, block_num=10 }               // valid value
 // { url=kUnknownUrlData, block_num=maxint }   // maximum possible value
-class MEDIA_EXPORT MultiBufferBlockId {
+class MEDIA_BLINK_EXPORT MultiBufferBlockId {
  public:
   MultiBufferBlockId();
   MultiBufferBlockId(const MultiBufferBlockId& block_id);
   MultiBufferBlockId(MultiBufferUrlData url_data,
                      MultiBufferBlockNum block_num);
   ~MultiBufferBlockId();
   bool SameUrl(const MultiBufferBlockId& other) const {
     return url_data_ == other.url_data_;
   }
   bool operator<(const MultiBufferBlockId& other) const {
@@ skipping 62 matching lines @@
       return std::numeric_limits<uint64_t>::max();
     return 0;
   }
   MultiBufferUrlData url_data_;
   MultiBufferBlockNum block_num_;
 };
 
 }   // namespace media
 
 namespace std {
-MEDIA_EXPORT ostream& operator<<(
-    ostream& o, const media::MultiBufferBlockId& id);
+MEDIA_BLINK_EXPORT ostream& operator<<(ostream& o,
+                                       const media::MultiBufferBlockId& id);
 
 template<>
 class numeric_limits<media::MultiBufferBlockId> {
   public:
   static media::MultiBufferBlockId min() {
     return media::MultiBufferBlockId(
         kUnknownUrlData,
         numeric_limits<media::MultiBufferBlockNum>::min());
   }
 
   static media::MultiBufferBlockId max() {
     return media::MultiBufferBlockId(
         kUnknownUrlData,
         numeric_limits<media::MultiBufferBlockNum>::max());
   }
 };
 
 }  // namespace std
 
 namespace media {
 
 // MultiBuffers are multi-reader multi-writer cache/buffers with
 // prefetching and pinning. Data is stored internally in ref-counted
 // blocks of identical size. |block_size_shift| is log2 of the block
 // size.
 //
 // Users should inherit this class and implement CreateWriter().
 // TODO(hubbe): Make the multibuffer respond to memory pressure.
-class MEDIA_EXPORT MultiBuffer {
+class MEDIA_BLINK_EXPORT MultiBuffer {
  public:
 
   // Interface for clients wishing to read data out of this cache.
   class Reader {
    public:
     Reader() {}
     virtual ~Reader() {}
     // Tell the reader that we have a new UrlData. There may be several
     // reasons for this:
     //  o We encountered a redirect.
@@ skipping 185 matching lines @@
 
   // present_[block] should be 1 for all blocks that are present
   // and 0 for all blocks that are not. Used to quickly figure out
   // ranges of available blocks without iterating.
   RangeMap<BlockId, int32_t> present_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_MULTIBUFFER_H_