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

Side by Side Diff: cc/layers/nine_patch_layer.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: Incorporate review feedback 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 unified diff | Download patch
« no previous file with comments | « no previous file | cc/layers/nine_patch_layer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/layers/nine_patch_layer.h" 5 #include "cc/layers/nine_patch_layer.h"
6 6
7 #include "cc/layers/nine_patch_layer_impl.h" 7 #include "cc/layers/nine_patch_layer_impl.h"
8 #include "cc/resources/prioritized_resource.h" 8 #include "cc/resources/prioritized_resource.h"
9 #include "cc/resources/resource_update.h" 9 #include "cc/resources/resource_update.h"
10 #include "cc/resources/resource_update_queue.h" 10 #include "cc/resources/resource_update_queue.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 gfx::Rect content_rect(0, 0, bitmap_.width(), bitmap_.height()); 65 gfx::Rect content_rect(0, 0, bitmap_.width(), bitmap_.height());
66 ResourceUpdate upload = ResourceUpdate::Create(resource_->texture(), 66 ResourceUpdate upload = ResourceUpdate::Create(resource_->texture(),
67 &bitmap_, 67 &bitmap_,
68 content_rect, 68 content_rect,
69 content_rect, 69 content_rect,
70 gfx::Vector2d()); 70 gfx::Vector2d());
71 queue->AppendFullUpload(upload); 71 queue->AppendFullUpload(upload);
72 bitmap_dirty_ = false; 72 bitmap_dirty_ = false;
73 updated = true; 73 updated = true;
74 } 74 }
75
76 // NinePatchLayer must push properties every commit to make sure
77 // NinePatchLayerImpl::resource_id_ is valid.
78 // http://crbug.com/276482
79 needs_push_properties_ = true;
danakj 2013/08/20 18:18:04 Cool, just move this to the end of PushPropertiesT
75 return updated; 80 return updated;
76 } 81 }
77 82
78 void NinePatchLayer::CreateUpdaterIfNeeded() { 83 void NinePatchLayer::CreateUpdaterIfNeeded() {
79 if (updater_.get()) 84 if (updater_.get())
80 return; 85 return;
81 86
82 updater_ = ImageLayerUpdater::Create(); 87 updater_ = ImageLayerUpdater::Create();
83 } 88 }
84 89
(...skipping 22 matching lines...) Expand all
107 112
108 if (resource_) { 113 if (resource_) {
109 DCHECK(!bitmap_.isNull()); 114 DCHECK(!bitmap_.isNull());
110 layer_impl->SetResourceId(resource_->texture()->resource_id()); 115 layer_impl->SetResourceId(resource_->texture()->resource_id());
111 layer_impl->SetLayout( 116 layer_impl->SetLayout(
112 gfx::Size(bitmap_.width(), bitmap_.height()), image_aperture_); 117 gfx::Size(bitmap_.width(), bitmap_.height()), image_aperture_);
113 } 118 }
114 } 119 }
115 120
116 } // namespace cc 121 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/layers/nine_patch_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698