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

Unified Diff: blimp/client/app/compositor/browser_compositor.h

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.cc ('k') | blimp/client/app/compositor/browser_compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/app/compositor/browser_compositor.h
diff --git a/blimp/client/app/compositor/browser_compositor.h b/blimp/client/app/compositor/browser_compositor.h
index 707d062ba575d8051b2a3400e7b5de8ab90d2612..cb0828f477ff98058f4c6f82beacf80c02edf28b 100644
--- a/blimp/client/app/compositor/browser_compositor.h
+++ b/blimp/client/app/compositor/browser_compositor.h
@@ -7,6 +7,7 @@
#include "base/macros.h"
#include "base/callback.h"
+#include "base/memory/weak_ptr.h"
#include "cc/trees/layer_tree_host_client.h"
#include "cc/trees/layer_tree_host_single_thread_client.h"
#include "ui/gfx/geometry/size.h"
@@ -22,20 +23,14 @@ class SurfaceManager;
namespace blimp {
namespace client {
-class BlimpGpuMemoryBufferManager;
+class CompositorDependencies;
// The parent compositor that embeds the content from the BlimpCompositor for
// the current page.
class BrowserCompositor : public cc::LayerTreeHostClient,
public cc::LayerTreeHostSingleThreadClient {
public:
- // TODO(dtrainor): Move these to the CompositorDeps and share them with the
- // BlimpCompositor.
- static cc::SurfaceManager* GetSurfaceManager();
- static BlimpGpuMemoryBufferManager* GetGpuMemoryBufferManager();
- static uint32_t AllocateSurfaceClientId();
-
- BrowserCompositor();
+ explicit BrowserCompositor(CompositorDependencies* compositor_dependencies);
~BrowserCompositor() override;
// Sets the layer with the content from the renderer compositor.
@@ -82,6 +77,8 @@ class BrowserCompositor : public cc::LayerTreeHostClient,
void HandlePendingOutputSurfaceRequest();
+ CompositorDependencies* compositor_dependencies_;
+
std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
gfx::AcceleratedWidget widget_;
bool output_surface_request_pending_;
« no previous file with comments | « blimp/client/app/android/blimp_view.cc ('k') | blimp/client/app/compositor/browser_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698