mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Canvas classes moved from gfx namespace to skia namespace. - Include files moved from WebKit/port to third_party/WebKit. - Add IsMediaPlayerAvailable() webkit_glue function. - WebWidgetDelegate::GetContainingWindow() changed to WebWidgetDelegate::GetContainingView(). - Changed HCURSOR to WebCursor and HWND to gfx::NativeWindow. - WebPluginInfo 'file' member changed to 'path'. - Use base::LazyInstance for static object in BrowserPluginInstance (should be done at some point for BrowserPluginLib and BrowserPluginList as well). - BrowserPluginStream::Open() adds additional 'request_is_seekable' parameter. - Add PLUGIN_QUIRK_PATCH_SETCURSOR support to BrowserWebPluginDelegateImpl. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@6 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -41,8 +41,6 @@
|
||||
// WebViewDelegate -----------------------------------------------------------
|
||||
|
||||
BrowserWebViewDelegate::~BrowserWebViewDelegate() {
|
||||
if (custom_cursor_)
|
||||
DestroyIcon(custom_cursor_);
|
||||
RevokeDragDrop(browser_->UIT_GetWebViewWndHandle());
|
||||
}
|
||||
|
||||
@@ -52,7 +50,7 @@ WebPluginDelegate* BrowserWebViewDelegate::CreatePluginDelegate(
|
||||
const std::string& mime_type,
|
||||
const std::string& clsid,
|
||||
std::string* actual_mime_type) {
|
||||
HWND hwnd = GetContainingWindow(webview);
|
||||
HWND hwnd = GetContainingView(webview);
|
||||
if (!hwnd)
|
||||
return NULL;
|
||||
|
||||
@@ -64,9 +62,9 @@ WebPluginDelegate* BrowserWebViewDelegate::CreatePluginDelegate(
|
||||
allow_wildcard, &info,
|
||||
actual_mime_type)) {
|
||||
if (actual_mime_type && !actual_mime_type->empty())
|
||||
return WebPluginDelegateImpl::Create(info.file, *actual_mime_type, hwnd);
|
||||
return WebPluginDelegateImpl::Create(info.path, *actual_mime_type, hwnd);
|
||||
else
|
||||
return WebPluginDelegateImpl::Create(info.file, mime_type, hwnd);
|
||||
return WebPluginDelegateImpl::Create(info.path, mime_type, hwnd);
|
||||
}
|
||||
|
||||
// second, look for plugins using the embedded plugin list
|
||||
@@ -107,17 +105,9 @@ void BrowserWebViewDelegate::CloseWidgetSoon(WebWidget* webwidget) {
|
||||
void BrowserWebViewDelegate::SetCursor(WebWidget* webwidget,
|
||||
const WebCursor& cursor) {
|
||||
if (WebWidgetHost* host = GetHostForWidget(webwidget)) {
|
||||
if (custom_cursor_) {
|
||||
DestroyIcon(custom_cursor_);
|
||||
custom_cursor_ = NULL;
|
||||
}
|
||||
if (cursor.IsCustom()) {
|
||||
custom_cursor_ = cursor.GetCustomCursor();
|
||||
host->SetCursor(custom_cursor_);
|
||||
} else {
|
||||
HINSTANCE mod_handle = GetModuleHandle(NULL);
|
||||
host->SetCursor(cursor.GetCursor(mod_handle));
|
||||
}
|
||||
current_cursor_ = cursor;
|
||||
HINSTANCE mod_handle = GetModuleHandle(NULL);
|
||||
host->SetCursor(current_cursor_.GetCursor(mod_handle));
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user