Chromium -> Mojo roll.

cc/output/gl_renderer.h

Index: cc/output/gl_renderer.h
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index 27f2c4221ef4fc8abc6d19059ba364bf1dcf3e00..ddc879150894c0ab2174711b8002802bc1e5f21f 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -110,10 +110,9 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
                                 const gfx::Rect& target_rect) override;
   void SetDrawViewport(const gfx::Rect& window_space_viewport) override;
   void SetScissorTestRect(const gfx::Rect& scissor_rect) override;
-  void DiscardPixels(bool has_external_stencil_test,
-                     bool draw_rect_covers_full_surface) override;
-  void ClearFramebuffer(DrawingFrame* frame,
-                        bool has_external_stencil_test) override;
+  void PrepareSurfaceForPass(DrawingFrame* frame,
+                             SurfaceInitializationMode initialization_mode,
+                             const gfx::Rect& render_pass_scissor) override;
   void DoDrawQuad(DrawingFrame* frame,
                   const class DrawQuad*,
                   const gfx::QuadF* draw_region) override;
@@ -150,6 +149,9 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
 
   static void ToGLMatrix(float* gl_matrix, const gfx::Transform& transform);
 
+  void DiscardPixels();
+  void ClearFramebuffer(DrawingFrame* frame);
+
   void DrawCheckerboardQuad(const DrawingFrame* frame,
                             const CheckerboardDrawQuad* quad,
                             const gfx::QuadF* clip_region);