sky/engine/platform/graphics/skia/GaneshUtils.cpp - Issue 1236953002: Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

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

Unified Diff: sky/engine/platform/graphics/skia/GaneshUtils.cpp

Issue 1236953002: Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: now with less crash on startup Created 5 years, 5 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:

Index: sky/engine/platform/graphics/skia/GaneshUtils.cpp

diff --git a/sky/engine/platform/graphics/skia/GaneshUtils.cpp b/sky/engine/platform/graphics/skia/GaneshUtils.cpp

index 18b16fa5e8acbd76c34f50870e2ea6dad50802ac..05bcac32a0748cb72e9ea5e8683f69a76bcf2f39 100644

--- a/sky/engine/platform/graphics/skia/GaneshUtils.cpp

+++ b/sky/engine/platform/graphics/skia/GaneshUtils.cpp

@@ -42,12 +42,12 @@ bool ensureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap, const IntSize&

return false;

GrTextureDesc desc;

desc.fConfig = config;

- desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;

+ desc.fFlags = kRenderTarget_GrSurfaceFlag;

desc.fSampleCnt = 0;

desc.fOrigin = origin;

desc.fWidth = size.width();

desc.fHeight = size.height();

- SkAutoTUnref<GrTexture> texture(gr->createUncachedTexture(desc, 0, 0));

+ SkAutoTUnref<GrTexture> texture(gr->textureProvider()->createTexture(desc, false, 0, 0));

if (!texture.get())

return false;