Rename platform/fonts/CharacterData.h to avoid conflict with core/dom

third_party/WebKit/Source/platform/fonts/Character.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "platform/fonts/Character.h"
 
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/StringBuilder.h"
 #include <algorithm>
 #include <unicode/uobject.h>
 #include <unicode/uscript.h>
 
 #if defined(USING_SYSTEM_ICU)
-#include "CharacterData.h"
+#include "CharacterPropertyDataGenerator.h"

[tkent, 2016/03/09 23:30:32]

should be "platform/fonts/CharacterPropertyDataGenerator.h"

[kojii, 2016/03/10 05:04:49]

Done.

 #include <unicode/uniset.h>
 #else
 #define MUTEX_H // Prevent compile failure of utrie2.h on Windows
 #include <utrie2.h>
 #endif
 
 using namespace WTF;
 using namespace Unicode;
 
 namespace blink {
@@ skipping 297 matching lines @@
 }
 
 bool Character::isCommonOrInheritedScript(UChar32 character)
 {
     UErrorCode status = U_ZERO_ERROR;
     UScriptCode script = uscript_getScript(character, &status);
     return U_SUCCESS(status) && (script == USCRIPT_COMMON || script == USCRIPT_INHERITED);
 }
 
 } // namespace blink