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 5247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5258 IPC::PlatformFileForTransit file_for_transit, | 5258 IPC::PlatformFileForTransit file_for_transit, |
5259 int message_id) { | 5259 int message_id) { |
5260 pepper_delegate_.OnAsyncFileOpened( | 5260 pepper_delegate_.OnAsyncFileOpened( |
5261 error_code, | 5261 error_code, |
5262 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), | 5262 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), |
5263 message_id); | 5263 message_id); |
5264 } | 5264 } |
5265 | 5265 |
5266 void RenderViewImpl::OnPpapiBrokerChannelCreated( | 5266 void RenderViewImpl::OnPpapiBrokerChannelCreated( |
5267 int request_id, | 5267 int request_id, |
5268 base::ProcessHandle broker_process_handle, | |
5269 const IPC::ChannelHandle& handle) { | 5268 const IPC::ChannelHandle& handle) { |
5270 pepper_delegate_.OnPpapiBrokerChannelCreated(request_id, | 5269 pepper_delegate_.OnPpapiBrokerChannelCreated(request_id, |
5271 broker_process_handle, | |
5272 handle); | 5270 handle); |
5273 } | 5271 } |
5274 | 5272 |
5275 #if defined(OS_MACOSX) | 5273 #if defined(OS_MACOSX) |
5276 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) { | 5274 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) { |
5277 if (external_popup_menu_ == NULL) { | 5275 if (external_popup_menu_ == NULL) { |
5278 // Crash reports from the field indicate that we can be notified with a | 5276 // Crash reports from the field indicate that we can be notified with a |
5279 // NULL external popup menu (we probably get notified twice). | 5277 // NULL external popup menu (we probably get notified twice). |
5280 // If you hit this please file a bug against jcivelli and include the page | 5278 // If you hit this please file a bug against jcivelli and include the page |
5281 // and steps to repro. | 5279 // and steps to repro. |
(...skipping 25 matching lines...) Expand all Loading... |
5307 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5305 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5308 return !!RenderThreadImpl::current()->compositor_thread(); | 5306 return !!RenderThreadImpl::current()->compositor_thread(); |
5309 } | 5307 } |
5310 | 5308 |
5311 void RenderViewImpl::OnJavaBridgeInit() { | 5309 void RenderViewImpl::OnJavaBridgeInit() { |
5312 DCHECK(!java_bridge_dispatcher_.get()); | 5310 DCHECK(!java_bridge_dispatcher_.get()); |
5313 #if defined(ENABLE_JAVA_BRIDGE) | 5311 #if defined(ENABLE_JAVA_BRIDGE) |
5314 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 5312 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
5315 #endif | 5313 #endif |
5316 } | 5314 } |
OLD | NEW |