manage the lifetime of streams created
This commit is contained in:
parent
0ab37da785
commit
945e26750e
9 changed files with 216 additions and 31 deletions
|
@ -4,22 +4,53 @@
|
|||
|
||||
#include "atom/browser/ui/webui/pdf_viewer_handler.h"
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "base/bind_helpers.h"
|
||||
#include "atom/browser/atom_browser_context.h"
|
||||
#include "atom/browser/stream_manager.h"
|
||||
#include "base/values.h"
|
||||
#include "content/public/browser/stream_handle.h"
|
||||
#include "content/public/browser/stream_info.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/browser/web_ui.h"
|
||||
#include "content/public/common/page_zoom.h"
|
||||
#include "net/http/http_response_headers.h"
|
||||
|
||||
namespace atom {
|
||||
|
||||
PdfViewerHandler::PdfViewerHandler(const std::string& stream_url,
|
||||
const std::string& original_url)
|
||||
: stream_url_(stream_url), original_url_(original_url) {}
|
||||
namespace {
|
||||
|
||||
void CreateResponseHeadersDictionary(const net::HttpResponseHeaders* headers,
|
||||
base::DictionaryValue* result) {
|
||||
if (!headers)
|
||||
return;
|
||||
|
||||
size_t iter = 0;
|
||||
std::string header_name;
|
||||
std::string header_value;
|
||||
while (headers->EnumerateHeaderLines(&iter, &header_name, &header_value)) {
|
||||
base::Value* existing_value = nullptr;
|
||||
if (result->Get(header_name, &existing_value)) {
|
||||
base::StringValue* existing_string_value =
|
||||
static_cast<base::StringValue*>(existing_value);
|
||||
existing_string_value->GetString()->append(", ").append(header_value);
|
||||
} else {
|
||||
result->SetString(header_name, header_value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
PdfViewerHandler::PdfViewerHandler(const std::string& view_id)
|
||||
: view_id_(view_id) {}
|
||||
|
||||
PdfViewerHandler::~PdfViewerHandler() {}
|
||||
|
||||
void PdfViewerHandler::RegisterMessages() {
|
||||
auto browser_context = static_cast<AtomBrowserContext*>(
|
||||
web_ui()->GetWebContents()->GetBrowserContext());
|
||||
auto stream_manager = browser_context->stream_manager();
|
||||
stream_ = stream_manager->ReleaseStream(view_id_);
|
||||
|
||||
web_ui()->RegisterMessageCallback(
|
||||
"initialize",
|
||||
base::Bind(&PdfViewerHandler::Initialize, base::Unretained(this)));
|
||||
|
@ -50,8 +81,15 @@ void PdfViewerHandler::Initialize(const base::ListValue* args) {
|
|||
const base::Value* callback_id;
|
||||
CHECK(args->Get(0, &callback_id));
|
||||
std::unique_ptr<base::DictionaryValue> stream_info(new base::DictionaryValue);
|
||||
stream_info->SetString("streamURL", stream_url_);
|
||||
stream_info->SetString("originalURL", original_url_);
|
||||
auto stream_url = stream_->handle->GetURL().spec();
|
||||
auto original_url = stream_->original_url.spec();
|
||||
stream_info->SetString("streamURL", stream_url);
|
||||
stream_info->SetString("originalURL", original_url);
|
||||
std::unique_ptr<base::DictionaryValue> headers_dict(
|
||||
new base::DictionaryValue);
|
||||
CreateResponseHeadersDictionary(stream_->response_headers.get(),
|
||||
headers_dict.get());
|
||||
stream_info->Set("responseHeaders", std::move(headers_dict));
|
||||
ResolveJavascriptCallback(*callback_id, *stream_info);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue