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

Unified Diff: content/renderer/hyphenator/hyphenator.h

Issue 12259025: Linux: apply a different hyphen patch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes 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
Index: content/renderer/hyphenator/hyphenator.h
diff --git a/content/renderer/hyphenator/hyphenator.h b/content/renderer/hyphenator/hyphenator.h
index 517e49f7358cf783307092ae84028492087f8f05..6d15fc2aa1d554cfead160060188bb4d6cb84c40 100644
--- a/content/renderer/hyphenator/hyphenator.h
+++ b/content/renderer/hyphenator/hyphenator.h
@@ -7,17 +7,13 @@
#include <vector>
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_handle.h"
#include "base/platform_file.h"
#include "base/string16.h"
#include "content/common/content_export.h"
#include "content/public/renderer/render_process_observer.h"
#include "ipc/ipc_platform_file.h"
-namespace file_util {
-class MemoryMappedFile;
-}
-
typedef struct _HyphenDict HyphenDict;
namespace content {
@@ -58,12 +54,9 @@ class CONTENT_EXPORT Hyphenator : public RenderProcessObserver {
// The dictionary used by the hyphen library.
HyphenDict* dictionary_;
- // The dictionary file and its memory-mapping object. (Our copy of the hyphen
- // library uses a memory-mapped file opened by a browser so renderers can use
- // it without opening the file.)
string16 locale_;
- base::PlatformFile rule_file_;
- scoped_ptr<file_util::MemoryMappedFile> rule_map_;
+
+ ScopedStdioHandle dictionary_file_;
// A cached result. WebKit often calls ComputeLastHyphenLocation with the same
// word multiple times to find the best hyphenation point when it finds a line

Powered by Google App Engine
This is Rietveld 408576698