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

Side by Side Diff: Source/core/css/resolver/FontBuilder.cpp

Issue 327323002: Start removing the double-negative !ASSERT_DISABLED (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSStyleSheet.cpp ('k') | Source/core/dom/ActiveDOMObject.h » ('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 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google Inc. 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 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 case CSSValueContextual: 432 case CSSValueContextual:
433 contextualLigaturesState = FontDescription::EnabledLigatures State; 433 contextualLigaturesState = FontDescription::EnabledLigatures State;
434 break; 434 break;
435 default: 435 default:
436 ASSERT_NOT_REACHED(); 436 ASSERT_NOT_REACHED();
437 break; 437 break;
438 } 438 }
439 } 439 }
440 } 440 }
441 } 441 }
442 #if !ASSERT_DISABLED 442 #if ASSERT_ENABLED
443 else { 443 else {
444 ASSERT_WITH_SECURITY_IMPLICATION(value->isPrimitiveValue()); 444 ASSERT_WITH_SECURITY_IMPLICATION(value->isPrimitiveValue());
445 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNormal); 445 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNormal);
446 } 446 }
447 #endif 447 #endif
448 448
449 scope.fontDescription().setCommonLigaturesState(commonLigaturesState); 449 scope.fontDescription().setCommonLigaturesState(commonLigaturesState);
450 scope.fontDescription().setDiscretionaryLigaturesState(discretionaryLigature sState); 450 scope.fontDescription().setDiscretionaryLigaturesState(discretionaryLigature sState);
451 scope.fontDescription().setHistoricalLigaturesState(historicalLigaturesState ); 451 scope.fontDescription().setHistoricalLigaturesState(historicalLigaturesState );
452 scope.fontDescription().setContextualLigaturesState(contextualLigaturesState ); 452 scope.fontDescription().setContextualLigaturesState(contextualLigaturesState );
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 FontOrientation fontOrientation; 660 FontOrientation fontOrientation;
661 NonCJKGlyphOrientation glyphOrientation; 661 NonCJKGlyphOrientation glyphOrientation;
662 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ; 662 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ;
663 fontDescription.setOrientation(fontOrientation); 663 fontDescription.setOrientation(fontOrientation);
664 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); 664 fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
665 documentStyle->setFontDescription(fontDescription); 665 documentStyle->setFontDescription(fontDescription);
666 documentStyle->font().update(fontSelector); 666 documentStyle->font().update(fontSelector);
667 } 667 }
668 668
669 } 669 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSStyleSheet.cpp ('k') | Source/core/dom/ActiveDOMObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698