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

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

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8
Patch Set: get-names-9: rebase 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 zoomFactor *= frame->textZoomFactor(); 228 zoomFactor *= frame->textZoomFactor();
229 229
230 return FontSize::getComputedSizeFromSpecifiedSize(m_document, zoomFactor, fo ntDescription.isAbsoluteSize(), specifiedSize); 230 return FontSize::getComputedSizeFromSpecifiedSize(m_document, zoomFactor, fo ntDescription.isAbsoluteSize(), specifiedSize);
231 } 231 }
232 232
233 static FontOrientation fontOrientation(const ComputedStyle& style) 233 static FontOrientation fontOrientation(const ComputedStyle& style)
234 { 234 {
235 if (style.isHorizontalWritingMode()) 235 if (style.isHorizontalWritingMode())
236 return FontOrientation::Horizontal; 236 return FontOrientation::Horizontal;
237 237
238 switch (style.textOrientation()) { 238 switch (style.getTextOrientation()) {
239 case TextOrientationMixed: 239 case TextOrientationMixed:
240 return FontOrientation::VerticalMixed; 240 return FontOrientation::VerticalMixed;
241 case TextOrientationUpright: 241 case TextOrientationUpright:
242 return FontOrientation::VerticalUpright; 242 return FontOrientation::VerticalUpright;
243 case TextOrientationSideways: 243 case TextOrientationSideways:
244 return FontOrientation::VerticalRotated; 244 return FontOrientation::VerticalRotated;
245 default: 245 default:
246 ASSERT_NOT_REACHED(); 246 ASSERT_NOT_REACHED();
247 return FontOrientation::VerticalMixed; 247 return FontOrientation::VerticalMixed;
248 } 248 }
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
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