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

Side by Side Diff: src/utils/SkPictureUtils.cpp

Issue 302053002: Revert of setConfig -> setInfo (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 6 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
« no previous file with comments | « src/utils/SkGatherPixelRefsAndRects.h ('k') | src/views/sdl/SkOSWindow_SDL.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkBitmapDevice.h" 8 #include "SkBitmapDevice.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkData.h" 10 #include "SkData.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 * This device will route all bitmaps (primitives and in shaders) to its PRSet. 47 * This device will route all bitmaps (primitives and in shaders) to its PRSet.
48 * It should never actually draw anything, so there need not be any pixels 48 * It should never actually draw anything, so there need not be any pixels
49 * behind its device. 49 * behind its device.
50 */ 50 */
51 class GatherPixelRefDevice : public SkBaseDevice { 51 class GatherPixelRefDevice : public SkBaseDevice {
52 public: 52 public:
53 SK_DECLARE_INST_COUNT(GatherPixelRefDevice) 53 SK_DECLARE_INST_COUNT(GatherPixelRefDevice)
54 54
55 GatherPixelRefDevice(int width, int height, PixelRefSet* prset) { 55 GatherPixelRefDevice(int width, int height, PixelRefSet* prset) {
56 fSize.set(width, height); 56 fSize.set(width, height);
57 fEmptyBitmap.setInfo(SkImageInfo::MakeUnknown(width, height)); 57 fEmptyBitmap.setConfig(SkImageInfo::MakeUnknown(width, height));
58 fPRSet = prset; 58 fPRSet = prset;
59 } 59 }
60 60
61 virtual int width() const SK_OVERRIDE { return fSize.width(); } 61 virtual int width() const SK_OVERRIDE { return fSize.width(); }
62 virtual int height() const SK_OVERRIDE { return fSize.height(); } 62 virtual int height() const SK_OVERRIDE { return fSize.height(); }
63 virtual bool isOpaque() const SK_OVERRIDE { return false; } 63 virtual bool isOpaque() const SK_OVERRIDE { return false; }
64 virtual SkBitmap::Config config() const SK_OVERRIDE { 64 virtual SkBitmap::Config config() const SK_OVERRIDE {
65 return SkBitmap::kNo_Config; 65 return SkBitmap::kNo_Config;
66 } 66 }
67 virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; } 67 virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; }
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 canvas.clipRect(area, SkRegion::kIntersect_Op, false); 214 canvas.clipRect(area, SkRegion::kIntersect_Op, false);
215 canvas.drawPicture(*pict); 215 canvas.drawPicture(*pict);
216 216
217 SkData* data = NULL; 217 SkData* data = NULL;
218 int count = array.count(); 218 int count = array.count();
219 if (count > 0) { 219 if (count > 0) {
220 data = SkData::NewFromMalloc(array.detach(), count * sizeof(SkPixelRef*) ); 220 data = SkData::NewFromMalloc(array.detach(), count * sizeof(SkPixelRef*) );
221 } 221 }
222 return data; 222 return data;
223 } 223 }
OLDNEW
« no previous file with comments | « src/utils/SkGatherPixelRefsAndRects.h ('k') | src/views/sdl/SkOSWindow_SDL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698