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/browser/renderer_host/render_message_filter.h" | 5 #include "content/browser/renderer_host/render_message_filter.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 #if defined(OS_WIN) | 436 #if defined(OS_WIN) |
437 IPC_MESSAGE_HANDLER(ViewHostMsg_GetMonitorColorProfile, | 437 IPC_MESSAGE_HANDLER(ViewHostMsg_GetMonitorColorProfile, |
438 OnGetMonitorColorProfile) | 438 OnGetMonitorColorProfile) |
439 #endif | 439 #endif |
440 IPC_MESSAGE_HANDLER(ViewHostMsg_MediaLogEvents, OnMediaLogEvents) | 440 IPC_MESSAGE_HANDLER(ViewHostMsg_MediaLogEvents, OnMediaLogEvents) |
441 IPC_MESSAGE_HANDLER(ViewHostMsg_Are3DAPIsBlocked, OnAre3DAPIsBlocked) | 441 IPC_MESSAGE_HANDLER(ViewHostMsg_Are3DAPIsBlocked, OnAre3DAPIsBlocked) |
442 IPC_MESSAGE_HANDLER(ViewHostMsg_DidLose3DContext, OnDidLose3DContext) | 442 IPC_MESSAGE_HANDLER(ViewHostMsg_DidLose3DContext, OnDidLose3DContext) |
443 #if defined(OS_ANDROID) | 443 #if defined(OS_ANDROID) |
444 IPC_MESSAGE_HANDLER(ViewHostMsg_RunWebAudioMediaCodec, OnWebAudioMediaCodec) | 444 IPC_MESSAGE_HANDLER(ViewHostMsg_RunWebAudioMediaCodec, OnWebAudioMediaCodec) |
445 #endif | 445 #endif |
446 IPC_MESSAGE_HANDLER(FrameHostMsg_SetHasPendingTransitionRequest, | 446 IPC_MESSAGE_HANDLER(FrameHostMsg_AddNavigationTransitionData, |
447 OnSetHasPendingTransitionRequest) | 447 OnAddNavigationTransitionData) |
448 IPC_MESSAGE_UNHANDLED(handled = false) | 448 IPC_MESSAGE_UNHANDLED(handled = false) |
449 IPC_END_MESSAGE_MAP() | 449 IPC_END_MESSAGE_MAP() |
450 | 450 |
451 return handled; | 451 return handled; |
452 } | 452 } |
453 | 453 |
454 void RenderMessageFilter::OnDestruct() const { | 454 void RenderMessageFilter::OnDestruct() const { |
455 BrowserThread::DeleteOnIOThread::Destruct(this); | 455 BrowserThread::DeleteOnIOThread::Destruct(this); |
456 } | 456 } |
457 | 457 |
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1222 // MediaCodec bridge is slow and can block while sending the data to | 1222 // MediaCodec bridge is slow and can block while sending the data to |
1223 // the renderer. | 1223 // the renderer. |
1224 base::WorkerPool::PostTask( | 1224 base::WorkerPool::PostTask( |
1225 FROM_HERE, | 1225 FROM_HERE, |
1226 base::Bind(&media::WebAudioMediaCodecBridge::RunWebAudioMediaCodec, | 1226 base::Bind(&media::WebAudioMediaCodecBridge::RunWebAudioMediaCodec, |
1227 encoded_data_handle, pcm_output, data_size), | 1227 encoded_data_handle, pcm_output, data_size), |
1228 true); | 1228 true); |
1229 } | 1229 } |
1230 #endif | 1230 #endif |
1231 | 1231 |
1232 void RenderMessageFilter::OnSetHasPendingTransitionRequest(int render_frame_id, | 1232 |
1233 bool is_transition) { | 1233 void RenderMessageFilter::OnAddNavigationTransitionData( |
1234 TransitionRequestManager::GetInstance()->SetHasPendingTransitionRequest( | 1234 int render_frame_id, |
1235 render_process_id_, render_frame_id, is_transition); | 1235 const std::string& origin, |
| 1236 const std::string& selector, |
| 1237 const std::string& markup) { |
| 1238 TransitionRequestManager::GetInstance()->AddPendingTransitionRequestData( |
| 1239 render_process_id_, render_frame_id, origin, selector, markup); |
1236 } | 1240 } |
1237 | 1241 |
1238 } // namespace content | 1242 } // namespace content |
OLD | NEW |