Tie multibuffers to URLs

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 <map>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
-#include "media/base/media_export.h"
 #include "media/blink/lru.h"
+#include "media/blink/media_blink_export.h"
 #include "url/gurl.h"
 
 namespace media {
 
-#ifndef MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_
 const int64 kPositionNotSpecified = -1;
-#endif
 
 class UrlIndex;
 
-class MEDIA_EXPORT UrlData : public base::RefCounted<UrlData> {
+class MEDIA_BLINK_EXPORT UrlData : public base::RefCounted<UrlData> {
 public:
   // Keep in sync with WebMediaPlayer::CORSMode.
   enum CORSMode { kUnspecified, kAnonymous, kUseCredentials };
   typedef std::pair<GURL, CORSMode> KeyType;
 
   const GURL url() const { return url_; }
   const GURL redirects_to() const { return redirects_to_; }
   CORSMode cors_mode() const { return cors_mode_; }
   bool range_supported() const { return range_supported_; }
   bool cacheable() const { return cacheable_; }
@@ skipping 57 matching lines @@
   UrlIndex* url_index_;
   DISALLOW_COPY_AND_ASSIGN(UrlData);
 };
 
 // The UrlIndex lets you look up UrlData instances by url.
 // It keeps a weak reference to UrlData that it has returned.
 // Since the multibuffer cache key contains an UrlData reference
 // we can be sure that UrlData instances with zero references
 // do not have any cached data associated with them, and they
 // can safely be removed from the UrlIndex.
-class MEDIA_EXPORT UrlIndex {
+class MEDIA_BLINK_EXPORT UrlIndex {
 public:
   UrlIndex();
   ~UrlIndex();
   // Creates a new UrlData if not found.
   // |last_modified| may be null if not known.
   // Normally you'll want to call Use() on the returned object right away.
   scoped_refptr<UrlData> GetByUrl(const GURL& gurl,
                                   UrlData::CORSMode cors_mode);
 
 
 private:
   friend class UrlData;
   void RemoveUrlData(const UrlData* url_data);
   // TODO(hubbe): Add support for etag validation.
   scoped_refptr<UrlData> SetLastModified(scoped_refptr<UrlData> urldata,
                                          base::Time last_modified);
 
   std::map<UrlData::KeyType, UrlData*> by_url_;
   std::map<UrlData::KeyType, UrlData*> with_last_modified_;
   std::list<scoped_refptr<UrlData> > to_prune_;
   bool prune_cb_active_;
 };
 
 }  // namespace media
 #endif  // MEDIA_BLINK_URL_INDEX_H_