Upstream version 9.37.195.0

[platform/framework/web/crosswalk.git] / src / content / renderer / render_widget.cc

diff --git a/src/content/renderer/render_widget.cc b/src/content/renderer/render_widget.cc
index e5ea9a6..8dfd4aa 100644 (file)
--- a/src/content/renderer/render_widget.cc
+++ b/src/content/renderer/render_widget.cc
@@ -397,7 +397,8 @@ RenderWidget::RenderWidget(blink::WebPopupType popup_type,
 #endif
       popup_origin_scale_for_emulation_(0.f),
       resizing_mode_selector_(new ResizingModeSelector()),
-      context_menu_source_type_(ui::MENU_SOURCE_MOUSE) {
+      context_menu_source_type_(ui::MENU_SOURCE_MOUSE),
+      has_host_context_menu_location_(false) {
   if (!swapped_out)
     RenderProcess::current()->AddRefProcess();
   DCHECK(RenderThread::Get());
@@ -1320,6 +1321,7 @@ void RenderWidget::QueueSyntheticGesture(
 }
 
 void RenderWidget::Close() {
+  screen_metrics_emulator_.reset();
   if (webwidget_) {
     webwidget_->willCloseLayerTreeView();
     compositor_.reset();