Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: blimp/client/feature/compositor/blimp_compositor_manager.cc

Issue 1985863002: Incorporate BlobChannel into Blimp image encode/decode pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blobchannel-helium
Patch Set: fix gn dependency warning & rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: blimp/client/feature/compositor/blimp_compositor_manager.cc
diff --git a/blimp/client/feature/compositor/blimp_compositor_manager.cc b/blimp/client/feature/compositor/blimp_compositor_manager.cc
index 8cc99f417aa1a99143b33cbcf801043c34068934..4e3cb00a987cb9ef34d9e4b289d94f5009930f0b 100644
--- a/blimp/client/feature/compositor/blimp_compositor_manager.cc
+++ b/blimp/client/feature/compositor/blimp_compositor_manager.cc
@@ -7,7 +7,7 @@
#include "base/lazy_instance.h"
#include "base/memory/ptr_util.h"
#include "blimp/client/feature/compositor/blimp_layer_tree_settings.h"
-#include "blimp/client/feature/compositor/client_image_serialization_processor.h"
+#include "blimp/client/feature/compositor/blob_image_serialization_processor.h"
#include "blimp/common/compositor/blimp_task_graph_runner.h"
#include "cc/proto/compositor_message.pb.h"
@@ -27,7 +27,6 @@ BlimpCompositorManager::BlimpCompositorManager(
: visible_(false),
window_(gfx::kNullAcceleratedWidget),
gpu_memory_buffer_manager_(new BlimpGpuMemoryBufferManager),
- image_serialization_processor_(new ClientImageSerializationProcessor),
active_compositor_(nullptr),
render_widget_feature_(render_widget_feature),
client_(client) {
@@ -183,7 +182,7 @@ BlimpCompositorManager::GetGpuMemoryBufferManager() {
cc::ImageSerializationProcessor*
BlimpCompositorManager::GetImageSerializationProcessor() {
- return image_serialization_processor_.get();
+ return BlobImageSerializationProcessor::current();
}
void BlimpCompositorManager::SendWebGestureEvent(

Powered by Google App Engine
This is Rietveld 408576698