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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.cpp

Issue 834693007: Remove the remaining parts of ignorePendingStylesheets and placeholder styles. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove comment. Created 5 years, 11 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 | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/web/WebNode.cpp » ('j') | 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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 && noninherited_flags == o.noninherited_flags 205 && noninherited_flags == o.noninherited_flags
206 && m_box == o.m_box 206 && m_box == o.m_box
207 && visual == o.visual 207 && visual == o.visual
208 && m_background == o.m_background 208 && m_background == o.m_background
209 && surround == o.surround 209 && surround == o.surround
210 && rareNonInheritedData == o.rareNonInheritedData 210 && rareNonInheritedData == o.rareNonInheritedData
211 && rareInheritedData == o.rareInheritedData 211 && rareInheritedData == o.rareInheritedData
212 && inherited == o.inherited; 212 && inherited == o.inherited;
213 } 213 }
214 214
215 bool RenderStyle::isStyleAvailable() const
216 {
217 return this != StyleResolver::styleNotYetAvailable();
218 }
219
220 bool RenderStyle::inheritedNotEqual(const RenderStyle* other) const 215 bool RenderStyle::inheritedNotEqual(const RenderStyle* other) const
221 { 216 {
222 return inherited_flags != other->inherited_flags 217 return inherited_flags != other->inherited_flags
223 || inherited != other->inherited 218 || inherited != other->inherited
224 || rareInheritedData != other->rareInheritedData; 219 || rareInheritedData != other->rareInheritedData;
225 } 220 }
226 221
227 bool RenderStyle::inheritedDataShared(const RenderStyle* other) const 222 bool RenderStyle::inheritedDataShared(const RenderStyle* other) const
228 { 223 {
229 // This is a fast check that only looks if the data structures are shared. 224 // This is a fast check that only looks if the data structures are shared.
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 // right 1259 // right
1265 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1260 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1266 if (radiiSum > rect.height()) 1261 if (radiiSum > rect.height())
1267 factor = std::min(rect.height() / radiiSum, factor); 1262 factor = std::min(rect.height() / radiiSum, factor);
1268 1263
1269 ASSERT(factor <= 1); 1264 ASSERT(factor <= 1);
1270 return factor; 1265 return factor;
1271 } 1266 }
1272 1267
1273 } // namespace blink 1268 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/web/WebNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698