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

Update to Chromium revision 165669.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@902 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-11-06 17:13:58 +00:00
parent 1177da898b
commit 255fdad295
28 changed files with 116 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cef1/libcef/browser_webview_delegate_win.cc
View File

@@ -253,7 +253,7 @@ void BrowserWebViewDelegate::startDragging(
drag_delegate_ = new BrowserDragDelegate(this);
drag_delegate_->StartDragging(drop_data, mask, image.getSkBitmap(),
image_offset);
gfx::Point(image_offset).OffsetFromOrigin());
}
void BrowserWebViewDelegate::runModal() {
@@ -318,25 +318,17 @@ webkit::npapi::WebPluginDelegate* BrowserWebViewDelegate::CreatePluginDelegate(
if (!host)
return NULL;
HWND hwnd;
if (!browser_->IsWindowRenderingDisabled()) {
// Parent the plugin container to the existing browser window.
hwnd = browser_->UIT_GetWebViewHost()->view_handle();
DCHECK(hwnd != NULL);
} else {
// Parent the plugin container to the main window handle provided by the
// user.
hwnd = browser_->UIT_GetMainWndHandle();
DCHECK(hwnd != NULL);
}
return WebPluginDelegateImpl::Create(file_path, mime_type, hwnd);
return WebPluginDelegateImpl::Create(file_path, mime_type);
}
void BrowserWebViewDelegate::CreatedPluginWindow(
gfx::PluginWindowHandle handle) {
if (browser_->IsWindowRenderingDisabled()) {
if (!browser_->IsWindowRenderingDisabled()) {
// Parent the plugin container to the existing browser window.
HWND parent = browser_->UIT_GetWebViewHost()->view_handle();
DCHECK(parent != NULL);
SetParent(handle, parent);
} else {
static bool registered_class = false;
if (!registered_class) {
WNDCLASSEX wcex = {0};