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 a106f0ab (#464641)

Browse Source 
- Remove CefWindowInfo.transparent_painting_enabled. Set
  CefBrowserSettings.background_color to an opaque or transparent
  value instead.
This commit is contained in:
Marshall Greenblatt
2017-04-20 15:28:17 -04:00
parent 2f6475c0d8
commit 3f71138d64
151 changed files with 2756 additions and 2295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libcef/browser/browser_util.cc
View File

@ -10,17 +10,17 @@ namespace browser_util {
bool GetCefKeyEvent(const content::NativeWebKeyboardEvent& event,
CefKeyEvent& cef_event) {
switch (event.type()) {
case blink::WebKeyboardEvent::RawKeyDown:
switch (event.GetType()) {
case blink::WebKeyboardEvent::kRawKeyDown:
cef_event.type = KEYEVENT_RAWKEYDOWN;
break;
case blink::WebKeyboardEvent::KeyDown:
case blink::WebKeyboardEvent::kKeyDown:
cef_event.type = KEYEVENT_KEYDOWN;
break;
case blink::WebKeyboardEvent::KeyUp:
case blink::WebKeyboardEvent::kKeyUp:
cef_event.type = KEYEVENT_KEYUP;
break;
case blink::WebKeyboardEvent::Char:
case blink::WebKeyboardEvent::kChar:
cef_event.type = KEYEVENT_CHAR;
break;
default:
@ -28,22 +28,22 @@ bool GetCefKeyEvent(const content::NativeWebKeyboardEvent& event,
}
cef_event.modifiers = 0;
if (event.modifiers() & blink::WebKeyboardEvent::ShiftKey)
if (event.GetModifiers() & blink::WebKeyboardEvent::kShiftKey)
cef_event.modifiers |= EVENTFLAG_SHIFT_DOWN;
if (event.modifiers() & blink::WebKeyboardEvent::ControlKey)
if (event.GetModifiers() & blink::WebKeyboardEvent::kControlKey)
cef_event.modifiers |= EVENTFLAG_CONTROL_DOWN;
if (event.modifiers() & blink::WebKeyboardEvent::AltKey)
if (event.GetModifiers() & blink::WebKeyboardEvent::kAltKey)
cef_event.modifiers |= EVENTFLAG_ALT_DOWN;
if (event.modifiers() & blink::WebKeyboardEvent::MetaKey)
if (event.GetModifiers() & blink::WebKeyboardEvent::kMetaKey)
cef_event.modifiers |= EVENTFLAG_COMMAND_DOWN;
if (event.modifiers() & blink::WebKeyboardEvent::IsKeyPad)
if (event.GetModifiers() & blink::WebKeyboardEvent::kIsKeyPad)
cef_event.modifiers |= EVENTFLAG_IS_KEY_PAD;
cef_event.windows_key_code = event.windowsKeyCode;
cef_event.native_key_code = event.nativeKeyCode;
cef_event.is_system_key = event.isSystemKey;
cef_event.windows_key_code = event.windows_key_code;
cef_event.native_key_code = event.native_key_code;
cef_event.is_system_key = event.is_system_key;
cef_event.character = event.text[0];
cef_event.unmodified_character = event.unmodifiedText[0];
cef_event.unmodified_character = event.unmodified_text[0];
return true;
}