Make browser compositor and display share a context

The browser compositor and the display won't interfere with each other, so sharing a context avoids wasting time and memory creating a second context. The display should own the context, though it passes information related to context lost and memory management to the browser compositor.

Review URL: https://codereview.chromium.org/615313003

Cr-Commit-Position: refs/heads/master@{#298093}

1 files changed, 3 insertions, 2 deletions

diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index 9bc95d0..c79f770 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -133,6 +133,9 @@ class CC_EXPORT OutputSurface {
     return overlay_candidate_validator_.get();
   }
 
+  void DidLoseOutputSurface();
+  void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
+
  protected:
   OutputSurfaceClient* client_;
 
@@ -156,7 +159,6 @@ class CC_EXPORT OutputSurface {
 
   void SetNeedsRedrawRect(const gfx::Rect& damage_rect);
   void ReclaimResources(const CompositorFrameAck* ack);
-  void DidLoseOutputSurface();
   void SetExternalStencilTest(bool enabled);
   void SetExternalDrawConstraints(
       const gfx::Transform& transform,
@@ -169,7 +171,6 @@ class CC_EXPORT OutputSurface {
  private:
   void SetUpContext3d();
   void ResetContext3d();
-  void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
 
   bool external_stencil_test_enabled_;