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

Unified Diff: cc/picture_layer_impl.cc

Issue 12209103: cc: Fix PostiveRatio crash by checking raster scale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/picture_layer_impl.cc
diff --git a/cc/picture_layer_impl.cc b/cc/picture_layer_impl.cc
index bb608e84e00d27661ac0bb86599db4f79981bbca..1af6e686db1d85c56ae6195651e1455c3944c5f3 100644
--- a/cc/picture_layer_impl.cc
+++ b/cc/picture_layer_impl.cc
@@ -570,7 +570,7 @@ void PictureLayerImpl::ManageTilings(bool animating_transform_to_screen) {
raster_source_scale_was_animating_ = animating_transform_to_screen;
}
- if (is_active_layer && is_pinching) {
+ if (is_active_layer && is_pinching && raster_page_scale_) {
danakj 2013/02/11 23:11:35 I guess all of these if()s could be guarded by (..
enne (OOO) 2013/02/12 02:18:20 Or put it all in a helper function? Anyway, I'm ju
// If the page scale diverges too far during pinch, change raster target to
// the current page scale.
float ratio = PositiveRatio(ideal_page_scale_, raster_page_scale_);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698