Mac: Kill lots of AcceleratedWidget code (with fire)

content/browser/compositor/software_output_device_mac.h

Index: content/browser/compositor/software_output_device_mac.h
diff --git a/content/browser/compositor/software_output_device_mac.h b/content/browser/compositor/software_output_device_mac.h
index 5b6ac86b77d56659d23cb4d062fcfe53a441b30a..d97e7aac53706f3ee1eef1792073cc475e739d6c 100644
--- a/content/browser/compositor/software_output_device_mac.h
+++ b/content/browser/compositor/software_output_device_mac.h
@@ -5,6 +5,9 @@
 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MAC_H_
 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MAC_H_
 
+#include <IOSurface/IOSurface.h>
+
+#include "base/mac/scoped_cftyperef.h"
 #include "cc/output/software_output_device.h"
 
 namespace gfx {
@@ -22,10 +25,32 @@ class SoftwareOutputDeviceMac : public cc::SoftwareOutputDevice {
   explicit SoftwareOutputDeviceMac(ui::Compositor* compositor);
   ~SoftwareOutputDeviceMac() override;
 
+  void Resize(const gfx::Size& pixel_size, float scale_factor) override;
+  SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override;
   void EndPaint() override;
+  void DiscardBackbuffer() override;
+  void EnsureBackbuffer() override;
 
  private:
+  // Copy the pixels from the previous buffer to the new buffer.
+  void CopyPreviousBufferDamage(const gfx::Rect& new_damage_rect);
+
   ui::Compositor* compositor_;
+  gfx::Size pixel_size_;
+  float scale_factor_;

[tapted, 2015/10/26 02:51:41]

this shadows a protected: member in cc::SoftwareOutputDevice .. it looks like
SoftwareOutputDeviceWin just writes into that in its overrides. Of course.. that
goes against style guides, so I think what you've done is right.

Really I think what's needed is a cc::SoftwareOutputDevice and a
cc::SoftwareOutputDeviceImpl or similar. So I guess this is fine as-is -- it
wouldn't need to change

[ccameron, 2015/10/26 06:40:33]

Agree -- I think that cc::SoftwareOutputDevice needs a refactor to get rid of
the somewhat nasty inheritance patterns.

+
+  // This surface is double-buffered. The two buffers are in |io_surfaces_|,
+  // and the index of the current buffer is |current_buffer_|.
+  base::ScopedCFTypeRef<IOSurfaceRef> io_surfaces_[2];
+  int current_index_;
+
+  // The previous frame's damage rectangle. Used to copy unchanged content
+  // between buffers in CopyPreviousBufferDamage.
+  gfx::Rect previous_buffer_damage_rect_;

[tapted, 2015/10/26 02:51:41]

Could this be an SkRegion? might avoid a few conversions -- looks like the
SkRegion::op(..) overloads all redirect to one that works with SkRegions. Small
gains though, so I'll leave it up to you

[ccameron, 2015/10/26 06:40:33]

Yes, that simplifies things -- I've changed it (and the arg to the copy
function) to SkRegion.

+
+  // The SkCanvas wrapps the mapped current IOSurface. It is valid only between
+  // BeginPaint and EndPaint.
+  skia::RefPtr<SkCanvas> canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceMac);
 };