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

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

Issue 397733004: Allow assertions to be enabled in Blink Release builds. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed config.gni. Minor cleanups. Created 6 years, 5 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
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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 case CSSValueContextual: 434 case CSSValueContextual:
435 contextualLigaturesState = FontDescription::EnabledLigatures State; 435 contextualLigaturesState = FontDescription::EnabledLigatures State;
436 break; 436 break;
437 default: 437 default:
438 ASSERT_NOT_REACHED(); 438 ASSERT_NOT_REACHED();
439 break; 439 break;
440 } 440 }
441 } 441 }
442 } 442 }
443 } 443 }
444 #if ASSERT_ENABLED 444 #if ENABLE(ASSERT)
445 else { 445 else {
446 ASSERT_WITH_SECURITY_IMPLICATION(value->isPrimitiveValue()); 446 ASSERT_WITH_SECURITY_IMPLICATION(value->isPrimitiveValue());
447 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNormal); 447 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNormal);
448 } 448 }
449 #endif 449 #endif
450 450
451 scope.fontDescription().setCommonLigaturesState(commonLigaturesState); 451 scope.fontDescription().setCommonLigaturesState(commonLigaturesState);
452 scope.fontDescription().setDiscretionaryLigaturesState(discretionaryLigature sState); 452 scope.fontDescription().setDiscretionaryLigaturesState(discretionaryLigature sState);
453 scope.fontDescription().setHistoricalLigaturesState(historicalLigaturesState ); 453 scope.fontDescription().setHistoricalLigaturesState(historicalLigaturesState );
454 scope.fontDescription().setContextualLigaturesState(contextualLigaturesState ); 454 scope.fontDescription().setContextualLigaturesState(contextualLigaturesState );
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 FontOrientation fontOrientation; 662 FontOrientation fontOrientation;
663 NonCJKGlyphOrientation glyphOrientation; 663 NonCJKGlyphOrientation glyphOrientation;
664 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ; 664 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ;
665 fontDescription.setOrientation(fontOrientation); 665 fontDescription.setOrientation(fontOrientation);
666 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); 666 fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
667 documentStyle->setFontDescription(fontDescription); 667 documentStyle->setFontDescription(fontDescription);
668 documentStyle->font().update(fontSelector); 668 documentStyle->font().update(fontSelector);
669 } 669 }
670 670
671 } 671 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698