bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement Platform::hyphenator() to avoid crash (issue #1007).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1298 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-07-03 18:32:55 +00:00
parent 6d29c3ae5c
commit 1211129df4
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cef1/libcef/browser_webkit_init.cc
View File

@@ -12,6 +12,7 @@
#include "base/metrics/stats_counters.h" #include "base/metrics/stats_counters.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebHyphenator.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebPrerenderingSupport.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebPrerenderingSupport.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.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/WebKit.h"
@@ -21,6 +22,12 @@
#include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/plugin_list.h"
// Stub implementation of WebKit::WebHyphenator.
class BrowserHyphenator : public WebKit::WebHyphenator {
public:
virtual ~BrowserHyphenator() {}
};
// Stub implementation of WebKit::WebPrerenderingSupport. // Stub implementation of WebKit::WebPrerenderingSupport.
class BrowserPrerenderingSupport : public WebKit::WebPrerenderingSupport { class BrowserPrerenderingSupport : public WebKit::WebPrerenderingSupport {
public: public:
@@ -110,6 +117,12 @@ WebKit::WebFileSystem* BrowserWebKitInit::fileSystem() {
return file_system; return file_system;
} }
WebKit::WebHyphenator* BrowserWebKitInit::hyphenator() {
if (!hyphenator_.get())
hyphenator_.reset(new BrowserHyphenator);
return hyphenator_.get();
}
bool BrowserWebKitInit::sandboxEnabled() { bool BrowserWebKitInit::sandboxEnabled() {
return false; return false;
} }

3
cef1/libcef/browser_webkit_init.h
View File

@@ -23,6 +23,7 @@
#include "webkit/glue/webfileutilities_impl.h" #include "webkit/glue/webfileutilities_impl.h"
#include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/glue/webkitplatformsupport_impl.h"
class BrowserHyphenator;
class BrowserPrerenderingSupport; class BrowserPrerenderingSupport;
namespace WebKit { namespace WebKit {
@@ -41,6 +42,7 @@ class BrowserWebKitInit : public webkit_glue::WebKitPlatformSupportImpl {
virtual WebKit::WebBlobRegistry* blobRegistry() OVERRIDE; virtual WebKit::WebBlobRegistry* blobRegistry() OVERRIDE;
virtual WebKit::WebCookieJar* cookieJar() OVERRIDE; virtual WebKit::WebCookieJar* cookieJar() OVERRIDE;
virtual WebKit::WebFileSystem* fileSystem() OVERRIDE; virtual WebKit::WebFileSystem* fileSystem() OVERRIDE;
virtual WebKit::WebHyphenator* hyphenator() OVERRIDE;
virtual bool sandboxEnabled() OVERRIDE; virtual bool sandboxEnabled() OVERRIDE;
virtual WebKit::Platform::FileHandle databaseOpenFile( virtual WebKit::Platform::FileHandle databaseOpenFile(
const WebKit::WebString& vfs_file_name, int desired_flags) OVERRIDE; const WebKit::WebString& vfs_file_name, int desired_flags) OVERRIDE;
@@ -105,6 +107,7 @@ class BrowserWebKitInit : public webkit_glue::WebKitPlatformSupportImpl {
BrowserWebCookieJarImpl cookie_jar_; BrowserWebCookieJarImpl cookie_jar_;
scoped_refptr<BrowserWebBlobRegistryImpl> blob_registry_; scoped_refptr<BrowserWebBlobRegistryImpl> blob_registry_;
scoped_ptr<BrowserPrerenderingSupport> prerendering_support_; scoped_ptr<BrowserPrerenderingSupport> prerendering_support_;
scoped_ptr<BrowserHyphenator> hyphenator_;
}; };
#endif // CEF_LIBCEF_BROWSER_WEBKIT_INIT_H_ #endif // CEF_LIBCEF_BROWSER_WEBKIT_INIT_H_