    HWND parent_window_;
    HWND window_;
 diff --git a/gpu/ipc/service/direct_composition_surface_win.cc b/gpu/ipc/service/direct_composition_surface_win.cc
-index e6ac830..2fc7cd93 100644
+index da05d806bfa7e8710833eec7a2d85dfaeb9ed37a..761384364cb2544bc984f391b7c433e12fae1c33 100644
 --- a/gpu/ipc/service/direct_composition_surface_win.cc
 +++ b/gpu/ipc/service/direct_composition_surface_win.cc
-@@ -1541,8 +1541,6 @@ gfx::SwapResult DirectCompositionSurfaceWin::SwapBuffers(
+@@ -1573,8 +1573,6 @@ gfx::SwapResult DirectCompositionSurfaceWin::SwapBuffers(
    gl::GLSurfacePresentationHelper::ScopedSwapBuffers scoped_swap_buffers(
        presentation_helper_.get(), callback);
  
 -  child_window_.ClearInvalidContents();
 -
+   bool succeeded = true;
+ 
    if (root_surface_->SwapBuffers(PresentationCallback()) ==
-       gfx::SwapResult::SWAP_FAILED)
-     scoped_swap_buffers.set_result(gfx::SwapResult::SWAP_FAILED);

 
 ATOM g_window_class;
 
 // This runs on the window owner thread.
-LRESULT CALLBACK IntermediateWindowProc(HWND window,
-                                        UINT message,
-                                        WPARAM w_param,

-  }
-}
-
 // This runs on the window owner thread.
 void InitializeWindowClass() {
   if (g_window_class)
@@ -71,9 +32,9 @@ void InitializeWindowClass() {
   WNDCLASSEX intermediate_class;
   base::win::InitializeWindowClass(
