p1 mus+ash chrome renders ui and content

content/browser/compositor/software_output_device_mus.h

Index: content/browser/compositor/software_output_device_mus.h
diff --git a/content/browser/compositor/software_output_device_mus.h b/content/browser/compositor/software_output_device_mus.h
new file mode 100644
index 0000000000000000000000000000000000000000..3454532d3d5efb36f93fc8b58e0752d4ab782e24
--- /dev/null
+++ b/content/browser/compositor/software_output_device_mus.h
@@ -0,0 +1,40 @@
+// Copyright 2015 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 CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MUS_H_
+#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MUS_H_
+
+#include "base/macros.h"
+#include "cc/output/software_output_device.h"
+#include "content/common/content_export.h"
+#include "ui/gfx/native_widget_types.h"

[Fady Samuel, 2015/11/13 02:18:02]

Nit: is this necessary?

[rjkroege, 2015/11/13 03:10:43]

Done.

+
+namespace ui {
+class Compositor;
+class SurfaceOzoneCanvas;

[Fady Samuel, 2015/11/13 02:18:02]

nit: remove.

[rjkroege, 2015/11/13 03:10:43]

Done.

+}
+
+namespace bitmap_uploader {
+class BitmapUploader;

[Fady Samuel, 2015/11/13 02:18:02]

nit: remove.

[rjkroege, 2015/11/13 03:10:43]

Done.

+}
+
+namespace content {
+
+// Mus implementation of software compositing: Chrome will do a software
+// composite and ship the resultant bitmap to an instance of the mus
+// window server. Remove this upon completion of http://crbug.com/548451
+class CONTENT_EXPORT SoftwareOutputDeviceMus : public cc::SoftwareOutputDevice {
+ public:
+  explicit SoftwareOutputDeviceMus(ui::Compositor* compositor);
+  void EndPaint() override;
+
+ private:
+  ui::Compositor* compositor_;
+
+  DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceMus);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_MUS_H_