mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing space formatting issues.

Browse source
This commit is contained in:
ali.ibrahim 2016-10-14 10:58:16 +02:00
parent de29f2dde5
commit 9cc8bfae1c
5 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_url_request.cc
View file

@ -256,7 +256,7 @@ void URLRequest::Cancel() {
}
bool URLRequest::SetExtraHeader(const std::string& name,
const std::string& value) {
const std::string& value) {
// Request state must be in the initial non started state.
if (!request_state_.NotStarted()) {
// Cannot change headers after send.
@ -322,7 +322,7 @@ void URLRequest::OnAuthenticationRequired(
}
void URLRequest::OnResponseStarted(
scoped_refptr<net::HttpResponseHeaders> response_headers) {
scoped_refptr<net::HttpResponseHeaders> response_headers) {
if (request_state_.Canceled() ||
request_state_.Failed() ||
request_state_.Closed()) {
@ -335,7 +335,7 @@ void URLRequest::OnResponseStarted(
}
void URLRequest::OnResponseData(
scoped_refptr<const net::IOBufferWithSize> buffer) {
scoped_refptr<const net::IOBufferWithSize> buffer) {
if (request_state_.Canceled() ||
request_state_.Closed() ||
request_state_.Failed() ||

10
atom/browser/api/atom_api_url_request.h
View file

@ -95,14 +95,14 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
static mate::WrappableBase* New(mate::Arguments* args);
static void BuildPrototype(
v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> prototype);
v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> prototype);
// Methods for reporting events into JavaScript.
void OnAuthenticationRequired(
scoped_refptr<const net::AuthChallengeInfo> auth_info);
scoped_refptr<const net::AuthChallengeInfo> auth_info);
void OnResponseStarted(
scoped_refptr<net::HttpResponseHeaders> response_headers);
scoped_refptr<net::HttpResponseHeaders> response_headers);
void OnResponseData(scoped_refptr<const net::IOBufferWithSize> data);
void OnResponseCompleted();
void OnRequestError(const std::string& error);
@ -110,7 +110,7 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
protected:
explicit URLRequest(v8::Isolate* isolate,
v8::Local<v8::Object> wrapper);
v8::Local<v8::Object> wrapper);
~URLRequest() override;
private:

40
atom/browser/net/atom_url_request.cc
View file

@ -14,7 +14,6 @@
#include "net/base/upload_bytes_element_reader.h"
namespace {
const int kBufferSize = 4096;
} // namespace
@ -23,21 +22,19 @@ namespace atom {
namespace internal {
class UploadOwnedIOBufferElementReader : public net::UploadBytesElementReader {
public:
explicit UploadOwnedIOBufferElementReader(
scoped_refptr<const net::IOBufferWithSize> buffer)
: net::UploadBytesElementReader(buffer->data(), buffer->size())
, buffer_(buffer) {
scoped_refptr<const net::IOBufferWithSize> buffer)
: net::UploadBytesElementReader(buffer->data(), buffer->size()),
buffer_(buffer) {
}
~UploadOwnedIOBufferElementReader() override {
}
static UploadOwnedIOBufferElementReader* CreateWithBuffer(
scoped_refptr<const net::IOBufferWithSize> buffer) {
scoped_refptr<const net::IOBufferWithSize> buffer) {
return new UploadOwnedIOBufferElementReader(std::move(buffer));
}
@ -127,7 +124,7 @@ void AtomURLRequest::Cancel() const {
}
void AtomURLRequest::SetExtraHeader(const std::string& name,
const std::string& value) const {
const std::string& value) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
content::BrowserThread::PostTask(
content::BrowserThread::IO,
@ -143,8 +140,9 @@ void AtomURLRequest::RemoveExtraHeader(const std::string& name) const {
base::Bind(&AtomURLRequest::DoRemoveExtraHeader, this, name));
}
void AtomURLRequest::PassLoginInformation(const base::string16& username,
const base::string16& password) const {
void AtomURLRequest::PassLoginInformation(
const base::string16& username,
const base::string16& password) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (username.empty() || password.empty()) {
content::BrowserThread::PostTask(
@ -158,8 +156,8 @@ void AtomURLRequest::PassLoginInformation(const base::string16& username,
}
void AtomURLRequest::DoWriteBuffer(
scoped_refptr<const net::IOBufferWithSize> buffer,
bool is_last) {
scoped_refptr<const net::IOBufferWithSize> buffer,
bool is_last) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
if (is_chunked_upload_) {
@ -223,8 +221,9 @@ void AtomURLRequest::DoRemoveExtraHeader(const std::string& name) const {
request_->RemoveRequestHeaderByName(name);
}
void AtomURLRequest::DoSetAuth(const base::string16& username,
const base::string16& password) const {
void AtomURLRequest::DoSetAuth(
const base::string16& username,
const base::string16& password) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
request_->SetAuth(net::AuthCredentials(username, password));
}
@ -234,8 +233,9 @@ void AtomURLRequest::DoCancelAuth() const {
request_->CancelAuth();
}
void AtomURLRequest::OnAuthRequired(net::URLRequest* request,
net::AuthChallengeInfo* auth_info) {
void AtomURLRequest::OnAuthRequired(
net::URLRequest* request,
net::AuthChallengeInfo* auth_info) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
content::BrowserThread::PostTask(
@ -351,7 +351,7 @@ bool AtomURLRequest::CopyAndPostBuffer(int bytes_read) {
void AtomURLRequest::InformDelegateAuthenticationRequired(
scoped_refptr<net::AuthChallengeInfo> auth_info) const {
scoped_refptr<net::AuthChallengeInfo> auth_info) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (delegate_)
delegate_->OnAuthenticationRequired(auth_info);
@ -365,7 +365,7 @@ void AtomURLRequest::InformDelegateResponseStarted(
}
void AtomURLRequest::InformDelegateResponseData(
scoped_refptr<net::IOBufferWithSize> data) const {
scoped_refptr<net::IOBufferWithSize> data) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// Transfer ownership of the data buffer, data will be released
@ -382,7 +382,7 @@ void AtomURLRequest::InformDelegateResponseCompleted() const {
}
void AtomURLRequest::InformDelegateRequestErrorOccured(
const std::string& error) const {
const std::string& error) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (delegate_)
@ -390,7 +390,7 @@ void AtomURLRequest::InformDelegateRequestErrorOccured(
}
void AtomURLRequest::InformDelegateResponseErrorOccured(
const std::string& error) const {
const std::string& error) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (delegate_)

25
atom/browser/net/atom_url_request.h
View file

@ -25,27 +25,26 @@ class AtomURLRequest : public base::RefCountedThreadSafe<AtomURLRequest>,
public net::URLRequest::Delegate {
public:
static scoped_refptr<AtomURLRequest> Create(
AtomBrowserContext* browser_context,
const std::string& method,
const std::string& url,
base::WeakPtr<api::URLRequest> delegate);
AtomBrowserContext* browser_context,
const std::string& method,
const std::string& url,
base::WeakPtr<api::URLRequest> delegate);
bool Write(scoped_refptr<const net::IOBufferWithSize> buffer,
bool is_last);
bool is_last);
void SetChunkedUpload(bool is_chunked_upload);
void Cancel() const;
void SetExtraHeader(const std::string& name, const std::string& value) const;
void RemoveExtraHeader(const std::string& name) const;
void PassLoginInformation(const base::string16& username,
const base::string16& password) const;
const base::string16& password) const;
protected:
// Overrides of net::URLRequest::Delegate
void OnAuthRequired(net::URLRequest* request,
net::AuthChallengeInfo* auth_info) override;
net::AuthChallengeInfo* auth_info) override;
void OnResponseStarted(net::URLRequest* request) override;
void OnReadCompleted(net::URLRequest* request,
int bytes_read) override;
void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
private:
friend class base::RefCountedThreadSafe<AtomURLRequest>;
@ -63,18 +62,18 @@ class AtomURLRequest : public base::RefCountedThreadSafe<AtomURLRequest>,
const std::string& value) const;
void DoRemoveExtraHeader(const std::string& name) const;
void DoSetAuth(const base::string16& username,
const base::string16& password) const;
const base::string16& password) const;
void DoCancelAuth() const;
void ReadResponse();
bool CopyAndPostBuffer(int bytes_read);
void InformDelegateAuthenticationRequired(
scoped_refptr<net::AuthChallengeInfo> auth_info) const;
scoped_refptr<net::AuthChallengeInfo> auth_info) const;
void InformDelegateResponseStarted(
scoped_refptr<net::HttpResponseHeaders>) const;
scoped_refptr<net::HttpResponseHeaders>) const;
void InformDelegateResponseData(
scoped_refptr<net::IOBufferWithSize> data) const;
scoped_refptr<net::IOBufferWithSize> data) const;
void InformDelegateResponseCompleted() const;
void InformDelegateRequestErrorOccured(const std::string& error) const;
void InformDelegateResponseErrorOccured(const std::string& error) const;

5
atom/common/native_mate_converters/net_converter.h
View file

@ -36,8 +36,9 @@ struct Converter<scoped_refptr<net::X509Certificate>> {
template<>
struct Converter<scoped_refptr<net::HttpResponseHeaders>> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
scoped_refptr<net::HttpResponseHeaders> headers);
static v8::Local<v8::Value> ToV8(
v8::Isolate* isolate,
scoped_refptr<net::HttpResponseHeaders> headers);
};
} // namespace mate