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

Side by Side Diff: trunk/Source/core/css/FontFaceSet.cpp

Issue 195823006: Revert 169264 "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 9 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met: 5 * modification, are permitted provided that the following conditions are met:
6 * 6 *
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 defaultFontDescription.setSpecifiedSize(defaultFontSize); 495 defaultFontDescription.setSpecifiedSize(defaultFontSize);
496 defaultFontDescription.setComputedSize(defaultFontSize); 496 defaultFontDescription.setComputedSize(defaultFontSize);
497 497
498 style->setFontDescription(defaultFontDescription); 498 style->setFontDescription(defaultFontDescription);
499 499
500 style->font().update(style->font().fontSelector()); 500 style->font().update(style->font().fontSelector());
501 501
502 // Now map the font property longhands into the style. 502 // Now map the font property longhands into the style.
503 CSSPropertyValue properties[] = { 503 CSSPropertyValue properties[] = {
504 CSSPropertyValue(CSSPropertyFontFamily, *parsedStyle), 504 CSSPropertyValue(CSSPropertyFontFamily, *parsedStyle),
505 CSSPropertyValue(CSSPropertyFontStretch, *parsedStyle),
506 CSSPropertyValue(CSSPropertyFontStyle, *parsedStyle), 505 CSSPropertyValue(CSSPropertyFontStyle, *parsedStyle),
507 CSSPropertyValue(CSSPropertyFontVariant, *parsedStyle), 506 CSSPropertyValue(CSSPropertyFontVariant, *parsedStyle),
508 CSSPropertyValue(CSSPropertyFontWeight, *parsedStyle), 507 CSSPropertyValue(CSSPropertyFontWeight, *parsedStyle),
509 CSSPropertyValue(CSSPropertyFontSize, *parsedStyle), 508 CSSPropertyValue(CSSPropertyFontSize, *parsedStyle),
510 CSSPropertyValue(CSSPropertyLineHeight, *parsedStyle), 509 CSSPropertyValue(CSSPropertyLineHeight, *parsedStyle),
511 }; 510 };
512 StyleResolver& styleResolver = document()->ensureStyleResolver(); 511 StyleResolver& styleResolver = document()->ensureStyleResolver();
513 styleResolver.applyPropertiesToStyle(properties, WTF_ARRAY_LENGTH(properties ), style.get()); 512 styleResolver.applyPropertiesToStyle(properties, WTF_ARRAY_LENGTH(properties ), style.get());
514 513
515 font = style->font(); 514 font = style->font();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 } 555 }
557 556
558 void FontFaceSet::didLayout(Document& document) 557 void FontFaceSet::didLayout(Document& document)
559 { 558 {
560 if (FontFaceSet* fonts = static_cast<FontFaceSet*>(SupplementType::from(docu ment, supplementName()))) 559 if (FontFaceSet* fonts = static_cast<FontFaceSet*>(SupplementType::from(docu ment, supplementName())))
561 fonts->didLayout(); 560 fonts->didLayout();
562 } 561 }
563 562
564 563
565 } // namespace WebCore 564 } // namespace WebCore
OLDNEW
« no previous file with comments | « trunk/Source/core/css/CSSShorthands.in ('k') | trunk/Source/core/css/StylePropertySerializer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698