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

Side by Side Diff: trunk/src/content/browser/aura/software_output_device_win.cc

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/aura/software_output_device_win.h" 5 #include "content/browser/aura/software_output_device_win.h"
6 6
7 #include "content/public/browser/browser_thread.h" 7 #include "content/public/browser/browser_thread.h"
8 #include "third_party/skia/include/core/SkBitmap.h" 8 #include "third_party/skia/include/core/SkBitmap.h"
9 #include "third_party/skia/include/core/SkDevice.h" 9 #include "third_party/skia/include/core/SkDevice.h"
10 #include "ui/compositor/compositor.h" 10 #include "ui/compositor/compositor.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 void SoftwareOutputDeviceWin::CopyToBitmap( 95 void SoftwareOutputDeviceWin::CopyToBitmap(
96 const gfx::Rect& rect, SkBitmap* output) { 96 const gfx::Rect& rect, SkBitmap* output) {
97 DCHECK(contents_); 97 DCHECK(contents_);
98 SkBaseDevice* device = contents_->sk_canvas()->getDevice(); 98 SkBaseDevice* device = contents_->sk_canvas()->getDevice();
99 const SkBitmap& bitmap = device->accessBitmap(false); 99 const SkBitmap& bitmap = device->accessBitmap(false);
100 bitmap.extractSubset(output, gfx::RectToSkIRect(rect)); 100 bitmap.extractSubset(output, gfx::RectToSkIRect(rect));
101 } 101 }
102 102
103 } // namespace content 103 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698