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

Unified Diff: content/browser/loader/stream_resource_handler.h

Issue 12212031: Add support for redirecting ResourceHandlers to a blob: URL (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Code review fixes Created 7 years, 10 months 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/stream_resource_handler.h
diff --git a/content/browser/loader/certificate_resource_handler.h b/content/browser/loader/stream_resource_handler.h
similarity index 53%
copy from content/browser/loader/certificate_resource_handler.h
copy to content/browser/loader/stream_resource_handler.h
index 428063aba47fa2b36213e724a812271a19f55b74..99ee8533e5e60198e084f730e94f53b119eb9c83 100644
--- a/content/browser/loader/certificate_resource_handler.h
+++ b/content/browser/loader/stream_resource_handler.h
@@ -1,40 +1,29 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 CONTENT_BROWSER_LOADER_CERTIFICATE_RESOURCE_HANDLER_H_
-#define CONTENT_BROWSER_LOADER_CERTIFICATE_RESOURCE_HANDLER_H_
+#ifndef CONTENT_BROWSER_LOADER_STREAM_RESOURCE_HANDLER_H_
+#define CONTENT_BROWSER_LOADER_STREAM_RESOURCE_HANDLER_H_
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "content/browser/loader/resource_handler.h"
+#include "content/browser/streams/stream_write_observer.h"
#include "googleurl/src/gurl.h"
-#include "net/base/mime_util.h"
namespace net {
-class IOBuffer;
class URLRequest;
-class URLRequestStatus;
} // namespace net
namespace content {
-// This class handles certificate mime types such as:
-// - "application/x-x509-user-cert"
-// - "application/x-x509-ca-cert"
-// - "application/x-pkcs12"
-//
-class CertificateResourceHandler : public ResourceHandler {
+// Redirect this resource to a stream.
+class StreamResourceHandler : public StreamWriteObserver,
+ public ResourceHandler {
public:
- CertificateResourceHandler(net::URLRequest* request,
- int render_process_host_id,
- int render_view_id);
- virtual ~CertificateResourceHandler();
+ StreamResourceHandler(net::URLRequest* request,
+ scoped_refptr<Stream> stream);
+ virtual ~StreamResourceHandler();
virtual bool OnUploadProgress(int request_id,
uint64 position,
@@ -46,12 +35,10 @@ class CertificateResourceHandler : public ResourceHandler {
ResourceResponse* resp,
bool* defer) OVERRIDE;
- // Check if this indeed an X509 cert.
virtual bool OnResponseStarted(int request_id,
ResourceResponse* resp,
bool* defer) OVERRIDE;
- // Pass-through implementation.
virtual bool OnWillStart(int request_id,
const GURL& url,
bool* defer) OVERRIDE;
@@ -62,39 +49,27 @@ class CertificateResourceHandler : public ResourceHandler {
int* buf_size,
int min_size) OVERRIDE;
- // A read was completed, maybe allocate a new buffer for further data.
+ // A read was completed, forward the data to the Stream.
virtual bool OnReadCompleted(int request_id,
int bytes_read,
bool* defer) OVERRIDE;
- // Done downloading the certificate.
virtual bool OnResponseCompleted(int request_id,
const net::URLRequestStatus& urs,
const std::string& sec_info) OVERRIDE;
- // N/A to cert downloading.
virtual void OnDataDownloaded(int request_id, int bytes_downloaded) OVERRIDE;
private:
- typedef std::vector<std::pair<scoped_refptr<net::IOBuffer>,
- size_t> > ContentVector;
-
- void AssembleResource();
+ virtual void OnSpaceAvailable(Stream* stream) OVERRIDE;
- GURL url_;
net::URLRequest* request_;
- size_t content_length_;
- ContentVector buffer_;
+ scoped_refptr<Stream> stream_;
scoped_refptr<net::IOBuffer> read_buffer_;
- scoped_refptr<net::IOBuffer> resource_buffer_; // Downloaded certificate.
- // The id of the |RenderProcessHost| which started the download.
- int render_process_host_id_;
- // The id of the |RenderView| which started the download.
- int render_view_id_;
- net::CertificateMimeType cert_type_;
- DISALLOW_COPY_AND_ASSIGN(CertificateResourceHandler);
+ DISALLOW_COPY_AND_ASSIGN(StreamResourceHandler);
};
} // namespace content
-#endif // CONTENT_BROWSER_LOADER_CERTIFICATE_RESOURCE_HANDLER_H_
+#endif // CONTENT_BROWSER_LOADER_STREAM_RESOURCE_HANDLER_H_
+
« no previous file with comments | « content/browser/loader/resource_request_info_impl.cc ('k') | content/browser/loader/stream_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698