| OLD | NEW | 
|   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/playback/display_item_list.h" |   7 #include "cc/playback/display_item_list.h" | 
|   8 #include "cc/playback/picture.h" |   8 #include "cc/playback/picture.h" | 
|   9 #include "skia/ext/refptr.h" |   9 #include "skia/ext/refptr.h" | 
|  10 #include "third_party/skia/include/core/SkCanvas.h" |  10 #include "third_party/skia/include/core/SkCanvas.h" | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
|  29  |  29  | 
|  30 void DrawDisplayList(unsigned char* buffer, |  30 void DrawDisplayList(unsigned char* buffer, | 
|  31                      const gfx::Rect& layer_rect, |  31                      const gfx::Rect& layer_rect, | 
|  32                      scoped_refptr<DisplayItemList> list) { |  32                      scoped_refptr<DisplayItemList> list) { | 
|  33   SkImageInfo info = |  33   SkImageInfo info = | 
|  34       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height()); |  34       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height()); | 
|  35   SkBitmap bitmap; |  35   SkBitmap bitmap; | 
|  36   bitmap.installPixels(info, buffer, info.minRowBytes()); |  36   bitmap.installPixels(info, buffer, info.minRowBytes()); | 
|  37   SkCanvas canvas(bitmap); |  37   SkCanvas canvas(bitmap); | 
|  38   canvas.clipRect(gfx::RectToSkRect(layer_rect)); |  38   canvas.clipRect(gfx::RectToSkRect(layer_rect)); | 
|  39   list->Raster(&canvas, NULL, 1.0f); |  39   list->Raster(&canvas, NULL, gfx::Rect(), 1.0f); | 
|  40 } |  40 } | 
|  41  |  41  | 
|  42 void CreateBitmap(const gfx::Size& size, const char* uri, SkBitmap* bitmap) { |  42 void CreateBitmap(const gfx::Size& size, const char* uri, SkBitmap* bitmap) { | 
|  43   SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height()); |  43   SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height()); | 
|  44  |  44  | 
|  45   bitmap->allocPixels(info); |  45   bitmap->allocPixels(info); | 
|  46   bitmap->pixelRef()->setImmutable(); |  46   bitmap->pixelRef()->setImmutable(); | 
|  47   bitmap->pixelRef()->setURI(uri); |  47   bitmap->pixelRef()->setURI(uri); | 
|  48 } |  48 } | 
|  49  |  49  | 
|  50 }  // namespace cc |  50 }  // namespace cc | 
| OLD | NEW |