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

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

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 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
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 * Copyright (C) 2015 Collabora Ltd. All rights reserved. 5 * Copyright (C) 2015 Collabora Ltd. 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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 description.setLocale(m_fontDescription.locale(false)); 362 description.setLocale(m_fontDescription.locale(false));
363 if (isSet(PropertySetFlag::Style)) 363 if (isSet(PropertySetFlag::Style))
364 description.setStyle(m_fontDescription.style()); 364 description.setStyle(m_fontDescription.style());
365 if (isSet(PropertySetFlag::Variant)) 365 if (isSet(PropertySetFlag::Variant))
366 description.setVariant(m_fontDescription.variant()); 366 description.setVariant(m_fontDescription.variant());
367 if (isSet(PropertySetFlag::VariantLigatures)) 367 if (isSet(PropertySetFlag::VariantLigatures))
368 description.setVariantLigatures(m_fontDescription.variantLigatures()); 368 description.setVariantLigatures(m_fontDescription.variantLigatures());
369 if (isSet(PropertySetFlag::TextRendering)) 369 if (isSet(PropertySetFlag::TextRendering))
370 description.setTextRendering(m_fontDescription.textRendering()); 370 description.setTextRendering(m_fontDescription.textRendering());
371 if (isSet(PropertySetFlag::Kerning)) 371 if (isSet(PropertySetFlag::Kerning))
372 description.setKerning(m_fontDescription.kerning()); 372 description.setKerning(m_fontDescription.getKerning());
373 if (isSet(PropertySetFlag::FontSmoothing)) 373 if (isSet(PropertySetFlag::FontSmoothing))
374 description.setFontSmoothing(m_fontDescription.fontSmoothing()); 374 description.setFontSmoothing(m_fontDescription.fontSmoothing());
375 if (isSet(PropertySetFlag::TextOrientation) || isSet(PropertySetFlag::Writin gMode)) 375 if (isSet(PropertySetFlag::TextOrientation) || isSet(PropertySetFlag::Writin gMode))
376 updateOrientation(description, style); 376 updateOrientation(description, style);
377 377
378 updateSpecifiedSize(description, style); 378 updateSpecifiedSize(description, style);
379 updateComputedSize(description, style); 379 updateComputedSize(description, style);
380 updateAdjustedSize(description, style, fontSelector.get()); 380 updateAdjustedSize(description, style, fontSelector.get());
381 381
382 style.setFontDescription(description); 382 style.setFontDescription(description);
(...skipping 10 matching lines...) Expand all
393 setSize(fontDescription, FontDescription::Size(FontSize::initialKeywordSize( ), 0.0f, false)); 393 setSize(fontDescription, FontDescription::Size(FontSize::initialKeywordSize( ), 0.0f, false));
394 updateSpecifiedSize(fontDescription, documentStyle); 394 updateSpecifiedSize(fontDescription, documentStyle);
395 updateComputedSize(fontDescription, documentStyle); 395 updateComputedSize(fontDescription, documentStyle);
396 396
397 updateOrientation(fontDescription, documentStyle); 397 updateOrientation(fontDescription, documentStyle);
398 documentStyle.setFontDescription(fontDescription); 398 documentStyle.setFontDescription(fontDescription);
399 documentStyle.font().update(fontSelector); 399 documentStyle.font().update(fontSelector);
400 } 400 }
401 401
402 } // namespace blink 402 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698