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

78
libcef/renderer/browser_impl.h
View File

@@ -49,35 +49,35 @@ class CefBrowserImpl : public CefBrowser,
blink::WebFrame* frame);
// CefBrowser methods.
virtual CefRefPtr<CefBrowserHost> GetHost() OVERRIDE;
virtual bool CanGoBack() OVERRIDE;
virtual void GoBack() OVERRIDE;
virtual bool CanGoForward() OVERRIDE;
virtual void GoForward() OVERRIDE;
virtual bool IsLoading() OVERRIDE;
virtual void Reload() OVERRIDE;
virtual void ReloadIgnoreCache() OVERRIDE;
virtual void StopLoad() OVERRIDE;
virtual int GetIdentifier() OVERRIDE;
virtual bool IsSame(CefRefPtr<CefBrowser> that) OVERRIDE;
virtual bool IsPopup() OVERRIDE;
virtual bool HasDocument() OVERRIDE;
virtual CefRefPtr<CefFrame> GetMainFrame() OVERRIDE;
virtual CefRefPtr<CefFrame> GetFocusedFrame() OVERRIDE;
virtual CefRefPtr<CefFrame> GetFrame(int64 identifier) OVERRIDE;
virtual CefRefPtr<CefFrame> GetFrame(const CefString& name) OVERRIDE;
virtual size_t GetFrameCount() OVERRIDE;
virtual void GetFrameIdentifiers(std::vector<int64>& identifiers) OVERRIDE;
virtual void GetFrameNames(std::vector<CefString>& names) OVERRIDE;
virtual bool SendProcessMessage(
CefRefPtr<CefBrowserHost> GetHost() override;
bool CanGoBack() override;
void GoBack() override;
bool CanGoForward() override;
void GoForward() override;
bool IsLoading() override;
void Reload() override;
void ReloadIgnoreCache() override;
void StopLoad() override;
int GetIdentifier() override;
bool IsSame(CefRefPtr<CefBrowser> that) override;
bool IsPopup() override;
bool HasDocument() override;
CefRefPtr<CefFrame> GetMainFrame() override;
CefRefPtr<CefFrame> GetFocusedFrame() override;
CefRefPtr<CefFrame> GetFrame(int64 identifier) override;
CefRefPtr<CefFrame> GetFrame(const CefString& name) override;
size_t GetFrameCount() override;
void GetFrameIdentifiers(std::vector<int64>& identifiers) override;
void GetFrameNames(std::vector<CefString>& names) override;
bool SendProcessMessage(
CefProcessId target_process,
CefRefPtr<CefProcessMessage> message) OVERRIDE;
CefRefPtr<CefProcessMessage> message) override;
CefBrowserImpl(content::RenderView* render_view,
int browser_id,
bool is_popup,
bool is_windowless);
virtual ~CefBrowserImpl();
~CefBrowserImpl() override;
void LoadRequest(const CefMsg_LoadRequest_Params& params);
@@ -105,23 +105,23 @@ class CefBrowserImpl : public CefBrowser,
private:
// RenderViewObserver methods.
virtual void OnDestruct() OVERRIDE;
virtual void DidStartLoading() OVERRIDE;
virtual void DidStopLoading() OVERRIDE;
virtual void DidFailLoad(blink::WebLocalFrame* frame,
const blink::WebURLError& error) OVERRIDE;
virtual void DidFinishLoad(blink::WebLocalFrame* frame) OVERRIDE;
virtual void DidStartProvisionalLoad(blink::WebLocalFrame* frame) OVERRIDE;
virtual void DidFailProvisionalLoad(
void OnDestruct() override;
void DidStartLoading() override;
void DidStopLoading() override;
void DidFailLoad(blink::WebLocalFrame* frame,
const blink::WebURLError& error) override;
void DidFinishLoad(blink::WebLocalFrame* frame) override;
void DidStartProvisionalLoad(blink::WebLocalFrame* frame) override;
void DidFailProvisionalLoad(
blink::WebLocalFrame* frame,
const blink::WebURLError& error) OVERRIDE;
virtual void DidCommitProvisionalLoad(blink::WebLocalFrame* frame,
bool is_new_navigation) OVERRIDE;
virtual void FrameDetached(blink::WebFrame* frame) OVERRIDE;
virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE;
virtual void DidCreateDataSource(blink::WebLocalFrame* frame,
blink::WebDataSource* ds) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
const blink::WebURLError& error) override;
void DidCommitProvisionalLoad(blink::WebLocalFrame* frame,
bool is_new_navigation) override;
void FrameDetached(blink::WebFrame* frame) override;
void FocusedNodeChanged(const blink::WebNode& node) override;
void DidCreateDataSource(blink::WebLocalFrame* frame,
blink::WebDataSource* ds) override;
bool OnMessageReceived(const IPC::Message& message) override;
// RenderViewObserver::OnMessageReceived message handlers.
void OnRequest(const Cef_Request_Params& params);

