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_manager.h" | 8 #include "cc/surfaces/surface_manager.h" |
9 #include "content/browser/compositor/surface_utils.h" | 9 #include "content/browser/compositor/surface_utils.h" |
10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 frame_proxy_in_parent_renderer_->Send(new FrameMsg_SetChildFrameSurface( | 90 frame_proxy_in_parent_renderer_->Send(new FrameMsg_SetChildFrameSurface( |
91 frame_proxy_in_parent_renderer_->GetRoutingID(), surface_id, frame_size, | 91 frame_proxy_in_parent_renderer_->GetRoutingID(), surface_id, frame_size, |
92 scale_factor, sequence)); | 92 scale_factor, sequence)); |
93 } | 93 } |
94 | 94 |
95 void CrossProcessFrameConnector::OnSatisfySequence( | 95 void CrossProcessFrameConnector::OnSatisfySequence( |
96 const cc::SurfaceSequence& sequence) { | 96 const cc::SurfaceSequence& sequence) { |
97 std::vector<uint32_t> sequences; | 97 std::vector<uint32_t> sequences; |
98 sequences.push_back(sequence.sequence); | 98 sequences.push_back(sequence.sequence); |
99 cc::SurfaceManager* manager = GetSurfaceManager(); | 99 cc::SurfaceManager* manager = GetSurfaceManager(); |
100 manager->DidSatisfySequences(sequence.id_namespace, &sequences); | 100 manager->DidSatisfySequences(sequence.client_id, &sequences); |
101 } | 101 } |
102 | 102 |
103 void CrossProcessFrameConnector::OnRequireSequence( | 103 void CrossProcessFrameConnector::OnRequireSequence( |
104 const cc::SurfaceId& id, | 104 const cc::SurfaceId& id, |
105 const cc::SurfaceSequence& sequence) { | 105 const cc::SurfaceSequence& sequence) { |
106 cc::SurfaceManager* manager = GetSurfaceManager(); | 106 cc::SurfaceManager* manager = GetSurfaceManager(); |
107 cc::Surface* surface = manager->GetSurfaceForId(id); | 107 cc::Surface* surface = manager->GetSurfaceForId(id); |
108 if (!surface) { | 108 if (!surface) { |
109 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; | 109 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; |
110 return; | 110 return; |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 | 340 |
341 if (parent) { | 341 if (parent) { |
342 return static_cast<RenderWidgetHostViewBase*>( | 342 return static_cast<RenderWidgetHostViewBase*>( |
343 parent->current_frame_host()->GetView()); | 343 parent->current_frame_host()->GetView()); |
344 } | 344 } |
345 | 345 |
346 return nullptr; | 346 return nullptr; |
347 } | 347 } |
348 | 348 |
349 } // namespace content | 349 } // namespace content |
OLD | NEW |