content/browser/compositor/software_output_device_mus.cc - Issue 1462163002: Move uncoupled code out of skia/ext/platform_device.h

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/compositor/software_output_device_mus.cc

Issue 1462163002: Move uncoupled code out of skia/ext/platform_device.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-draft-metadata

Patch Set: Trim superfluous SK_API Created 5 years 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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/compositor/software_output_device_mus.h"	5 #include "content/browser/compositor/software_output_device_mus.h"

6	6

7 #include "components/bitmap_uploader/bitmap_uploader.h"	7 #include "components/bitmap_uploader/bitmap_uploader.h"

8 #include "third_party/skia/include/core/SkBitmap.h"	8 #include "third_party/skia/include/core/SkImageInfo.h"

9 #include "third_party/skia/include/core/SkDevice.h"

10 #include "ui/base/view_prop.h"	9 #include "ui/base/view_prop.h"

11 #include "ui/compositor/compositor.h"	10 #include "ui/compositor/compositor.h"

12 #include "ui/gfx/skia_util.h"	11 #include "ui/gfx/skia_util.h"

13	12

14 #if !defined(OFFICIAL_BUILD)	13 #if !defined(OFFICIAL_BUILD)

15 #include "base/threading/thread_restrictions.h"	14 #include "base/threading/thread_restrictions.h"

16 #endif	15 #endif

17	16

18 namespace content {	17 namespace content {

19	18

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 // TODO(rjkroege): This makes an additional copy. Improve the	54 // TODO(rjkroege): This makes an additional copy. Improve the

56 // bitmap_uploader API to remove.	55 // bitmap_uploader API to remove.

57 scoped_ptr<std::vector<unsigned char>> data(new std::vector<unsigned char>(	56 scoped_ptr<std::vector<unsigned char>> data(new std::vector<unsigned char>(

58 pixels, pixels + rowBytes * viewport_pixel_size_.height()));	57 pixels, pixels + rowBytes * viewport_pixel_size_.height()));

59 uploader->SetBitmap(viewport_pixel_size_.width(),	58 uploader->SetBitmap(viewport_pixel_size_.width(),

60 viewport_pixel_size_.height(), data.Pass(),	59 viewport_pixel_size_.height(), data.Pass(),

61 bitmap_uploader::BitmapUploader::BGRA);	60 bitmap_uploader::BitmapUploader::BGRA);

62 }	61 }

63	62

64 } // namespace content	63 } // namespace content

OLD	NEW

« no previous file with comments | « components/printing/renderer/print_web_view_helper_mac.mm ('k') | content/plugin/webplugin_delegate_stub.cc » ('j') | no next file with comments »