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

Side by Side Diff: sky/engine/core/css/resolver/SharedStyleFinder.cpp

Issue 1036933002: StocksApp hits an ASSERT when bringing up search (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 return true; 146 return true;
147 } 147 }
148 return false; 148 return false;
149 } 149 }
150 150
151 inline Element* SharedStyleFinder::findElementForStyleSharing() const 151 inline Element* SharedStyleFinder::findElementForStyleSharing() const
152 { 152 {
153 StyleSharingList& styleSharingList = m_styleResolver.styleSharingList(); 153 StyleSharingList& styleSharingList = m_styleResolver.styleSharingList();
154 for (StyleSharingList::iterator it = styleSharingList.begin(); it != styleSh aringList.end(); ++it) { 154 for (StyleSharingList::iterator it = styleSharingList.begin(); it != styleSh aringList.end(); ++it) {
155 Element& candidate = **it; 155 Element& candidate = **it;
156 if (!canShareStyleWithElement(candidate)) 156 // We shouldn't have elements in the style sharing list that don't
157 // support style sharing but we can end up with one currently if it gets
158 // added to the list and then it starts an animation.
159 if (candidate.hasActiveAnimations() || !canShareStyleWithElement(candida te))
157 continue; 160 continue;
158 if (it != styleSharingList.begin()) { 161 if (it != styleSharingList.begin()) {
159 // Move the element to the front of the LRU 162 // Move the element to the front of the LRU
160 styleSharingList.remove(it); 163 styleSharingList.remove(it);
161 styleSharingList.prepend(&candidate); 164 styleSharingList.prepend(&candidate);
162 } 165 }
163 return &candidate; 166 return &candidate;
164 } 167 }
165 m_styleResolver.addToStyleSharingList(element()); 168 m_styleResolver.addToStyleSharingList(element());
166 return 0; 169 return 0;
(...skipping 22 matching lines...) Expand all
189 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleMissed); 192 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleMissed);
190 return 0; 193 return 0;
191 } 194 }
192 195
193 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleFound); 196 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleFound);
194 197
195 return shareElement->renderStyle(); 198 return shareElement->renderStyle();
196 } 199 }
197 200
198 } 201 }
OLDNEW
« 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