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

Merge revision 1265 changes:

Browse Source 
- Reduce locking in browser and frame implementations to avoid potential deadlocks (issue #824).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1266 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-05-31 15:35:49 +00:00
parent a168addc0b
commit 10d1018986
3 changed files with 169 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cef3/libcef/browser/frame_host_impl.h
View File

@ -8,6 +8,7 @@
#include <string>
#include "include/cef_frame.h"
#include "libcef/common/response_manager.h"
#include "base/synchronization/lock.h"
class CefBrowserHostImpl;
@ -19,7 +20,10 @@ class CefFrameHostImpl : public CefFrame {
public:
CefFrameHostImpl(CefBrowserHostImpl* browser,
int64 frame_id,
bool is_main_frame);
bool is_main_frame,
const CefString& url,
const CefString& name,
int64 parent_frame_id);
virtual ~CefFrameHostImpl();
// CefFrame methods
@ -52,9 +56,9 @@ class CefFrameHostImpl : public CefFrame {
virtual void VisitDOM(CefRefPtr<CefDOMVisitor> visitor) OVERRIDE;
void SetFocused(bool focused);
void SetURL(const CefString& url);
void SetName(const CefString& name);
void SetParentId(int64 frame_id);
void SetAttributes(const CefString& url,
const CefString& name,
int64 parent_frame_id);
// Avoids unnecessary string type conversions.
void SendJavaScript(const std::string& jsCode,
@ -71,6 +75,9 @@ class CefFrameHostImpl : public CefFrame {
static const int64 kInvalidFrameId = -4;
protected:
void SendCommand(const std::string& command,
CefRefPtr<CefResponseManager::Handler> responseHandler);
int64 frame_id_;
bool is_main_frame_;