mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 280796.
- Mac: Remove Carbon interpose library (see http://crbug.com/157130). - Remove unused LOGSEVERITY_ERROR_REPORT value (see http://crbug.com/352378). - CefURLRequest in the render process will now always have the UR_FLAG_REPORT_LOAD_TIMING flag set (see http://crbug.com/376025#c15). - Change CefGeolocationHandler::OnRequestGeolocationPermission return value from void to boolean. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1753 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
#include "libcef/common/response_manager.h"
|
||||
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/strings/string16.h"
|
||||
#include "base/synchronization/lock.h"
|
||||
#include "content/public/browser/notification_observer.h"
|
||||
@@ -325,6 +326,11 @@ class CefBrowserHostImpl : public CefBrowserHost,
|
||||
};
|
||||
DestructionState destruction_state() const { return destruction_state_; }
|
||||
|
||||
// Used to retrieve a WeakPtr that will be invalidated when the browser is
|
||||
// destroyed. This method can only be called on, and the resulting WeakPtr
|
||||
// can only be dereferenced on, the UI thread.
|
||||
base::WeakPtr<CefBrowserHostImpl> GetWeakPtr();
|
||||
|
||||
private:
|
||||
class DevToolsWebContentsObserver;
|
||||
|
||||
@@ -414,20 +420,16 @@ class CefBrowserHostImpl : public CefBrowserHost,
|
||||
virtual void RenderViewReady() OVERRIDE;
|
||||
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
|
||||
virtual void DidCommitProvisionalLoadForFrame(
|
||||
int64 frame_id,
|
||||
const base::string16& frame_unique_name,
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
bool is_main_frame,
|
||||
const GURL& url,
|
||||
content::PageTransition transition_type,
|
||||
content::RenderViewHost* render_view_host) OVERRIDE;
|
||||
content::PageTransition transition_type) OVERRIDE;
|
||||
virtual void DidFailProvisionalLoad(
|
||||
int64 frame_id,
|
||||
const base::string16& frame_unique_name,
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
bool is_main_frame,
|
||||
const GURL& validated_url,
|
||||
int error_code,
|
||||
const base::string16& error_description,
|
||||
content::RenderViewHost* render_view_host) OVERRIDE;
|
||||
const base::string16& error_description) OVERRIDE;
|
||||
virtual void DocumentAvailableInMainFrame() OVERRIDE;
|
||||
virtual void DidFailLoad(int64 frame_id,
|
||||
const GURL& validated_url,
|
||||
@@ -652,6 +654,10 @@ class CefBrowserHostImpl : public CefBrowserHost,
|
||||
scoped_ptr<ui::XScopedCursor> invisible_cursor_;
|
||||
#endif // defined(USE_X11)
|
||||
|
||||
// Only used on the UI thread. All references will be invalidated when
|
||||
// DestroyBrowser() is called. Must be the last member.
|
||||
base::WeakPtrFactory<CefBrowserHostImpl> weak_ptr_factory_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(CefBrowserHostImpl);
|
||||
DISALLOW_EVIL_CONSTRUCTORS(CefBrowserHostImpl);
|
||||
};
|
||||
|
Reference in New Issue
Block a user