Linux: apply a different hyphen patch.

content/renderer/hyphenator/hyphenator.cc

 // 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.
 
 #include "content/renderer/hyphenator/hyphenator.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 166 matching lines @@
   }
   return !hyphen_offsets->empty();
 }
 
 }  // namespace
 
 namespace content {
 
 Hyphenator::Hyphenator(base::PlatformFile file)
     : dictionary_(NULL),
-      rule_file_(file),
+      dictionary_file_(base::FdopenPlatformFile(file, "r")),
       result_(0) {
 }
 
 Hyphenator::~Hyphenator() {
   if (dictionary_)
     hnj_hyphen_free(dictionary_);
-  if (rule_file_ != base::kInvalidPlatformFileValue)
-    base::ClosePlatformFile(rule_file_);
 }
 
 bool Hyphenator::Initialize() {
   if (dictionary_)
     return true;
 
-  // Attach the dictionary file to the MemoryMappedFile object. When it
-  // succeeds, this class does not have to close this file because it is closed
-  // by the MemoryMappedFile class. To prevent this class from closing this
-  // file, we reset its handle.
-  rule_map_.reset(new file_util::MemoryMappedFile);
-  if (!rule_map_->Initialize(rule_file_))
+  if (!dictionary_file_.get())
     return false;
-  rule_file_ = base::kInvalidPlatformFileValue;
-
-  dictionary_ = hnj_hyphen_load(rule_map_->data(), rule_map_->length());
+  dictionary_ = hnj_hyphen_load_file(dictionary_file_.get());
   return !!dictionary_;
 }
 
 bool Hyphenator::Attach(RenderThread* thread, const string16& locale) {
   if (!thread)
     return false;
   locale_.assign(locale);
   thread->AddObserver(this);
   return thread->Send(new HyphenatorHostMsg_OpenDictionary(locale));
 }
@@ skipping 44 matching lines @@
   // Delete the current dictionary and save the given file to this object. We
   // initialize the hyphen library the first time when WebKit actually
   // hyphenates a word, i.e. when WebKit calls the ComputeLastHyphenLocation
   // function. (WebKit does not always hyphenate words even when it calls the
   // CanHyphenate function, e.g. WebKit does not have to hyphenate words when it
   // does not have to break text into lines.)
   if (dictionary_) {
     hnj_hyphen_free(dictionary_);
     dictionary_ = NULL;
   }
-  rule_map_.reset();
-  rule_file_ = rule_file;
+  dictionary_file_.Set(base::FdopenPlatformFile(rule_file, "r"));
 }
 
 }  // namespace content