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

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 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
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | 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 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; 377 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
378 378
379 // Correctly set during selector matching: 379 // Correctly set during selector matching:
380 // m_nonInheritedData.m_styleType 380 // m_nonInheritedData.m_styleType
381 // m_nonInheritedData.m_pseudoBits 381 // m_nonInheritedData.m_pseudoBits
382 382
383 // Set correctly while computing style for children: 383 // Set correctly while computing style for children:
384 // m_nonInheritedData.m_explicitInheritance 384 // m_nonInheritedData.m_explicitInheritance
385 385
386 // unique() styles are not cacheable. 386 // unique() styles are not cacheable.
387 DCHECK(!other.m_nonInheritedData.m_unique); 387 DCHECK(!other.unique());
388 388
389 // styles with non inherited properties that reference variables are not 389 // styles with non inherited properties that reference variables are not
390 // cacheable. 390 // cacheable.
391 DCHECK(!other.m_nonInheritedData.m_variableReference); 391 DCHECK(!other.m_nonInheritedData.m_variableReference);
392 392
393 // The following flags are set during matching before we decide that we get a 393 // The following flags are set during matching before we decide that we get a
394 // match in the MatchedPropertiesCache which in turn calls this method. The 394 // match in the MatchedPropertiesCache which in turn calls this method. The
395 // reason why we don't copy these flags is that they're already correctly set 395 // reason why we don't copy these flags is that they're already correctly set
396 // and that they may differ between elements which have the same set of 396 // and that they may differ between elements which have the same set of
397 // matched properties. For instance, given the rule: 397 // matched properties. For instance, given the rule:
(...skipping 2076 matching lines...) Expand 10 before | Expand all | Expand 10 after
2474 if (value < 0) 2474 if (value < 0)
2475 fvalue -= 0.5f; 2475 fvalue -= 0.5f;
2476 else 2476 else
2477 fvalue += 0.5f; 2477 fvalue += 0.5f;
2478 } 2478 }
2479 2479
2480 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2480 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2481 } 2481 }
2482 2482
2483 } // namespace blink 2483 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698