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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/FontDescription.h

Issue 2222283002: Fix scriptCodeForHanFromSubtags() may return non-Han scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 20 matching lines...) Expand all
31 #include "platform/fonts/FontCacheKey.h" 31 #include "platform/fonts/FontCacheKey.h"
32 #include "platform/fonts/FontFamily.h" 32 #include "platform/fonts/FontFamily.h"
33 #include "platform/fonts/FontFeatureSettings.h" 33 #include "platform/fonts/FontFeatureSettings.h"
34 #include "platform/fonts/FontOrientation.h" 34 #include "platform/fonts/FontOrientation.h"
35 #include "platform/fonts/FontSmoothingMode.h" 35 #include "platform/fonts/FontSmoothingMode.h"
36 #include "platform/fonts/FontTraits.h" 36 #include "platform/fonts/FontTraits.h"
37 #include "platform/fonts/FontVariantNumeric.h" 37 #include "platform/fonts/FontVariantNumeric.h"
38 #include "platform/fonts/FontWidthVariant.h" 38 #include "platform/fonts/FontWidthVariant.h"
39 #include "platform/fonts/TextRenderingMode.h" 39 #include "platform/fonts/TextRenderingMode.h"
40 #include "platform/fonts/TypesettingFeatures.h" 40 #include "platform/fonts/TypesettingFeatures.h"
41 #include "platform/text/LocaleToScriptMapping.h"
42 #include "wtf/Allocator.h" 41 #include "wtf/Allocator.h"
43 #include "wtf/MathExtras.h" 42 #include "wtf/MathExtras.h"
44 43
45 #include "wtf/RefPtr.h" 44 #include "wtf/RefPtr.h"
46 45
47 #include <unicode/uscript.h> 46 #include <unicode/uscript.h>
48 47
49 namespace blink { 48 namespace blink {
50 49
51 const float FontSizeAdjustNone = -1; 50 const float FontSizeAdjustNone = -1;
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 && m_letterSpacing == other.m_letterSpacing 320 && m_letterSpacing == other.m_letterSpacing
322 && m_wordSpacing == other.m_wordSpacing 321 && m_wordSpacing == other.m_wordSpacing
323 && m_fieldsAsUnsigned.parts[0] == other.m_fieldsAsUnsigned.parts[0] 322 && m_fieldsAsUnsigned.parts[0] == other.m_fieldsAsUnsigned.parts[0]
324 && m_fieldsAsUnsigned.parts[1] == other.m_fieldsAsUnsigned.parts[1] 323 && m_fieldsAsUnsigned.parts[1] == other.m_fieldsAsUnsigned.parts[1]
325 && (m_featureSettings == other.m_featureSettings || (m_featureSettings & & other.m_featureSettings && *m_featureSettings == *other.m_featureSettings)); 324 && (m_featureSettings == other.m_featureSettings || (m_featureSettings & & other.m_featureSettings && *m_featureSettings == *other.m_featureSettings));
326 } 325 }
327 326
328 } // namespace blink 327 } // namespace blink
329 328
330 #endif 329 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698