projects
/
platform
/
framework
/
web
/
crosswalk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
57e3d76
)
Check whether active_window_->ShellSurface() returns null or not
43/33943/2
author
Joone Hur
<joone.hur@intel.com>
Sat, 17 Jan 2015 02:36:41 +0000
(18:36 -0800)
committer
Joone Hur
<joone.hur@intel.com>
Sat, 17 Jan 2015 09:51:57 +0000
(
01:51
-0800)
This patch may prevent the xwalk crash.
Upstream patch: https://github.com/01org/ozone-wayland/pull/353
BUG=TC-2361
Change-Id: I753221b41d4584fc8123776880d9ebcbafa8cf29
src/ozone/wayland/input/text_input.cc
patch
|
blob
|
history
diff --git
a/src/ozone/wayland/input/text_input.cc
b/src/ozone/wayland/input/text_input.cc
index
4b8c70f
..
d62efe1
100644
(file)
--- a/
src/ozone/wayland/input/text_input.cc
+++ b/
src/ozone/wayland/input/text_input.cc
@@
-154,7
+154,7
@@
void WaylandTextInput::ResetIme() {
}
void WaylandTextInput::ShowInputPanel(wl_seat* input_seat) {
- if (text_input_ && active_window_) {
+ if (text_input_ && active_window_
&& active_window_->ShellSurface()
) {
wl_text_input_show_input_panel(text_input_);
wl_text_input_activate(text_input_,
input_seat,