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

Side by Side Diff: Source/platform/graphics/skia/GaneshUtils.cpp

Issue 201213002: Remove uses of SkBitmap::Config (deprecated) from core/ and platform/. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "platform/graphics/skia/GaneshUtils.h" 32 #include "platform/graphics/skia/GaneshUtils.h"
33 33
34 #include "third_party/skia/include/core/SkCanvas.h" 34 #include "third_party/skia/include/core/SkCanvas.h"
35 #include "third_party/skia/include/gpu/SkGrPixelRef.h" 35 #include "third_party/skia/include/gpu/SkGrPixelRef.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 bool ensureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap, const IntSize& size, GrSurfaceOrigin origin, GrPixelConfig config) 39 bool ensureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap, const IntSize& size, GrSurfaceOrigin origin, GrPixelConfig config)
reed1 2014/03/17 13:25:18 Who calls this? Ganesh wants to move away from the
jbroman 2014/03/17 16:46:38 WebMediaClientPlayerImpl and WebGLImageBufferSurfa
40 { 40 {
41 if (!bitmap.getTexture() || bitmap.width() != size.width() || bitmap.height( ) != size.height()) { 41 if (!bitmap.getTexture() || bitmap.width() != size.width() || bitmap.height( ) != size.height()) {
42 if (!gr) 42 if (!gr)
43 return false; 43 return false;
44 GrTextureDesc desc; 44 GrTextureDesc desc;
45 desc.fConfig = config; 45 desc.fConfig = config;
46 desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagB it; 46 desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagB it;
47 desc.fSampleCnt = 0; 47 desc.fSampleCnt = 0;
48 desc.fOrigin = origin; 48 desc.fOrigin = origin;
49 desc.fWidth = size.width(); 49 desc.fWidth = size.width();
50 desc.fHeight = size.height(); 50 desc.fHeight = size.height();
51 SkAutoTUnref<GrTexture> texture(gr->createUncachedTexture(desc, 0, 0)); 51 SkAutoTUnref<GrTexture> texture(gr->createUncachedTexture(desc, 0, 0));
52 if (!texture.get()) 52 if (!texture.get())
53 return false; 53 return false;
54 54
55 SkImageInfo info; 55 SkImageInfo info;
56 info.fWidth = desc.fWidth; 56 info.fWidth = desc.fWidth;
57 info.fHeight = desc.fHeight; 57 info.fHeight = desc.fHeight;
58 info.fColorType = kPMColor_SkColorType; 58 info.fColorType = kPMColor_SkColorType;
59 info.fAlphaType = kPremul_SkAlphaType; 59 info.fAlphaType = kPremul_SkAlphaType;
60 60
61 SkGrPixelRef* pixelRef = SkNEW_ARGS(SkGrPixelRef, (info, texture.get())) ; 61 SkGrPixelRef* pixelRef = SkNEW_ARGS(SkGrPixelRef, (info, texture.get())) ;
62 if (!pixelRef) 62 if (!pixelRef)
63 return false; 63 return false;
64 bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height( )); 64 bitmap.setConfig(info);
65 bitmap.setPixelRef(pixelRef)->unref(); 65 bitmap.setPixelRef(pixelRef)->unref();
66 } 66 }
67 67
68 return true; 68 return true;
69 } 69 }
70 70
71 } // namespace WebCore 71 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698