OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/compositor/surface_utils.h" | 5 #include "content/browser/compositor/surface_utils.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 SkPaint paint; | 152 SkPaint paint; |
153 paint.setColorFilter(SkLumaColorFilter::Make()); | 153 paint.setColorFilter(SkLumaColorFilter::Make()); |
154 canvas.drawBitmap(scaled_bitmap, SkIntToScalar(0), SkIntToScalar(0), &paint); | 154 canvas.drawBitmap(scaled_bitmap, SkIntToScalar(0), SkIntToScalar(0), &paint); |
155 callback.Run(grayscale_bitmap, content::READBACK_SUCCESS); | 155 callback.Run(grayscale_bitmap, content::READBACK_SUCCESS); |
156 } | 156 } |
157 | 157 |
158 } // namespace | 158 } // namespace |
159 | 159 |
160 namespace content { | 160 namespace content { |
161 | 161 |
162 uint32_t AllocateSurfaceClientId() { | 162 cc::FrameSinkId AllocateFrameSinkId() { |
163 #if defined(OS_ANDROID) | 163 #if defined(OS_ANDROID) |
164 return ContextProviderFactoryImpl::GetInstance()->AllocateSurfaceClientId(); | 164 return ContextProviderFactoryImpl::GetInstance()->AllocateFrameSinkId(); |
165 #else | 165 #else |
166 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); | 166 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); |
167 return factory->GetContextFactory()->AllocateSurfaceClientId(); | 167 return factory->GetContextFactory()->AllocateFrameSinkId(); |
168 #endif | 168 #endif |
169 } | 169 } |
170 | 170 |
171 cc::SurfaceManager* GetSurfaceManager() { | 171 cc::SurfaceManager* GetSurfaceManager() { |
172 #if defined(OS_ANDROID) | 172 #if defined(OS_ANDROID) |
173 return ContextProviderFactoryImpl::GetInstance()->GetSurfaceManager(); | 173 return ContextProviderFactoryImpl::GetInstance()->GetSurfaceManager(); |
174 #else | 174 #else |
175 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); | 175 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); |
176 if (factory == NULL) | 176 if (factory == NULL) |
177 return nullptr; | 177 return nullptr; |
(...skipping 24 matching lines...) Expand all Loading... |
202 return; | 202 return; |
203 } | 203 } |
204 | 204 |
205 DCHECK(result->HasBitmap()); | 205 DCHECK(result->HasBitmap()); |
206 // Software path | 206 // Software path |
207 PrepareBitmapCopyOutputResult(output_size_in_pixel, color_type, callback, | 207 PrepareBitmapCopyOutputResult(output_size_in_pixel, color_type, callback, |
208 std::move(result)); | 208 std::move(result)); |
209 } | 209 } |
210 | 210 |
211 } // namespace content | 211 } // namespace content |
OLD | NEW |