| 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 4362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4373 | 4373 |
| 4374 void RenderViewImpl::ShowContextMenu(WebKit::WebFrame* frame, | 4374 void RenderViewImpl::ShowContextMenu(WebKit::WebFrame* frame, |
| 4375 const WebKit::WebContextMenuData& data) { | 4375 const WebKit::WebContextMenuData& data) { |
| 4376 showContextMenu(frame, data); | 4376 showContextMenu(frame, data); |
| 4377 } | 4377 } |
| 4378 | 4378 |
| 4379 WebKit::WebPageVisibilityState RenderViewImpl::GetVisibilityState() const { | 4379 WebKit::WebPageVisibilityState RenderViewImpl::GetVisibilityState() const { |
| 4380 return visibilityState(); | 4380 return visibilityState(); |
| 4381 } | 4381 } |
| 4382 | 4382 |
| 4383 WebKit::WebUserMediaClient *RenderViewImpl::GetUserMediaClient() { |
| 4384 return userMediaClient(); |
| 4385 } |
| 4386 |
| 4383 void RenderViewImpl::RunModalAlertDialog(WebKit::WebFrame* frame, | 4387 void RenderViewImpl::RunModalAlertDialog(WebKit::WebFrame* frame, |
| 4384 const WebKit::WebString& message) { | 4388 const WebKit::WebString& message) { |
| 4385 return runModalAlertDialog(frame, message); | 4389 return runModalAlertDialog(frame, message); |
| 4386 } | 4390 } |
| 4387 | 4391 |
| 4388 void RenderViewImpl::LoadURLExternally( | 4392 void RenderViewImpl::LoadURLExternally( |
| 4389 WebKit::WebFrame* frame, | 4393 WebKit::WebFrame* frame, |
| 4390 const WebKit::WebURLRequest& request, | 4394 const WebKit::WebURLRequest& request, |
| 4391 WebKit::WebNavigationPolicy policy) { | 4395 WebKit::WebNavigationPolicy policy) { |
| 4392 loadURLExternally(frame, request, policy); | 4396 loadURLExternally(frame, request, policy); |
| (...skipping 1891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6284 | 6288 |
| 6285 updating_frame_tree_ = true; | 6289 updating_frame_tree_ = true; |
| 6286 active_frame_id_map_.clear(); | 6290 active_frame_id_map_.clear(); |
| 6287 | 6291 |
| 6288 target_process_id_ = process_id; | 6292 target_process_id_ = process_id; |
| 6289 target_routing_id_ = route_id; | 6293 target_routing_id_ = route_id; |
| 6290 CreateFrameTree(webview()->mainFrame(), frames); | 6294 CreateFrameTree(webview()->mainFrame(), frames); |
| 6291 | 6295 |
| 6292 updating_frame_tree_ = false; | 6296 updating_frame_tree_ = false; |
| 6293 } | 6297 } |
| OLD | NEW |