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

Unified Diff: cc/layers/nine_patch_layer_impl.cc

Issue 22911024: Fix crashes when NinePatchLayer doesn't have a resource. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shadow
Patch Set: Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« cc/layers/nine_patch_layer.cc ('K') | « cc/layers/nine_patch_layer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/nine_patch_layer_impl.cc
diff --git a/cc/layers/nine_patch_layer_impl.cc b/cc/layers/nine_patch_layer_impl.cc
index 103f7656eb85c5ad24212f680306ce1ed9e4b507..ab7bf41c85f782325e2b164bd99af0017283c2e7 100644
--- a/cc/layers/nine_patch_layer_impl.cc
+++ b/cc/layers/nine_patch_layer_impl.cc
@@ -64,7 +64,8 @@ bool NinePatchLayerImpl::WillDraw(DrawMode draw_mode,
void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
AppendQuadsData* append_quads_data) {
- DCHECK(resource_id_);
+ if (!resource_id_)
danakj 2013/08/20 02:22:32 This looks right to me, but can you move this belo
ccameron 2013/08/20 09:43:47 Ah, good catch -- done.
+ return;
SharedQuadState* shared_quad_state =
quad_sink->UseSharedQuadState(CreateSharedQuadState());
« cc/layers/nine_patch_layer.cc ('K') | « cc/layers/nine_patch_layer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698