Add AtomicString, SkString version of equalIgnoringCase

Add AtomicString, SkString version of equalIgnoringCase

Add a version of equalIgnoringCase that takes an AtomicString and a
SkString and use it for font family matches. This takes care of the
encoding logic and ensures that the easiest way to compare the two
is the right way.

R=eseidel@chromium.org,leviw@chromium.org
BUG=249099
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=158042

[eseidel1, 2013-09-19 00:08:02]

Looks like you have a stray change. Maybe a String(skstring) constructor
would help?

On Wednesday, September 18, 2013,  <eae@chromium.org> wrote:
> Reviewers: eseidel, Levi,
>
> Description:
> Add AtomicString, SkString version of equalIgnoringCase
>
> Add a version of equalIgnoringCase that takes an AtomicString and a
> SkString and use it for font family matches. This takes care of the
> encoding logic and ensures that the easiest way to compare the two
> is the right way.
>
> R=eseidel@chromium.org,leviw@chromium.org
> BUG=
>
> Please review this at https://codereview.chromium.org/23835013/
>
> SVN Base: https://chromium.googlesource.com/chromium/blink.git@master
>
> Affected files (+7, -2 lines):
>   M Source/core/features.gypi
>   M Source/core/platform/graphics/skia/FontCacheSkiaWin.cpp
>
>
> Index: Source/core/features.gypi
> diff --git a/Source/core/features.gypi b/Source/core/features.gypi
> index
e5d8d6b0364d8a9006f39eb46a8ed810f5efeee6..51ed531652fb5143cb229299d3db38dfcf413d8e
100644
> --- a/Source/core/features.gypi
> +++ b/Source/core/features.gypi
> @@ -39,7 +39,7 @@
>        'ENABLE_ENCRYPTED_MEDIA_V2=1',
>        'ENABLE_SVG_FONTS=1',
>        'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
> -      'ENABLE_GDI_FONTS_ON_WINDOWS=1',
> +      'ENABLE_GDI_FONTS_ON_WINDOWS=0',
>        # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
>        # We can't define it here because it should be present only
>        # in Debug or release_valgrind_build=1 builds.
> Index: Source/core/platform/graphics/skia/FontCacheSkiaWin.cpp
> diff --git a/Source/core/platform/graphics/skia/FontCacheSkiaWin.cpp
b/Source/core/platform/graphics/skia/FontCacheSkiaWin.cpp
> index
4462607a6d7f0a07de02b3cfef473bab8747a37a..9338967630e1f979d350bf9a13b4b063d363023e
100644
> --- a/Source/core/platform/graphics/skia/FontCacheSkiaWin.cpp
> +++ b/Source/core/platform/graphics/skia/FontCacheSkiaWin.cpp
> @@ -157,6 +157,11 @@ PassRefPtr<SimpleFontData>
FontCache::getFontDataForCharacter(const Font& font,
>      return 0;
>  }
>
> +static inline bool equalIgnoringCase(const AtomicString& a, const
SkString& b)
> +{
> +    return equalIgnoringCase(a, AtomicString::fromUTF8(b.c_str()));
> +}
> +
>  static bool typefacesMatchesFamily(const SkTypeface* tf, const
AtomicString& family)
>  {
>      SkTypeface::LocalizedStrings* actualFamilies =
tf->createFamilyNameIterator();
> @@ -164,7 +169,7 @@ static bool typefacesMatchesFamily(const SkTypeface*
tf, const AtomicString& fam
>      SkTypeface::LocalizedString actualFamily;
>
>      while (actualFamilies->next(&actualFamily)) {
> -        if (equalIgnoringCase(family,
AtomicString::fromUTF8(actualFamily.fString.c_str()))) {
> +        if (equalIgnoringCase(family, actualFamily.fString)) {
>              matchesRequestedFamily = true;
>              break;
>          }
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to blink-reviews+unsubscribe@chromium.org.

[eae, 2013-09-19 01:14:04]

Yeah, patch 2 fixed that. You reviewed the wrong patch version :)

To unsubscribe from this group and stop receiving emails from it, send an email
to blink-reviews+unsubscribe@chromium.org.

[eseidel, 2013-09-19 01:16:14]

I only see patch 1, but maybe I'm looking at the wrong review url?

[eae, 2013-09-19 16:13:28]

On 2013/09/19 01:16:14, eseidel wrote:
> I only see patch 1, but maybe I'm looking at the wrong review url?

Patch 1 is the new one... (I deleted the old incorrect one).

[eseidel, 2013-09-19 16:30:00]

lgtm

lgtm.  We still might want to have explicit SkSTring conversion methods instead
of just special casing equalIgnoringString.

[commit-bot: I haz the power, 2013-09-19 16:30:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eae@chromium.org/23835013/4001

[eae, 2013-09-19 16:32:39]

On 2013/09/19 16:30:00, eseidel wrote:
> lgtm
> 
> lgtm.  We still might want to have explicit SkSTring conversion methods
instead
> of just special casing equalIgnoringString.

Yeah, we'll likely end up there but for now we only use SkStrings in a handful
of places so this should be sufficient. 

Thanks!

[commit-bot: I haz the power, 2013-09-19 18:28:34]

Change committed as 158042