Index: content/browser/renderer_host/render_widget_host_impl.cc |
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc |
index 93d865b4a0cae79c44829ff6986df497cf42f871..256e463b115807cb989717f5ededc76e7ac915bb 100644 |
--- a/content/browser/renderer_host/render_widget_host_impl.cc |
+++ b/content/browser/renderer_host/render_widget_host_impl.cc |
@@ -101,6 +101,22 @@ typedef base::hash_map<RenderWidgetHostID, RenderWidgetHostImpl*> |
base::LazyInstance<RoutingIDWidgetMap> g_routing_id_widget_map = |
LAZY_INSTANCE_INITIALIZER; |
+int GetInputRouterViewFlagsFromCompositorFrameMetadata( |
+ const cc::CompositorFrameMetadata metadata) { |
+ int view_flags = InputRouter::VIEW_FLAGS_NONE; |
+ |
+ if (metadata.min_page_scale_factor == metadata.max_page_scale_factor) |
+ view_flags |= InputRouter::FIXED_PAGE_SCALE; |
+ |
+ const float window_width_dip = |
+ std::ceil(metadata.page_scale_factor * metadata.viewport_size.width()); |
johnme
2014/01/15 02:15:09
Can you confirm that metadata.viewport_size.width
jdduke (slow)
2014/01/15 03:06:49
I'll double check (under basic testing the |window
jdduke (slow)
2014/01/15 21:28:50
Confirmed.
|
+ const float content_width_css = metadata.root_layer_size.width(); |
johnme
2014/01/15 02:15:09
Can you confirm that metadata.root_layer_size.widt
jdduke (slow)
2014/01/15 03:06:49
Again, I'll double check. The only difference betw
jdduke (slow)
2014/01/15 21:28:50
Confirmed.
|
+ if (content_width_css <= window_width_dip) |
+ view_flags |= InputRouter::MOBILE_VIEWPORT; |
+ |
+ return view_flags; |
+} |
+ |
// Implements the RenderWidgetHostIterator interface. It keeps a list of |
// RenderWidgetHosts, and makes sure it returns a live RenderWidgetHost at each |
// iteration (or NULL if there isn't any left). |
@@ -1499,12 +1515,8 @@ bool RenderWidgetHostImpl::OnSwapCompositorFrame( |
uint32 output_surface_id = param.a; |
param.b.AssignTo(frame.get()); |
- bool fixed_page_scale = |
- frame->metadata.min_page_scale_factor == |
- frame->metadata.max_page_scale_factor; |
- int updated_view_flags = fixed_page_scale ? InputRouter::FIXED_PAGE_SCALE |
- : InputRouter::VIEW_FLAGS_NONE; |
- input_router_->OnViewUpdated(updated_view_flags); |
+ input_router_->OnViewUpdated( |
+ GetInputRouterViewFlagsFromCompositorFrameMetadata(frame->metadata)); |
if (view_) { |
view_->OnSwapCompositorFrame(output_surface_id, frame.Pass()); |