third_party/WebKit/Source/platform/fonts/Character.cpp - Issue 1780523003: Rename platform/fonts/CharacterData.h to avoid conflict with core/dom

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/fonts/Character.cpp

Issue 1780523003: Rename platform/fonts/CharacterData.h to avoid conflict with core/dom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/blink_platform.gyp ('k') | third_party/WebKit/Source/platform/fonts/CharacterData.h » ('j') | third_party/WebKit/Source/platform/fonts/CharacterPropertyDataGenerator.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/platform/fonts/Character.cpp b/third_party/WebKit/Source/platform/fonts/Character.cpp

index 26161793011f786b383383cb39a465ef2ed5ac09..d1f989663357c95517d375df04b0631bfc6326e0 100644

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

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

@@ -37,7 +37,7 @@

#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/CharacterPropertyDataGen

kojii 2016/03/10 05:04:49 Done.

#include <unicode/uniset.h>

#else

#define MUTEX_H // Prevent compile failure of utrie2.h on Windows