Switch from using individual methods for hyphenation to using the WebHyphantor interface

webkit/support/test_webkit_platform_support.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 "webkit/support/test_webkit_platform_support.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/memory/scoped_handle.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "cc/thread_impl.h"
 #include "media/base/media.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_cache.h"
 #include "net/test/test_server.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAudioDevice.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebStorageArea.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
-#include "third_party/hyphen/hyphen.h"
 #include "v8/include/v8.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h"
 #include "webkit/database/vfs_backend.h"
 #include "webkit/glue/simple_webmimeregistry_impl.h"
 #include "webkit/glue/webclipboard_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
@@ skipping 21 matching lines @@
 #elif defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 
 using WebKit::WebLayerTreeViewImplForTesting;
 using WebKit::WebScriptController;
 
 TestWebKitPlatformSupport::TestWebKitPlatformSupport(bool unit_test_mode,
     WebKit::Platform* shadow_platform_delegate)
     : unit_test_mode_(unit_test_mode),
-      shadow_platform_delegate_(shadow_platform_delegate),
-      hyphen_dictionary_(NULL) {
+      shadow_platform_delegate_(shadow_platform_delegate) {
   v8::V8::SetCounterFunction(base::StatsTable::FindLocation);
 
   WebKit::initialize(this);
   WebKit::setLayoutTestMode(true);
   WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(
       WebKit::WebString::fromUTF8("test-shell-resource"));
   WebKit::WebSecurityPolicy::registerURLSchemeAsNoAccess(
       WebKit::WebString::fromUTF8("test-shell-resource"));
   WebKit::WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(
       WebKit::WebString::fromUTF8("test-shell-resource"));
@@ skipping 42 matching lines @@
   blob_registry_ = new TestShellWebBlobRegistryImpl();
 
   file_utilities_.set_sandbox_enabled(false);
 
   if (!file_system_root_.CreateUniqueTempDir()) {
     LOG(WARNING) << "Failed to create a temp dir for the filesystem."
                     "FileSystem feature will be disabled.";
     DCHECK(file_system_root_.path().empty());
   }
 
+  {
+    // Initialize the hyphen library with a sample dictionary.
+    base::FilePath path = webkit_support::GetChromiumRootDirFilePath();
+    path = path.Append(FILE_PATH_LITERAL("third_party/hyphen/hyph_en_US.dic"));
+    base::PlatformFile dict_file = base::CreatePlatformFile(
+        path,
+        base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ,
+        NULL, NULL);
+    hyphenator_.LoadDictionary(dict_file);
+  }
+
 #if defined(OS_WIN)
   // Ensure we pick up the default theme engine.
   SetThemeEngine(NULL);
 #endif
 
   net::HttpCache::Mode cache_mode = net::HttpCache::NORMAL;
   net::CookieMonster::EnableFileScheme();
 
   // Initializing with a default context, which means no on-disk cookie DB,
   // and no support for directory listings.
   SimpleResourceLoaderBridge::Init(base::FilePath(), cache_mode, true);
 
   // Test shell always exposes the GC.
   webkit_glue::SetJavaScriptFlags(" --expose-gc");
   // Expose GCController to JavaScript.
   WebScriptController::registerExtension(extensions_v8::GCExtension::Get());
 }
 
 TestWebKitPlatformSupport::~TestWebKitPlatformSupport() {
-  if (hyphen_dictionary_)
-    hnj_hyphen_free(hyphen_dictionary_);
 }
 
 WebKit::WebMimeRegistry* TestWebKitPlatformSupport::mimeRegistry() {
   return &mime_registry_;
 }
 
 WebKit::WebClipboard* TestWebKitPlatformSupport::clipboard() {
   // Mock out clipboard calls so that tests don't mess
   // with each other's copies/pastes when running in parallel.
   return &mock_clipboard_;
@@ skipping 12 matching lines @@
 }
 
 WebKit::WebBlobRegistry* TestWebKitPlatformSupport::blobRegistry() {
   return blob_registry_.get();
 }
 
 WebKit::WebFileSystem* TestWebKitPlatformSupport::fileSystem() {
   return &file_system_;
 }
 
+WebKit::WebHyphenator* TestWebKitPlatformSupport::hyphenator() {
+  return &hyphenator_;
+}
+
 bool TestWebKitPlatformSupport::sandboxEnabled() {
   return true;
 }
 
 WebKit::Platform::FileHandle
 TestWebKitPlatformSupport::databaseOpenFile(
     const WebKit::WebString& vfs_file_name, int desired_flags) {
   return SimpleDatabaseSystem::GetInstance()->OpenFile(
       vfs_file_name, desired_flags);
 }
@@ skipping 270 matching lines @@
 TestWebKitPlatformSupport::createRTCPeerConnectionHandler(
     WebKit::WebRTCPeerConnectionHandlerClient* client) {
   if (shadow_platform_delegate_)
     return shadow_platform_delegate_->createRTCPeerConnectionHandler(client);
 
   return webkit_glue::WebKitPlatformSupportImpl::createRTCPeerConnectionHandler(
       client);
 }
 
 bool TestWebKitPlatformSupport::canHyphenate(const WebKit::WebString& locale) {
-  return locale.isEmpty()  || locale.equals("en") || locale.equals("en_US")  ||
-      locale.equals("en_GB");
+  return hyphenator()->canHyphenate(locale);
 }
 
 size_t TestWebKitPlatformSupport::computeLastHyphenLocation(
     const char16* characters,
     size_t length,
     size_t before_index,
     const WebKit::WebString& locale) {
-  DCHECK(locale.isEmpty()  || locale.equals("en") || locale.equals("en_US")  ||
-         locale.equals("en_GB"));
-  if (!hyphen_dictionary_) {
-    // Initialize the hyphen library with a sample dictionary. To avoid test
-    // 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"));
-    base::PlatformFile dict_file = base::CreatePlatformFile(
-        path,
-        base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ,
-        NULL, NULL);
-    if (dict_file == base::kInvalidPlatformFileValue)
-      return 0;
-    ScopedStdioHandle dict_handle(base::FdopenPlatformFile(dict_file, "r"));
-    if (!dict_handle.get()) {
-      base::ClosePlatformFile(dict_file);
-      return 0;
-    }
-    hyphen_dictionary_ = hnj_hyphen_load_file(dict_handle.get());
-    if (!hyphen_dictionary_)
-      return 0;
-  }
-  // Retrieve the positions where we can insert hyphens. This function assumes
-  // the input word is an English word so it can use the position returned by
-  // the hyphen library without conversion.
-  string16 word_utf16(characters, length);
-  if (!IsStringASCII(word_utf16))
-    return 0;
-  std::string word = StringToLowerASCII(UTF16ToASCII(word_utf16));
-  scoped_array<char> hyphens(new char[word.length() + 5]);
-  char** rep = NULL;
-  int* pos = NULL;
-  int* cut = NULL;
-  int error = hnj_hyphen_hyphenate2(hyphen_dictionary_,
-                                    word.data(),
-                                    static_cast<int>(word.length()),
-                                    hyphens.get(),
-                                    NULL,
-                                    &rep,
-                                    &pos,
-                                    &cut);
-  if (error)
-    return 0;
-
-  // Release all resources allocated by the hyphen library now because they are
-  // not used when hyphenating English words.
-  if (rep) {
-    for (size_t i = 0; i < word.length(); ++i) {
-      if (rep[i])
-        free(rep[i]);
-    }
-    free(rep);
-  }
-  if (pos)
-    free(pos);
-  if (cut)
-    free(cut);
-
-  // Retrieve the last position where we can insert a hyphen before the given
-  // index.
-  if (before_index >= 2) {
-    for (size_t index = before_index - 2; index > 0; --index) {
-      if (hyphens[index] & 1)
-        return index + 1;
-    }
-  }
-  return 0;
+  return hyphenator()->computeLastHyphenLocation(
+      characters, length, before_index, locale);
 }
 
 WebKit::WebGestureCurve* TestWebKitPlatformSupport::createFlingAnimationCurve(
     int device_source,
     const WebKit::WebFloatPoint& velocity,
     const WebKit::WebSize& cumulative_scroll) {
   // Caller will retain and release.
   return new WebGestureCurveMock(velocity, cumulative_scroll);
 }
 
@@ skipping 43 matching lines @@
   return view.release();
 }
 
 WebKit::WebLayerTreeView*
     TestWebKitPlatformSupport::createLayerTreeViewForTesting(
         TestViewType type) {
   DCHECK_EQ(TestViewTypeUnitTest, type);
   return createLayerTreeViewForTesting();
 }