mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Add unique IDs for browser instances because ResourceLoaderBridge::Create() now receives a routing ID instead of a WebFrame pointer. The unique ID is assigned to a browser in CefContext::AddBrowser() and attached to a request in BrowserWebViewDelegate::WillSendRequest(). - Add upload progress notification support to resource loader bridge. - WebFrame::ExecuteJavaScript() changed to WebFrame::ExecuteScript(). - More functions moved into webkit_glue::WebKitClientImpl. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@22 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -10,13 +10,15 @@
|
||||
|
||||
#include "base/string_util.h"
|
||||
#include "webkit/glue/webframe.h"
|
||||
#include "webkit/glue/webscriptsource.h"
|
||||
|
||||
|
||||
CefBrowserImpl::CefBrowserImpl(CefWindowInfo& windowInfo, bool popup,
|
||||
CefRefPtr<CefHandler> handler,
|
||||
const std::wstring& url)
|
||||
: window_info_(windowInfo), is_popup_(popup), is_modal_(false),
|
||||
handler_(handler), webviewhost_(NULL), popuphost_(NULL), url_(url)
|
||||
handler_(handler), webviewhost_(NULL), popuphost_(NULL), url_(url),
|
||||
unique_id_(0)
|
||||
{
|
||||
delegate_ = new BrowserWebViewDelegate(this);
|
||||
nav_controller_.reset(new BrowserNavigationController(this));
|
||||
@ -451,7 +453,9 @@ void CefBrowserImpl::UIT_ExecuteJavaScript(const std::wstring& js_code,
|
||||
else
|
||||
frame = UIT_GetWebView()->GetMainFrame();
|
||||
|
||||
frame->ExecuteJavaScript(WideToUTF8(js_code), GURL(script_url), start_line);
|
||||
frame->ExecuteScript(
|
||||
webkit_glue::WebScriptSource(WideToUTF8(js_code), GURL(script_url),
|
||||
start_line));
|
||||
}
|
||||
|
||||
void CefBrowserImpl::UIT_GoBackOrForward(int offset)
|
||||
|
Reference in New Issue
Block a user