Index: content/renderer/render_view_impl.cc |
=================================================================== |
--- content/renderer/render_view_impl.cc (revision 217537) |
+++ content/renderer/render_view_impl.cc (working copy) |
@@ -2363,6 +2363,8 @@ |
WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) { |
RenderWidget* widget = |
RenderWidget::Create(routing_id_, popup_type, screen_info_); |
+ if (device_emulation_helper_) |
+ device_emulation_helper_->PopupCreated(this, widget); |
return widget->webwidget(); |
} |
@@ -2440,6 +2442,26 @@ |
plugin->initializeFrame(main_render_frame_.get()); |
} |
+void RenderViewImpl::emulateDevice( |
+ bool enabled, |
+ const WebKit::WebSize& device_size, |
+ const WebKit::WebRect& view_rect, |
+ float device_scale_factor, |
+ bool fit_to_view) { |
+ if (enabled && webview()) { |
+ webview()->settings()->setViewportEnabled(true); |
+ webview()->enableFixedLayoutMode(true); |
+ webview()->settings()->setForceCompositingMode(true); |
+ } |
+ EmulateDevice(enabled, gfx::Size(device_size), gfx::Rect(view_rect), |
+ device_scale_factor, fit_to_view); |
+ if (!enabled && webview()) { |
+ webview()->settings()->setForceCompositingMode(false); |
aelias_OOO_until_Jul13
2013/09/05 08:26:49
This one is usually true on desktop as well, this
dgozman
2013/09/10 19:54:02
Nice catch, thanks!
|
+ webview()->enableFixedLayoutMode(false); |
+ webview()->settings()->setViewportEnabled(false); |
+ } |
+} |
+ |
void RenderViewImpl::didStartLoading() { |
if (is_loading_) { |
DVLOG(1) << "didStartLoading called while loading"; |