projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
browser
/
frame_host
/
render_widget_host_view_child_frame.cc
diff --git
a/src/content/browser/frame_host/render_widget_host_view_child_frame.cc
b/src/content/browser/frame_host/render_widget_host_view_child_frame.cc
index
182fda1
..
4ca79c1
100644
(file)
--- a/
src/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/
src/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@
-165,6
+165,8
@@
void RenderWidgetHostViewChildFrame::TextInputTypeChanged(
void RenderWidgetHostViewChildFrame::RenderProcessGone(
base::TerminationStatus status,
int error_code) {
void RenderWidgetHostViewChildFrame::RenderProcessGone(
base::TerminationStatus status,
int error_code) {
+ if (frame_connector_)
+ frame_connector_->RenderProcessGone();
}
void RenderWidgetHostViewChildFrame::Destroy() {
}
void RenderWidgetHostViewChildFrame::Destroy() {
@@
-287,10
+289,6
@@
void RenderWidgetHostViewChildFrame::ShowDisambiguationPopup(
const gfx::Rect& target_rect,
const SkBitmap& zoomed_bitmap) {
}
const gfx::Rect& target_rect,
const SkBitmap& zoomed_bitmap) {
}
-
-void RenderWidgetHostViewChildFrame::HasTouchEventHandlers(
- bool need_touch_events) {
-}
#endif // defined(OS_ANDROID)
#if defined(TOOLKIT_GTK)
#endif // defined(OS_ANDROID)
#if defined(TOOLKIT_GTK)
@@
-362,6
+360,6
@@
gfx::NativeViewId RenderWidgetHostViewChildFrame::GetParentForWindowlessPlugin()
const {
return NULL;
}
const {
return NULL;
}
-#endif // defined(OS_WIN)
&& defined(USE_AURA)
+#endif // defined(OS_WIN)
} // namespace content
} // namespace content