Linux: apply a different hyphen patch.

content/renderer/hyphenator/hyphenator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_HYPHENATOR_HYPHENATOR_H_
 #define CONTENT_RENDERER_HYPHENATOR_HYPHENATOR_H_
 
 #include <vector>
 
-#include "base/memory/scoped_ptr.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 {
 class RenderThread;
 
 // A class that hyphenates a word. This class encapsulates the hyphen library
 // and manages resources used by the library. When this class uses a huge
 // dictionary, it takes lots of memory (~1.3MB for English). A renderer should
 // create this object only when it renders a page that needs hyphenation and
 // deletes it when it moves to a page that does not need hyphenation.
@@ skipping 20 matching lines @@
 
   // RenderProcessObserver implementation.
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   void OnSetDictionary(IPC::PlatformFileForTransit rule_file);
 
   // 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_;
+
+  FILE* dictionary_file_;

[darin (slow to review), 2013/02/15 18:16:40]

nit: You could use ScopedStdioHandle here.

[Paweł Hajdan Jr., 2013/02/19 13:00:12]

Done.

 
   // A cached result. WebKit often calls ComputeLastHyphenLocation with the same
   // word multiple times to find the best hyphenation point when it finds a line
   // break. On the other hand, the hyphen library returns all hyphenation points
   // for a word. This class caches the hyphenation points returned by the hyphen
   // library to avoid calling the library multiple times.
   string16 word_;
   bool result_;
   std::vector<int> hyphen_offsets_;
 
   DISALLOW_COPY_AND_ASSIGN(Hyphenator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_HYPHENATOR_HYPHENATOR_H_