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

Side by Side Diff: cc/test/skia_common.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « cc/test/skia_common.h ('k') | cc/test/solid_color_content_layer_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "cc/test/skia_common.h" 5 #include "cc/test/skia_common.h"
6 6
7 #include "cc/resources/display_item_list.h"
7 #include "cc/resources/picture.h" 8 #include "cc/resources/picture.h"
8 #include "skia/ext/refptr.h" 9 #include "skia/ext/refptr.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 10 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "ui/gfx/geometry/rect.h" 11 #include "ui/gfx/geometry/rect.h"
11 #include "ui/gfx/skia_util.h" 12 #include "ui/gfx/skia_util.h"
12 13
13 namespace cc { 14 namespace cc {
14 15
15 void DrawPicture(unsigned char* buffer, 16 void DrawPicture(unsigned char* buffer,
16 const gfx::Rect& layer_rect, 17 const gfx::Rect& layer_rect,
17 scoped_refptr<Picture> picture) { 18 scoped_refptr<Picture> picture) {
18 SkImageInfo info = 19 SkImageInfo info =
19 SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height()); 20 SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
20 SkBitmap bitmap; 21 SkBitmap bitmap;
21 bitmap.installPixels(info, buffer, info.minRowBytes()); 22 bitmap.installPixels(info, buffer, info.minRowBytes());
22 SkCanvas canvas(bitmap); 23 SkCanvas canvas(bitmap);
23 canvas.clipRect(gfx::RectToSkRect(layer_rect)); 24 canvas.clipRect(gfx::RectToSkRect(layer_rect));
24 // We're drawing the entire canvas, so the negated content region is empty. 25 // We're drawing the entire canvas, so the negated content region is empty.
25 gfx::Rect negated_content_region; 26 gfx::Rect negated_content_region;
26 picture->Raster(&canvas, NULL, negated_content_region, 1.0f); 27 picture->Raster(&canvas, NULL, negated_content_region, 1.0f);
27 } 28 }
28 29
30 void DrawDisplayList(unsigned char* buffer,
31 const gfx::Rect& layer_rect,
32 scoped_refptr<DisplayItemList> list) {
33 SkImageInfo info =
34 SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
35 SkBitmap bitmap;
36 bitmap.installPixels(info, buffer, info.minRowBytes());
37 SkCanvas canvas(bitmap);
38 canvas.clipRect(gfx::RectToSkRect(layer_rect));
39 list->Raster(&canvas, NULL, 1.0f);
40 }
41
29 void CreateBitmap(const gfx::Size& size, const char* uri, SkBitmap* bitmap) { 42 void CreateBitmap(const gfx::Size& size, const char* uri, SkBitmap* bitmap) {
30 SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height()); 43 SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
31 44
32 bitmap->allocPixels(info); 45 bitmap->allocPixels(info);
33 bitmap->pixelRef()->setImmutable(); 46 bitmap->pixelRef()->setImmutable();
34 bitmap->pixelRef()->setURI(uri); 47 bitmap->pixelRef()->setURI(uri);
35 } 48 }
36 49
37 } // namespace cc 50 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/skia_common.h ('k') | cc/test/solid_color_content_layer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698