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 70742.

Browse Source 
- Fix crash when calling CefInitialize with extra_plugins_paths specified (issue #164).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@159 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-01-07 21:34:20 +00:00
parent 874c73b1e1
commit 890200a098
36 changed files with 161 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/webwidget_host_win.cc
View File

@@ -5,9 +5,9 @@
#include "webwidget_host.h"
#include "app/win/hwnd_util.h"
#include "gfx/rect.h"
#include "base/logging.h"
#include "base/win_util.h"
#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h"
#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
@@ -54,7 +54,7 @@ WebWidgetHost* WebWidgetHost::Create(HWND parent_view,
0, 0, 0, 0,
parent_view, NULL, GetModuleHandle(NULL), NULL);
win_util::SetWindowUserData(host->view_, host);
app::win::SetWindowUserData(host->view_, host);
host->webwidget_ = WebPopupMenu::create(client);
@@ -63,7 +63,7 @@ WebWidgetHost* WebWidgetHost::Create(HWND parent_view,
/*static*/
static WebWidgetHost* FromWindow(HWND view) {
return reinterpret_cast<WebWidgetHost*>(win_util::GetWindowUserData(view));
return reinterpret_cast<WebWidgetHost*>(app::win::GetWindowUserData(view));
}
/*static*/
@@ -215,7 +215,7 @@ WebWidgetHost::WebWidgetHost()
}
WebWidgetHost::~WebWidgetHost() {
win_util::SetWindowUserData(view_, 0);
app::win::SetWindowUserData(view_, 0);
TrackMouseLeave(false);
ResetTooltip();