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

Browse Source 
- CefRegisterPlugin now only supports a single mime type per registration.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@186 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-02-15 18:07:24 +00:00
parent 44ca592cff
commit 163f8d6db9
78 changed files with 537 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libcef/webwidget_host_win.cc
View File

@@ -5,15 +5,15 @@
#include "webwidget_host.h"
#include "app/win/hwnd_util.h"
#include "gfx/rect.h"
#include "ui/gfx/rect.h"
#include "base/logging.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"
#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
#include "third_party/WebKit/WebKit/chromium/public/win/WebScreenInfoFactory.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h"
#include "ui/base/win/hwnd_util.h"
#include <commctrl.h>
@@ -54,7 +54,7 @@ WebWidgetHost* WebWidgetHost::Create(HWND parent_view,
0, 0, 0, 0,
parent_view, NULL, GetModuleHandle(NULL), NULL);
app::win::SetWindowUserData(host->view_, host);
ui::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*>(app::win::GetWindowUserData(view));
return reinterpret_cast<WebWidgetHost*>(ui::GetWindowUserData(view));
}
/*static*/
@@ -218,12 +218,13 @@ WebWidgetHost::WebWidgetHost()
scroll_dx_(0),
scroll_dy_(0),
tooltip_view_(NULL),
tooltip_showing_(false) {
tooltip_showing_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) {
set_painting(false);
}
WebWidgetHost::~WebWidgetHost() {
app::win::SetWindowUserData(view_, 0);
ui::SetWindowUserData(view_, 0);
TrackMouseLeave(false);
ResetTooltip();
@@ -259,6 +260,8 @@ void WebWidgetHost::Paint() {
paint_rect_.width(), paint_rect_.height(), true));
}
webwidget_->animate();
// This may result in more invalidation
webwidget_->layout();