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

Unified Diff: blimp/client/app/android/blimp_view.cc

Issue 2274323002: Expose Blimp dependencies to the embedder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@khushal_baseline_1
Patch Set: Fix linux build break Created 4 years, 4 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
« no previous file with comments | « blimp/client/app/android/blimp_view.h ('k') | blimp/client/app/compositor/browser_compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/app/android/blimp_view.cc
diff --git a/blimp/client/app/android/blimp_view.cc b/blimp/client/app/android/blimp_view.cc
index af1667ee6c017be318676adea473fd71afd1dd73..b11f553ee1a15e34ac1ccfca5d772a84f16efef9 100644
--- a/blimp/client/app/android/blimp_view.cc
+++ b/blimp/client/app/android/blimp_view.cc
@@ -6,8 +6,12 @@
#include <android/native_window_jni.h>
+#include "base/memory/ptr_util.h"
#include "blimp/client/app/android/blimp_client_session_android.h"
#include "blimp/client/app/compositor/browser_compositor.h"
+#include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
+#include "blimp/client/feature/compositor/blimp_compositor_manager.h"
+#include "blimp/client/support/compositor/compositor_dependencies_impl.h"
#include "jni/BlimpView_jni.h"
#include "ui/events/android/motion_event_android.h"
#include "ui/gfx/geometry/size.h"
@@ -50,23 +54,32 @@ BlimpView::BlimpView(JNIEnv* env,
float dp_to_px,
RenderWidgetFeature* render_widget_feature)
: device_scale_factor_(dp_to_px),
- compositor_(base::MakeUnique<BrowserCompositor>()),
current_surface_format_(0),
window_(gfx::kNullAcceleratedWidget),
weak_ptr_factory_(this) {
- compositor_manager_ = BlimpCompositorManagerAndroid::Create(
- real_size, size, render_widget_feature,
- BrowserCompositor::GetSurfaceManager(),
- BrowserCompositor::GetGpuMemoryBufferManager(),
- base::Bind(&BrowserCompositor::AllocateSurfaceClientId));
+ compositor_dependencies_ = base::MakeUnique<BlimpCompositorDependencies>(
+ base::MakeUnique<CompositorDependenciesImpl>());
+
+ compositor_ = base::MakeUnique<BrowserCompositor>(
+ compositor_dependencies_->GetEmbedderDependencies());
compositor_->set_did_complete_swap_buffers_callback(base::Bind(
&BlimpView::OnSwapBuffersCompleted, weak_ptr_factory_.GetWeakPtr()));
+
+ compositor_manager_ = base::MakeUnique<BlimpCompositorManager>(
+ render_widget_feature, compositor_dependencies_.get());
compositor_->SetContentLayer(compositor_manager_->layer());
+
java_obj_.Reset(env, jobj);
}
BlimpView::~BlimpView() {
SetSurface(nullptr);
+
+ // Destroy the BrowserCompositor and the BlimpCompositorManager before the
+ // BlimpCompositorDependencies.
+ compositor_.reset();
+ compositor_manager_.reset();
+ compositor_dependencies_.reset();
}
void BlimpView::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
« no previous file with comments | « blimp/client/app/android/blimp_view.h ('k') | blimp/client/app/compositor/browser_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698