mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- security_info attribute added to OnCompletedRequest() in ResourceLoaderBridge. - More functions moved into webkit_glue::WebKitClientImpl. - First parameter of WebViewDelegate::RunJavaScript*() methods changed from WebView pointer to WebFrame pointer. - np_v8object.h renamed to NPV8Object.h and other related naming changes. - Add support for v8 gears and interval extensions. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@21 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -311,17 +311,17 @@ void BrowserWebViewDelegate::AddMessageToConsole(WebView* webview,
|
||||
<< ")";
|
||||
}
|
||||
|
||||
void BrowserWebViewDelegate::RunJavaScriptAlert(WebView* webview,
|
||||
void BrowserWebViewDelegate::RunJavaScriptAlert(WebFrame* webframe,
|
||||
const std::wstring& message) {
|
||||
CefHandler::RetVal rv = RV_CONTINUE;
|
||||
CefRefPtr<CefHandler> handler = browser_->GetHandler();
|
||||
if(handler.get())
|
||||
rv = handler->HandleJSAlert(browser_, message);
|
||||
if(rv != RV_HANDLED)
|
||||
ShowJavaScriptAlert(webview, message);
|
||||
ShowJavaScriptAlert(webframe, message);
|
||||
}
|
||||
|
||||
bool BrowserWebViewDelegate::RunJavaScriptConfirm(WebView* webview,
|
||||
bool BrowserWebViewDelegate::RunJavaScriptConfirm(WebFrame* webframe,
|
||||
const std::wstring& message) {
|
||||
CefHandler::RetVal rv = RV_CONTINUE;
|
||||
bool retval = false;
|
||||
@@ -329,11 +329,11 @@ bool BrowserWebViewDelegate::RunJavaScriptConfirm(WebView* webview,
|
||||
if(handler.get())
|
||||
rv = handler->HandleJSConfirm(browser_, message, retval);
|
||||
if(rv != RV_HANDLED)
|
||||
retval = ShowJavaScriptConfirm(webview, message);
|
||||
retval = ShowJavaScriptConfirm(webframe, message);
|
||||
return retval;
|
||||
}
|
||||
|
||||
bool BrowserWebViewDelegate::RunJavaScriptPrompt(WebView* webview,
|
||||
bool BrowserWebViewDelegate::RunJavaScriptPrompt(WebFrame* webframe,
|
||||
const std::wstring& message, const std::wstring& default_value,
|
||||
std::wstring* result) {
|
||||
CefHandler::RetVal rv = RV_CONTINUE;
|
||||
@@ -344,7 +344,7 @@ bool BrowserWebViewDelegate::RunJavaScriptPrompt(WebView* webview,
|
||||
retval, *result);
|
||||
}
|
||||
if(rv != RV_HANDLED)
|
||||
retval = ShowJavaScriptPrompt(webview, message, default_value, result);
|
||||
retval = ShowJavaScriptPrompt(webframe, message, default_value, result);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user