32
libcef/renderer/content_renderer_client.cc
View File

@@ -31,7 +31,7 @@ MSVC_POP_WARNING();
#include "libcef/renderer/webkit_glue.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
@@ -80,13 +80,10 @@ namespace {
// Stub implementation of blink::WebPrerenderingSupport.
class CefPrerenderingSupport : public blink::WebPrerenderingSupport {
public:
virtual ~CefPrerenderingSupport() {}
private:
virtual void add(const blink::WebPrerender& prerender) OVERRIDE {}
virtual void cancel(const blink::WebPrerender& prerender) OVERRIDE {}
virtual void abandon(const blink::WebPrerender& prerender) OVERRIDE {}
void add(const blink::WebPrerender& prerender) override {}
void cancel(const blink::WebPrerender& prerender) override {}
void abandon(const blink::WebPrerender& prerender) override {}
};
// Stub implementation of blink::WebPrerendererClient.
@@ -100,9 +97,9 @@ class CefPrerendererClient : public content::RenderViewObserver,
}
private:
virtual ~CefPrerendererClient() {}
~CefPrerendererClient() override {}
virtual void willAddPrerender(blink::WebPrerender* prerender) OVERRIDE {}
void willAddPrerender(blink::WebPrerender* prerender) override {}
};
// Implementation of SequencedTaskRunner for WebWorker threads.
@@ -122,29 +119,29 @@ class CefWebWorkerTaskRunner : public base::SequencedTaskRunner,
}
// SequencedTaskRunner methods:
virtual bool PostNonNestableDelayedTask(
bool PostNonNestableDelayedTask(
const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) OVERRIDE {
base::TimeDelta delay) override {
return PostDelayedTask(from_here, task, delay);
}
// TaskRunner methods:
virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) OVERRIDE {
bool PostDelayedTask(const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) override {
if (delay != base::TimeDelta())
LOG(WARNING) << "Delayed tasks are not supported on WebWorker threads";
runner_->PostTask(worker_id_, task);
return true;
}
virtual bool RunsTasksOnCurrentThread() const OVERRIDE {
bool RunsTasksOnCurrentThread() const override {
return (runner_->CurrentWorkerId() == worker_id_);
}
// WorkerTaskRunner::Observer methods:
virtual void OnWorkerRunLoopStopped() OVERRIDE {
void OnWorkerRunLoopStopped() override {
CefContentRendererClient::Get()->RemoveWorkerTaskRunner(worker_id_);
}
@@ -258,9 +255,6 @@ void CefContentRendererClient::WebKitInitialized() {
// TODO(cef): Enable these once the implementation supports it.
blink::WebRuntimeFeatures::enableNotifications(false);
blink::WebRuntimeFeatures::enableMediaStream(
command_line.HasSwitch(switches::kEnableMediaStream));
#if defined(OS_WIN)
// Need to patch a few functions for font loading to work correctly.
// From chrome/renderer/chrome_render_process_observer.cc.

42
libcef/renderer/content_renderer_client.h
View File

@@ -33,7 +33,7 @@ class CefContentRendererClient : public content::ContentRendererClient,
public base::MessageLoop::DestructionObserver {
public:
CefContentRendererClient();
virtual ~CefContentRendererClient();
~CefContentRendererClient() override;
// Returns the singleton CefContentRendererClient instance.
static CefContentRendererClient* Get();
@@ -79,35 +79,35 @@ class CefContentRendererClient : public content::ContentRendererClient,
void RunSingleProcessCleanup();
// ContentRendererClient implementation.
virtual void RenderThreadStarted() OVERRIDE;
virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE;
virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE;
virtual bool OverrideCreatePlugin(
void RenderThreadStarted() override;
void RenderFrameCreated(content::RenderFrame* render_frame) override;
void RenderViewCreated(content::RenderView* render_view) override;
bool OverrideCreatePlugin(
content::RenderFrame* render_frame,
blink::WebLocalFrame* frame,
const blink::WebPluginParams& params,
blink::WebPlugin** plugin) OVERRIDE;
virtual bool HandleNavigation(content::RenderFrame* render_frame,
content::DocumentState* document_state,
int opener_id,
blink::WebFrame* frame,
const blink::WebURLRequest& request,
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
bool is_redirect) OVERRIDE;
virtual void DidCreateScriptContext(blink::WebFrame* frame,
v8::Handle<v8::Context> context,
int extension_group,
int world_id) OVERRIDE;
virtual const void* CreatePPAPIInterface(
const std::string& interface_name) OVERRIDE;
blink::WebPlugin** plugin) override;
bool HandleNavigation(content::RenderFrame* render_frame,
content::DocumentState* document_state,
int opener_id,
blink::WebFrame* frame,
const blink::WebURLRequest& request,
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
bool is_redirect) override;
void DidCreateScriptContext(blink::WebFrame* frame,
v8::Handle<v8::Context> context,
int extension_group,
int world_id) override;
const void* CreatePPAPIInterface(
const std::string& interface_name) override;
void WillReleaseScriptContext(blink::WebLocalFrame* frame,
v8::Handle<v8::Context> context,
int world_id);
// MessageLoop::DestructionObserver implementation.
virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
void WillDestroyCurrentMessageLoop() override;
private:
void BrowserCreated(content::RenderView* render_view,

34
libcef/renderer/dom_document_impl.h
View File

@@ -20,25 +20,25 @@ class CefDOMDocumentImpl : public CefDOMDocument {
public:
CefDOMDocumentImpl(CefBrowserImpl* browser,
blink::WebFrame* frame);
virtual ~CefDOMDocumentImpl();
~CefDOMDocumentImpl() override;
// CefDOMDocument methods.
virtual Type GetType() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetDocument() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetBody() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetHead() OVERRIDE;
virtual CefString GetTitle() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetElementById(const CefString& id) OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetFocusedNode() OVERRIDE;
virtual bool HasSelection() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetSelectionStartNode() OVERRIDE;
virtual int GetSelectionStartOffset() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetSelectionEndNode() OVERRIDE;
virtual int GetSelectionEndOffset() OVERRIDE;
virtual CefString GetSelectionAsMarkup() OVERRIDE;
virtual CefString GetSelectionAsText() OVERRIDE;
virtual CefString GetBaseURL() OVERRIDE;
virtual CefString GetCompleteURL(const CefString& partialURL) OVERRIDE;
Type GetType() override;
CefRefPtr<CefDOMNode> GetDocument() override;
CefRefPtr<CefDOMNode> GetBody() override;
CefRefPtr<CefDOMNode> GetHead() override;
CefString GetTitle() override;
CefRefPtr<CefDOMNode> GetElementById(const CefString& id) override;
CefRefPtr<CefDOMNode> GetFocusedNode() override;
bool HasSelection() override;
CefRefPtr<CefDOMNode> GetSelectionStartNode() override;
int GetSelectionStartOffset() override;
CefRefPtr<CefDOMNode> GetSelectionEndNode() override;
int GetSelectionEndOffset() override;
CefString GetSelectionAsMarkup() override;
CefString GetSelectionAsText() override;
CefString GetBaseURL() override;
CefString GetCompleteURL(const CefString& partialURL) override;
CefBrowserImpl* GetBrowser() { return browser_; }
blink::WebFrame* GetFrame() { return frame_; }

54
libcef/renderer/dom_node_impl.h
View File

@@ -15,35 +15,35 @@ class CefDOMNodeImpl : public CefDOMNode {
public:
CefDOMNodeImpl(CefRefPtr<CefDOMDocumentImpl> document,
const blink::WebNode& node);
virtual ~CefDOMNodeImpl();
~CefDOMNodeImpl() override;
// CefDOMNode methods.
virtual Type GetType() OVERRIDE;
virtual bool IsText() OVERRIDE;
virtual bool IsElement() OVERRIDE;
virtual bool IsEditable() OVERRIDE;
virtual bool IsFormControlElement() OVERRIDE;
virtual CefString GetFormControlElementType() OVERRIDE;
virtual bool IsSame(CefRefPtr<CefDOMNode> that) OVERRIDE;
virtual CefString GetName() OVERRIDE;
virtual CefString GetValue() OVERRIDE;
virtual bool SetValue(const CefString& value) OVERRIDE;
virtual CefString GetAsMarkup() OVERRIDE;
virtual CefRefPtr<CefDOMDocument> GetDocument() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetParent() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetPreviousSibling() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetNextSibling() OVERRIDE;
virtual bool HasChildren() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetFirstChild() OVERRIDE;
virtual CefRefPtr<CefDOMNode> GetLastChild() OVERRIDE;
virtual CefString GetElementTagName() OVERRIDE;
virtual bool HasElementAttributes() OVERRIDE;
virtual bool HasElementAttribute(const CefString& attrName) OVERRIDE;
virtual CefString GetElementAttribute(const CefString& attrName) OVERRIDE;
virtual void GetElementAttributes(AttributeMap& attrMap) OVERRIDE;
virtual bool SetElementAttribute(const CefString& attrName,
const CefString& value) OVERRIDE;
virtual CefString GetElementInnerText() OVERRIDE;
Type GetType() override;
bool IsText() override;
bool IsElement() override;
bool IsEditable() override;
bool IsFormControlElement() override;
CefString GetFormControlElementType() override;
bool IsSame(CefRefPtr<CefDOMNode> that) override;
CefString GetName() override;
CefString GetValue() override;
bool SetValue(const CefString& value) override;
CefString GetAsMarkup() override;
CefRefPtr<CefDOMDocument> GetDocument() override;
CefRefPtr<CefDOMNode> GetParent() override;
CefRefPtr<CefDOMNode> GetPreviousSibling() override;
CefRefPtr<CefDOMNode> GetNextSibling() override;
bool HasChildren() override;
CefRefPtr<CefDOMNode> GetFirstChild() override;
CefRefPtr<CefDOMNode> GetLastChild() override;
CefString GetElementTagName() override;
bool HasElementAttributes() override;
bool HasElementAttribute(const CefString& attrName) override;
CefString GetElementAttribute(const CefString& attrName) override;
void GetElementAttributes(AttributeMap& attrMap) override;
bool SetElementAttribute(const CefString& attrName,
const CefString& value) override;
CefString GetElementInnerText() override;
// Will be called from CefDOMDocumentImpl::Detach().
void Detach();

56
libcef/renderer/frame_impl.h
View File

@@ -23,36 +23,36 @@ class CefFrameImpl : public CefFrame {
public:
CefFrameImpl(CefBrowserImpl* browser,
blink::WebFrame* frame);
virtual ~CefFrameImpl();
~CefFrameImpl() override;
// CefFrame implementation.
virtual bool IsValid() OVERRIDE;
virtual void Undo() OVERRIDE;
virtual void Redo() OVERRIDE;
virtual void Cut() OVERRIDE;
virtual void Copy() OVERRIDE;
virtual void Paste() OVERRIDE;
virtual void Delete() OVERRIDE;
virtual void SelectAll() OVERRIDE;
virtual void ViewSource() OVERRIDE;
virtual void GetSource(CefRefPtr<CefStringVisitor> visitor) OVERRIDE;
virtual void GetText(CefRefPtr<CefStringVisitor> visitor) OVERRIDE;
virtual void LoadRequest(CefRefPtr<CefRequest> request) OVERRIDE;
virtual void LoadURL(const CefString& url) OVERRIDE;
virtual void LoadString(const CefString& string,
const CefString& url) OVERRIDE;
virtual void ExecuteJavaScript(const CefString& jsCode,
const CefString& scriptUrl,
int startLine) OVERRIDE;
virtual bool IsMain() OVERRIDE;
virtual bool IsFocused() OVERRIDE;
virtual CefString GetName() OVERRIDE;
virtual int64 GetIdentifier() OVERRIDE;
virtual CefRefPtr<CefFrame> GetParent() OVERRIDE;
virtual CefString GetURL() OVERRIDE;
virtual CefRefPtr<CefBrowser> GetBrowser() OVERRIDE;
virtual CefRefPtr<CefV8Context> GetV8Context() OVERRIDE;
virtual void VisitDOM(CefRefPtr<CefDOMVisitor> visitor) OVERRIDE;
bool IsValid() override;
void Undo() override;
void Redo() override;
void Cut() override;
void Copy() override;
void Paste() override;
void Delete() override;
void SelectAll() override;
void ViewSource() override;
void GetSource(CefRefPtr<CefStringVisitor> visitor) override;
void GetText(CefRefPtr<CefStringVisitor> visitor) override;
void LoadRequest(CefRefPtr<CefRequest> request) override;
void LoadURL(const CefString& url) override;
void LoadString(const CefString& string,
const CefString& url) override;
void ExecuteJavaScript(const CefString& jsCode,
const CefString& scriptUrl,
int startLine) override;
bool IsMain() override;
bool IsFocused() override;
CefString GetName() override;
int64 GetIdentifier() override;
CefRefPtr<CefFrame> GetParent() override;
CefString GetURL() override;
CefRefPtr<CefBrowser> GetBrowser() override;
CefRefPtr<CefV8Context> GetV8Context() override;
void VisitDOM(CefRefPtr<CefDOMVisitor> visitor) override;
void Detach();

6
libcef/renderer/render_frame_observer.h
View File

@@ -14,10 +14,10 @@ class RenderFrame;
class CefRenderFrameObserver : public content::RenderFrameObserver {
public:
explicit CefRenderFrameObserver(content::RenderFrame* render_frame);
virtual ~CefRenderFrameObserver();
~CefRenderFrameObserver() override;
virtual void WillReleaseScriptContext(v8::Handle<v8::Context> context,
int world_id) OVERRIDE;
void WillReleaseScriptContext(v8::Handle<v8::Context> context,
int world_id) override;
private:
DISALLOW_COPY_AND_ASSIGN(CefRenderFrameObserver);

8
libcef/renderer/render_message_filter.h
View File

@@ -14,12 +14,12 @@
class CefRenderMessageFilter : public IPC::MessageFilter {
public:
CefRenderMessageFilter();
virtual ~CefRenderMessageFilter();
~CefRenderMessageFilter() override;
// IPC::ChannelProxy::MessageFilter implementation.
virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE;
virtual void OnFilterRemoved() OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
void OnFilterAdded(IPC::Sender* sender) override;
void OnFilterRemoved() override;
bool OnMessageReceived(const IPC::Message& message) override;
private:
// Message handlers called on the IO thread.

8
libcef/renderer/render_process_observer.h
View File

@@ -15,12 +15,12 @@ struct Cef_CrossOriginWhiteListEntry_Params;
class CefRenderProcessObserver : public content::RenderProcessObserver {
public:
CefRenderProcessObserver();
virtual ~CefRenderProcessObserver();
~CefRenderProcessObserver() override;
// RenderProcessObserver implementation.
virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void WebKitInitialized() OVERRIDE;
virtual void OnRenderProcessShutdown() OVERRIDE;
bool OnControlMessageReceived(const IPC::Message& message) override;
void WebKitInitialized() override;
void OnRenderProcessShutdown() override;
private:
// Message handlers called on the render thread.

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

14
libcef/renderer/render_urlrequest_impl.h
View File

@@ -14,17 +14,17 @@ class CefRenderURLRequest : public CefURLRequest {
CefRenderURLRequest(CefRefPtr<CefRequest> request,
CefRefPtr<CefURLRequestClient> client);
virtual ~CefRenderURLRequest();
~CefRenderURLRequest() override;
bool Start();
// CefURLRequest methods.
virtual CefRefPtr<CefRequest> GetRequest() OVERRIDE;
virtual CefRefPtr<CefURLRequestClient> GetClient() OVERRIDE;
virtual Status GetRequestStatus() OVERRIDE;
virtual ErrorCode GetRequestError() OVERRIDE;
virtual CefRefPtr<CefResponse> GetResponse() OVERRIDE;
virtual void Cancel() OVERRIDE;
CefRefPtr<CefRequest> GetRequest() override;
CefRefPtr<CefURLRequestClient> GetClient() override;
Status GetRequestStatus() override;
ErrorCode GetRequestError() override;
CefRefPtr<CefResponse> GetResponse() override;
void Cancel() override;
private:
bool VerifyContext();

20
libcef/renderer/v8_impl.cc
View File

@@ -577,9 +577,9 @@ class ExtensionWrapper : public v8::Extension {
: v8::Extension(extension_name, javascript_code), handler_(handler) {
}
virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate(
v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate(
v8::Isolate* isolate,
v8::Handle<v8::String> name) OVERRIDE {
v8::Handle<v8::String> name) override {
if (!handler_)
return v8::Handle<v8::FunctionTemplate>();
@@ -616,14 +616,14 @@ class CefV8ExceptionImpl : public CefV8Exception {
end_column_ = message->GetEndColumn();
}
virtual CefString GetMessage() OVERRIDE { return message_; }
virtual CefString GetSourceLine() OVERRIDE { return source_line_; }
virtual CefString GetScriptResourceName() OVERRIDE { return script_; }
virtual int GetLineNumber() OVERRIDE { return line_number_; }
virtual int GetStartPosition() OVERRIDE { return start_position_; }
virtual int GetEndPosition() OVERRIDE { return end_position_; }
virtual int GetStartColumn() OVERRIDE { return start_column_; }
virtual int GetEndColumn() OVERRIDE { return end_column_; }
CefString GetMessage() override { return message_; }
CefString GetSourceLine() override { return source_line_; }
CefString GetScriptResourceName() override { return script_; }
int GetLineNumber() override { return line_number_; }
int GetStartPosition() override { return start_position_; }
int GetEndPosition() override { return end_position_; }
int GetStartColumn() override { return start_column_; }
int GetEndColumn() override { return end_column_; }
protected:
CefString message_;

172
libcef/renderer/v8_impl.h
View File

@@ -43,7 +43,6 @@ void CefV8SetWorkerAttributes(int worker_id, const GURL& worker_url);
class CefV8ContextState : public base::RefCounted<CefV8ContextState> {
public:
CefV8ContextState() : valid_(true) {}
virtual ~CefV8ContextState() {}
bool IsValid() { return valid_; }
void Detach() {
@@ -63,6 +62,10 @@ class CefV8ContextState : public base::RefCounted<CefV8ContextState> {
}
private:
friend class base::RefCounted<CefV8ContextState>;
~CefV8ContextState() {}
bool valid_;
CefTrackManager track_manager_;
};
@@ -92,8 +95,6 @@ class CefV8HandleBase :
public base::RefCountedThreadSafe<CefV8HandleBase,
CefV8DeleteOnMessageLoopThread> {
public:
virtual ~CefV8HandleBase();
// Returns true if there is no underlying context or if the underlying context
// is valid.
bool IsValid() const {
@@ -108,10 +109,16 @@ class CefV8HandleBase :
}
protected:
friend class base::DeleteHelper<CefV8HandleBase>;
friend class base::RefCountedThreadSafe<CefV8HandleBase,
CefV8DeleteOnMessageLoopThread>;
friend struct CefV8DeleteOnMessageLoopThread;
// |context| is the context that owns this handle. If empty the current
// context will be used.
CefV8HandleBase(v8::Isolate* isolate,
v8::Handle<v8::Context> context);
virtual ~CefV8HandleBase();
protected:
v8::Isolate* isolate_;
@@ -133,9 +140,6 @@ class CefV8Handle : public CefV8HandleBase {
: CefV8HandleBase(isolate, context),
handle_(isolate, v) {
}
virtual ~CefV8Handle() {
handle_.Reset();
}
handleType GetNewV8Handle() {
DCHECK(IsValid());
@@ -147,6 +151,10 @@ class CefV8Handle : public CefV8HandleBase {
}
protected:
~CefV8Handle() override {
handle_.Reset();
}
persistentType handle_;
DISALLOW_COPY_AND_ASSIGN(CefV8Handle);
@@ -163,19 +171,19 @@ class CefV8ContextImpl : public CefV8Context {
public:
CefV8ContextImpl(v8::Isolate* isolate,
v8::Handle<v8::Context> context);
virtual ~CefV8ContextImpl();
~CefV8ContextImpl() override;
virtual CefRefPtr<CefTaskRunner> GetTaskRunner() OVERRIDE;
virtual bool IsValid() OVERRIDE;
virtual CefRefPtr<CefBrowser> GetBrowser() OVERRIDE;
virtual CefRefPtr<CefFrame> GetFrame() OVERRIDE;
virtual CefRefPtr<CefV8Value> GetGlobal() OVERRIDE;
virtual bool Enter() OVERRIDE;
virtual bool Exit() OVERRIDE;
virtual bool IsSame(CefRefPtr<CefV8Context> that) OVERRIDE;
virtual bool Eval(const CefString& code,
CefRefPtr<CefV8Value>& retval,
CefRefPtr<CefV8Exception>& exception) OVERRIDE;
CefRefPtr<CefTaskRunner> GetTaskRunner() override;
bool IsValid() override;
CefRefPtr<CefBrowser> GetBrowser() override;
CefRefPtr<CefFrame> GetFrame() override;
CefRefPtr<CefV8Value> GetGlobal() override;
bool Enter() override;
bool Exit() override;
bool IsSame(CefRefPtr<CefV8Context> that) override;
bool Eval(const CefString& code,
CefRefPtr<CefV8Value>& retval,
CefRefPtr<CefV8Exception>& exception) override;
v8::Handle<v8::Context> GetV8Context();
blink::WebFrame* GetWebFrame();
@@ -198,7 +206,7 @@ class CefV8ValueImpl : public CefV8Value {
explicit CefV8ValueImpl(v8::Isolate* isolate);
CefV8ValueImpl(v8::Isolate* isolate,
v8::Handle<v8::Value> value);
virtual ~CefV8ValueImpl();
~CefV8ValueImpl() override;
// Used for initializing the CefV8ValueImpl. Should be called a single time
// after the CefV8ValueImpl is created.
@@ -217,57 +225,57 @@ class CefV8ValueImpl : public CefV8Value {
// object handle.
v8::Handle<v8::Value> GetV8Value(bool should_persist);
virtual bool IsValid() OVERRIDE;
virtual bool IsUndefined() OVERRIDE;
virtual bool IsNull() OVERRIDE;
virtual bool IsBool() OVERRIDE;
virtual bool IsInt() OVERRIDE;
virtual bool IsUInt() OVERRIDE;
virtual bool IsDouble() OVERRIDE;
virtual bool IsDate() OVERRIDE;
virtual bool IsString() OVERRIDE;
virtual bool IsObject() OVERRIDE;
virtual bool IsArray() OVERRIDE;
virtual bool IsFunction() OVERRIDE;
virtual bool IsSame(CefRefPtr<CefV8Value> value) OVERRIDE;
virtual bool GetBoolValue() OVERRIDE;
virtual int32 GetIntValue() OVERRIDE;
virtual uint32 GetUIntValue() OVERRIDE;
virtual double GetDoubleValue() OVERRIDE;
virtual CefTime GetDateValue() OVERRIDE;
virtual CefString GetStringValue() OVERRIDE;
virtual bool IsUserCreated() OVERRIDE;
virtual bool HasException() OVERRIDE;
virtual CefRefPtr<CefV8Exception> GetException() OVERRIDE;
virtual bool ClearException() OVERRIDE;
virtual bool WillRethrowExceptions() OVERRIDE;
virtual bool SetRethrowExceptions(bool rethrow) OVERRIDE;
virtual bool HasValue(const CefString& key) OVERRIDE;
virtual bool HasValue(int index) OVERRIDE;
virtual bool DeleteValue(const CefString& key) OVERRIDE;
virtual bool DeleteValue(int index) OVERRIDE;
virtual CefRefPtr<CefV8Value> GetValue(const CefString& key) OVERRIDE;
virtual CefRefPtr<CefV8Value> GetValue(int index) OVERRIDE;
virtual bool SetValue(const CefString& key, CefRefPtr<CefV8Value> value,
PropertyAttribute attribute) OVERRIDE;
virtual bool SetValue(int index, CefRefPtr<CefV8Value> value) OVERRIDE;
virtual bool SetValue(const CefString& key, AccessControl settings,
PropertyAttribute attribute) OVERRIDE;
virtual bool GetKeys(std::vector<CefString>& keys) OVERRIDE;
virtual bool SetUserData(CefRefPtr<CefBase> user_data) OVERRIDE;
virtual CefRefPtr<CefBase> GetUserData() OVERRIDE;
virtual int GetExternallyAllocatedMemory() OVERRIDE;
virtual int AdjustExternallyAllocatedMemory(int change_in_bytes) OVERRIDE;
virtual int GetArrayLength() OVERRIDE;
virtual CefString GetFunctionName() OVERRIDE;
virtual CefRefPtr<CefV8Handler> GetFunctionHandler() OVERRIDE;
virtual CefRefPtr<CefV8Value> ExecuteFunction(
bool IsValid() override;
bool IsUndefined() override;
bool IsNull() override;
bool IsBool() override;
bool IsInt() override;
bool IsUInt() override;
bool IsDouble() override;
bool IsDate() override;
bool IsString() override;
bool IsObject() override;
bool IsArray() override;
bool IsFunction() override;
bool IsSame(CefRefPtr<CefV8Value> value) override;
bool GetBoolValue() override;
int32 GetIntValue() override;
uint32 GetUIntValue() override;
double GetDoubleValue() override;
CefTime GetDateValue() override;
CefString GetStringValue() override;
bool IsUserCreated() override;
bool HasException() override;
CefRefPtr<CefV8Exception> GetException() override;
bool ClearException() override;
bool WillRethrowExceptions() override;
bool SetRethrowExceptions(bool rethrow) override;
bool HasValue(const CefString& key) override;
bool HasValue(int index) override;
bool DeleteValue(const CefString& key) override;
bool DeleteValue(int index) override;
CefRefPtr<CefV8Value> GetValue(const CefString& key) override;
CefRefPtr<CefV8Value> GetValue(int index) override;
bool SetValue(const CefString& key, CefRefPtr<CefV8Value> value,
PropertyAttribute attribute) override;
bool SetValue(int index, CefRefPtr<CefV8Value> value) override;
bool SetValue(const CefString& key, AccessControl settings,
PropertyAttribute attribute) override;
bool GetKeys(std::vector<CefString>& keys) override;
bool SetUserData(CefRefPtr<CefBase> user_data) override;
CefRefPtr<CefBase> GetUserData() override;
int GetExternallyAllocatedMemory() override;
int AdjustExternallyAllocatedMemory(int change_in_bytes) override;
int GetArrayLength() override;
CefString GetFunctionName() override;
CefRefPtr<CefV8Handler> GetFunctionHandler() override;
CefRefPtr<CefV8Value> ExecuteFunction(
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments) OVERRIDE;
virtual CefRefPtr<CefV8Value> ExecuteFunctionWithContext(
const CefV8ValueList& arguments) override;
CefRefPtr<CefV8Value> ExecuteFunctionWithContext(
CefRefPtr<CefV8Context> context,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments) OVERRIDE;
const CefV8ValueList& arguments) override;
protected:
// Test for and record any exception.
@@ -282,7 +290,6 @@ class CefV8ValueImpl : public CefV8Value {
v8::Handle<v8::Context> context,
handleType v,
CefTrackNode* tracker);
virtual ~Handle();
handleType GetNewV8Handle(bool should_persist);
@@ -290,6 +297,9 @@ class CefV8ValueImpl : public CefV8Value {
void SetWeakIfNecessary();
protected:
~Handle() override;
private:
// Callback for weak persistent reference destruction.
static void Destructor(const v8::WeakCallbackData<v8::Value, Handle>& data);
@@ -347,11 +357,11 @@ class CefV8StackTraceImpl : public CefV8StackTrace {
public:
CefV8StackTraceImpl(v8::Isolate* isolate,
v8::Handle<v8::StackTrace> handle);
virtual ~CefV8StackTraceImpl();
~CefV8StackTraceImpl() override;
virtual bool IsValid() OVERRIDE;
virtual int GetFrameCount() OVERRIDE;
virtual CefRefPtr<CefV8StackFrame> GetFrame(int index) OVERRIDE;
bool IsValid() override;
int GetFrameCount() override;
CefRefPtr<CefV8StackFrame> GetFrame(int index) override;
protected:
std::vector<CefRefPtr<CefV8StackFrame> > frames_;
@@ -364,16 +374,16 @@ class CefV8StackFrameImpl : public CefV8StackFrame {
public:
CefV8StackFrameImpl(v8::Isolate* isolate,
v8::Handle<v8::StackFrame> handle);
virtual ~CefV8StackFrameImpl();
~CefV8StackFrameImpl() override;
virtual bool IsValid() OVERRIDE;
virtual CefString GetScriptName() OVERRIDE;
virtual CefString GetScriptNameOrSourceURL() OVERRIDE;
virtual CefString GetFunctionName() OVERRIDE;
virtual int GetLineNumber() OVERRIDE;
virtual int GetColumn() OVERRIDE;
virtual bool IsEval() OVERRIDE;
virtual bool IsConstructor() OVERRIDE;
bool IsValid() override;
CefString GetScriptName() override;
CefString GetScriptNameOrSourceURL() override;
CefString GetFunctionName() override;
int GetLineNumber() override;
int GetColumn() override;
bool IsEval() override;
bool IsConstructor() override;
protected:
CefString script_name_;