OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1189 | 1189 |
1190 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { | 1190 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { |
1191 EnsureWebKitInitialized(); | 1191 EnsureWebKitInitialized(); |
1192 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 1192 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
1193 RenderViewImpl::Create( | 1193 RenderViewImpl::Create( |
1194 params.opener_route_id, | 1194 params.opener_route_id, |
1195 params.renderer_preferences, | 1195 params.renderer_preferences, |
1196 params.web_preferences, | 1196 params.web_preferences, |
1197 new SharedRenderViewCounter(0), | 1197 new SharedRenderViewCounter(0), |
1198 params.view_id, | 1198 params.view_id, |
| 1199 params.main_frame_routing_id, |
1199 params.surface_id, | 1200 params.surface_id, |
1200 params.session_storage_namespace_id, | 1201 params.session_storage_namespace_id, |
1201 params.frame_name, | 1202 params.frame_name, |
1202 false, | 1203 false, |
1203 params.swapped_out, | 1204 params.swapped_out, |
1204 params.next_page_id, | 1205 params.next_page_id, |
1205 params.screen_info, | 1206 params.screen_info, |
1206 params.accessibility_mode, | 1207 params.accessibility_mode, |
1207 params.allow_partial_swap); | 1208 params.allow_partial_swap); |
1208 } | 1209 } |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1330 | 1331 |
1331 void RenderThreadImpl::SetFlingCurveParameters( | 1332 void RenderThreadImpl::SetFlingCurveParameters( |
1332 const std::vector<float>& new_touchpad, | 1333 const std::vector<float>& new_touchpad, |
1333 const std::vector<float>& new_touchscreen) { | 1334 const std::vector<float>& new_touchscreen) { |
1334 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1335 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1335 new_touchscreen); | 1336 new_touchscreen); |
1336 | 1337 |
1337 } | 1338 } |
1338 | 1339 |
1339 } // namespace content | 1340 } // namespace content |
OLD | NEW |