Update from https://crrev.com/311076

cc/output/output_surface.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_OUTPUT_OUTPUT_SURFACE_H_
 #define CC_OUTPUT_OUTPUT_SURFACE_H_
 
 #include <deque>
 
 #include "base/basictypes.h"
@@ skipping 46 matching lines @@
   virtual ~OutputSurface();
 
   struct Capabilities {
     Capabilities()
         : delegated_rendering(false),
           max_frames_pending(0),
           deferred_gl_initialization(false),
           draw_and_swap_full_viewport_every_frame(false),
           adjust_deadline_for_parent(true),
           uses_default_gl_framebuffer(true),
-          flipped_output_surface(false) {}
+          flipped_output_surface(false),
+          can_force_reclaim_resources(false) {}
     bool delegated_rendering;
     int max_frames_pending;
     bool deferred_gl_initialization;
     bool draw_and_swap_full_viewport_every_frame;
     // This doesn't handle the <webview> case, but once BeginFrame is
     // supported natively, we shouldn't need adjust_deadline_for_parent.
     bool adjust_deadline_for_parent;
     // Whether this output surface renders to the default OpenGL zero
     // framebuffer or to an offscreen framebuffer.
     bool uses_default_gl_framebuffer;
     // Whether this OutputSurface is flipped or not.
     bool flipped_output_surface;
+    // Whether ForceReclaimResources can be called to reclaim all resources
+    // from the OutputSurface.
+    bool can_force_reclaim_resources;
   };
 
   const Capabilities& capabilities() const {
     return capabilities_;
   }
 
   virtual bool HasExternalStencilTest() const;
 
   // Obtain the 3d context or the software device associated with this output
   // surface. Either of these may return a null pointer, but not both.
@@ skipping 14 matching lines @@
   // in order to release the ContextProvider. Only used with
   // deferred_gl_initialization capability.
   void ReleaseContextProvider();
 
   virtual void EnsureBackbuffer();
   virtual void DiscardBackbuffer();
 
   virtual void Reshape(const gfx::Size& size, float scale_factor);
   virtual gfx::Size SurfaceSize() const;
 
+  // If supported, this causes a ReclaimResources for all resources that are
+  // currently in use.
+  virtual void ForceReclaimResources() {}
+
   virtual void BindFramebuffer();
 
   // The implementation may destroy or steal the contents of the CompositorFrame
   // passed in (though it will not take ownership of the CompositorFrame
   // itself). For successful swaps, the implementation must call
   // OutputSurfaceClient::DidSwapBuffers() and eventually
   // DidSwapBuffersComplete().
   virtual void SwapBuffers(CompositorFrame* frame) = 0;
   virtual void OnSwapBuffersComplete();
 
@@ skipping 50 matching lines @@
   bool external_stencil_test_enabled_;
 
   base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OUTPUT_SURFACE_H_