Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Unified Diff: trunk/src/content/browser/compositor/software_output_device_win.h

Issue 137853019: Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/content/browser/compositor/software_output_device_win.h
===================================================================
--- trunk/src/content/browser/compositor/software_output_device_win.h (revision 245194)
+++ trunk/src/content/browser/compositor/software_output_device_win.h (working copy)
@@ -1,42 +0,0 @@
-// 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.
-
-#ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_
-#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "cc/output/software_output_device.h"
-
-#include <windows.h>
-
-namespace gfx {
-class Canvas;
-}
-
-namespace ui {
-class Compositor;
-}
-
-namespace content {
-
-class SoftwareOutputDeviceWin : public cc::SoftwareOutputDevice {
- public:
- explicit SoftwareOutputDeviceWin(ui::Compositor* compositor);
- virtual ~SoftwareOutputDeviceWin();
-
- virtual void Resize(gfx::Size viewport_size) OVERRIDE;
- virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) OVERRIDE;
- virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE;
- virtual void CopyToBitmap(const gfx::Rect& rect, SkBitmap* output) OVERRIDE;
-
- private:
- HWND hwnd_;
- BITMAPINFO bitmap_info_;
- scoped_ptr<gfx::Canvas> contents_;
- bool is_hwnd_composited_;
-};
-
-} // namespace content
-
-#endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_

Powered by Google App Engine
This is Rietveld 408576698