ozone: dri: Composite to intermediate surface & copy

content/browser/compositor/software_output_device_ozone.cc

 // Copyright 2014 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.
 
 #include "content/browser/compositor/software_output_device_ozone.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 #include "ui/gfx/ozone/surface_ozone_canvas.h"
 #include "ui/gfx/skia_util.h"
@@ skipping 27 matching lines @@
 
   surface_ozone_->ResizeCanvas(viewport_size_);
 }
 
 SkCanvas* SoftwareOutputDeviceOzone::BeginPaint(const gfx::Rect& damage_rect) {
   DCHECK(gfx::Rect(viewport_size_).Contains(damage_rect));
 
   // Get canvas for next frame.
   canvas_ = surface_ozone_->GetCanvas();
 
-  canvas_->clipRect(gfx::RectToSkRect(damage_rect), SkRegion::kReplace_Op);
-  // Save the current state so we can restore once we're done drawing. This is
-  // saved after the clip since we want to keep the clip information after we're
-  // done drawing such that OZONE knows what was updated.
-  canvas_->save();
-
   return SoftwareOutputDevice::BeginPaint(damage_rect);
 }
 
 void SoftwareOutputDeviceOzone::EndPaint(cc::SoftwareFrameData* frame_data) {
   SoftwareOutputDevice::EndPaint(frame_data);
 
-  canvas_->restore();
-
-  if (damage_rect_.IsEmpty())
-    return;
-
-  bool scheduled = surface_ozone_->PresentCanvas();
-  DCHECK(scheduled) << "Failed to present canvas";
+  surface_ozone_->PresentCanvas(damage_rect_);
 }
 
 }  // namespace content