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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2667543002: Moved nonproperty 'unique' to be generated in ComputedStyleBase. (Closed)
Patch Set: Rebase onto master Created 3 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 unified diff | Download patch
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 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
4 * reserved. 4 * reserved.
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; 380 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
381 381
382 // Correctly set during selector matching: 382 // Correctly set during selector matching:
383 // m_nonInheritedData.m_styleType 383 // m_nonInheritedData.m_styleType
384 // m_nonInheritedData.m_pseudoBits 384 // m_nonInheritedData.m_pseudoBits
385 385
386 // Set correctly while computing style for children: 386 // Set correctly while computing style for children:
387 // m_nonInheritedData.m_explicitInheritance 387 // m_nonInheritedData.m_explicitInheritance
388 388
389 // unique() styles are not cacheable. 389 // unique() styles are not cacheable.
390 DCHECK(!other.m_nonInheritedData.m_unique); 390 DCHECK(!other.unique());
391 391
392 // styles with non inherited properties that reference variables are not 392 // styles with non inherited properties that reference variables are not
393 // cacheable. 393 // cacheable.
394 DCHECK(!other.m_nonInheritedData.m_variableReference); 394 DCHECK(!other.m_nonInheritedData.m_variableReference);
395 395
396 // The following flags are set during matching before we decide that we get a 396 // The following flags are set during matching before we decide that we get a
397 // match in the MatchedPropertiesCache which in turn calls this method. The 397 // match in the MatchedPropertiesCache which in turn calls this method. The
398 // reason why we don't copy these flags is that they're already correctly set 398 // reason why we don't copy these flags is that they're already correctly set
399 // and that they may differ between elements which have the same set of 399 // and that they may differ between elements which have the same set of
400 // matched properties. For instance, given the rule: 400 // matched properties. For instance, given the rule:
(...skipping 2075 matching lines...) Expand 10 before | Expand all | Expand 10 after
2476 if (value < 0) 2476 if (value < 0)
2477 fvalue -= 0.5f; 2477 fvalue -= 0.5f;
2478 else 2478 else
2479 fvalue += 0.5f; 2479 fvalue += 0.5f;
2480 } 2480 }
2481 2481
2482 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2482 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2483 } 2483 }
2484 2484
2485 } // namespace blink 2485 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698