bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 40af916d (#303546).

Browse Source 
- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-11-12 19:25:15 +00:00
parent 470518a52e
commit eef89ccdd3
329 changed files with 3160 additions and 3731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
libcef/renderer/render_urlrequest_impl.cc
View File

@ -31,35 +31,35 @@ class CefWebURLLoaderClient : public blink::WebURLLoaderClient {
public:
CefWebURLLoaderClient(CefRenderURLRequest::Context* context,
int request_flags);
virtual ~CefWebURLLoaderClient();
~CefWebURLLoaderClient() override;
// blink::WebURLLoaderClient methods.
virtual void willSendRequest(
void willSendRequest(
WebURLLoader* loader,
WebURLRequest& newRequest,
const WebURLResponse& redirectResponse) OVERRIDE;
virtual void didSendData(
const WebURLResponse& redirectResponse) override;
void didSendData(
WebURLLoader* loader,
unsigned long long bytesSent,
unsigned long long totalBytesToBeSent) OVERRIDE;
virtual void didReceiveResponse(
unsigned long long totalBytesToBeSent) override;
void didReceiveResponse(
WebURLLoader* loader,
const WebURLResponse& response) OVERRIDE;
virtual void didDownloadData(WebURLLoader* loader,
int dataLength,
int encodedDataLength) OVERRIDE;
virtual void didReceiveData(WebURLLoader* loader,
const char* data,
int dataLength,
int encodedDataLength) OVERRIDE;
virtual void didReceiveCachedMetadata(WebURLLoader* loader,
const char* data,
int dataLength) OVERRIDE;
virtual void didFinishLoading(WebURLLoader* loader,
double finishTime,
int64_t totalEncodedDataLength) OVERRIDE;
virtual void didFail(WebURLLoader* loader,
const WebURLError& error) OVERRIDE;
const WebURLResponse& response) override;
void didDownloadData(WebURLLoader* loader,
int dataLength,
int encodedDataLength) override;
void didReceiveData(WebURLLoader* loader,
const char* data,
int dataLength,
int encodedDataLength) override;
void didReceiveCachedMetadata(WebURLLoader* loader,
const char* data,
int dataLength) override;
void didFinishLoading(WebURLLoader* loader,
double finishTime,
int64_t totalEncodedDataLength) override;
void didFail(WebURLLoader* loader,
const WebURLError& error) override;
protected:
// The context_ pointer will outlive this object.
@ -92,9 +92,6 @@ class CefRenderURLRequest::Context
static_cast<CefRequestImpl*>(request_.get())->SetReadOnly(true);
}
virtual ~Context() {
}
inline bool CalledOnValidThread() {
return message_loop_proxy_->BelongsToCurrentThread();
}
@ -217,6 +214,10 @@ class CefRenderURLRequest::Context
CefRefPtr<CefResponse> response() { return response_; }
private:
friend class base::RefCountedThreadSafe<CefRenderURLRequest::Context>;
virtual ~Context() {}
void NotifyUploadProgressIfNecessary() {
if (!got_upload_progress_complete_ && upload_data_size_ > 0) {
// URLFetcher sends upload notifications using a timer and will not send