OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/frame_host/cross_process_frame_connector.h" | 5 #include "content/browser/frame_host/cross_process_frame_connector.h" |
6 | 6 |
7 #include "cc/surfaces/surface.h" | 7 #include "cc/surfaces/surface.h" |
8 #include "cc/surfaces/surface_hittest.h" | 8 #include "cc/surfaces/surface_hittest.h" |
9 #include "cc/surfaces/surface_manager.h" | 9 #include "cc/surfaces/surface_manager.h" |
10 #include "content/browser/compositor/surface_utils.h" | 10 #include "content/browser/compositor/surface_utils.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 frame_proxy_in_parent_renderer_->Send(new FrameMsg_SetChildFrameSurface( | 94 frame_proxy_in_parent_renderer_->Send(new FrameMsg_SetChildFrameSurface( |
95 frame_proxy_in_parent_renderer_->GetRoutingID(), surface_id, frame_size, | 95 frame_proxy_in_parent_renderer_->GetRoutingID(), surface_id, frame_size, |
96 scale_factor, sequence)); | 96 scale_factor, sequence)); |
97 } | 97 } |
98 | 98 |
99 void CrossProcessFrameConnector::OnSatisfySequence( | 99 void CrossProcessFrameConnector::OnSatisfySequence( |
100 const cc::SurfaceSequence& sequence) { | 100 const cc::SurfaceSequence& sequence) { |
101 std::vector<uint32_t> sequences; | 101 std::vector<uint32_t> sequences; |
102 sequences.push_back(sequence.sequence); | 102 sequences.push_back(sequence.sequence); |
103 cc::SurfaceManager* manager = GetSurfaceManager(); | 103 cc::SurfaceManager* manager = GetSurfaceManager(); |
104 manager->DidSatisfySequences(sequence.client_id, &sequences); | 104 manager->DidSatisfySequences(sequence.frame_sink_id, &sequences); |
105 } | 105 } |
106 | 106 |
107 void CrossProcessFrameConnector::OnRequireSequence( | 107 void CrossProcessFrameConnector::OnRequireSequence( |
108 const cc::SurfaceId& id, | 108 const cc::SurfaceId& id, |
109 const cc::SurfaceSequence& sequence) { | 109 const cc::SurfaceSequence& sequence) { |
110 cc::SurfaceManager* manager = GetSurfaceManager(); | 110 cc::SurfaceManager* manager = GetSurfaceManager(); |
111 cc::Surface* surface = manager->GetSurfaceForId(id); | 111 cc::Surface* surface = manager->GetSurfaceForId(id); |
112 if (!surface) { | 112 if (!surface) { |
113 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; | 113 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; |
114 return; | 114 return; |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 | 369 |
370 if (parent) { | 370 if (parent) { |
371 return static_cast<RenderWidgetHostViewBase*>( | 371 return static_cast<RenderWidgetHostViewBase*>( |
372 parent->current_frame_host()->GetView()); | 372 parent->current_frame_host()->GetView()); |
373 } | 373 } |
374 | 374 |
375 return nullptr; | 375 return nullptr; |
376 } | 376 } |
377 | 377 |
378 } // namespace content | 378 } // namespace content |
OLD | NEW |