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

Unified Diff: webkit/support/test_webkit_platform_support.cc

Issue 12259025: Linux: apply a different hyphen patch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: trybots Created 7 years, 10 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
« content/renderer/hyphenator/hyphenator.h ('K') | « third_party/hyphen/hyphen.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/test_webkit_platform_support.cc
diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc
index e9f1961ed98c59416a21d21013cb963ab761113f..3146870271d496ad62ace86c349cce71abba1ea7 100644
--- a/webkit/support/test_webkit_platform_support.cc
+++ b/webkit/support/test_webkit_platform_support.cc
@@ -549,12 +549,7 @@ size_t TestWebKitPlatformSupport::computeLastHyphenLocation(
// flakiness, this code synchronously loads the dictionary.
base::FilePath path = webkit_support::GetChromiumRootDirFilePath();
path = path.Append(FILE_PATH_LITERAL("third_party/hyphen/hyph_en_US.dic"));
- std::string dictionary;
- if (!file_util::ReadFileToString(path, &dictionary))
- return 0;
- hyphen_dictionary_ = hnj_hyphen_load(
- reinterpret_cast<const unsigned char*>(dictionary.data()),
- dictionary.length());
+ hyphen_dictionary_ = hnj_hyphen_load(path.value().c_str());
darin (slow to review) 2013/02/15 18:16:40 Does this work on Windows? FilePath::value() retu
Paweł Hajdan Jr. 2013/02/19 13:00:12 Fixed. Thank you for advice about Windows quirks.
if (!hyphen_dictionary_)
return 0;
}
« content/renderer/hyphenator/hyphenator.h ('K') | « third_party/hyphen/hyphen.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698