diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 00:47:05 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 00:47:05 +0000 |
| commit | e00f9da2250748213690b3586fc08a60e989b58f (patch) | |
| tree | 6a4f3e9cfeb43eaa442e85ffd6c1ed371f6d523a /chrome/browser/zygote_host_linux.cc | |
| parent | 0fbf0fe469cdd79468e97bd144fb4380e5dab2ef (diff) | |
| download | chromium_src-e00f9da2250748213690b3586fc08a60e989b58f.zip chromium_src-e00f9da2250748213690b3586fc08a60e989b58f.tar.gz chromium_src-e00f9da2250748213690b3586fc08a60e989b58f.tar.bz2 | |
Linux: fix font fallback for charactors missing from the primary font.
We are using the sandbox host for font fallback now via the WebKit
API. However, a patch landed in WebKit which added an assertion about
being on the correct thread. Since the sandbox host was using
WebString::fromUTF8, we hit the assertion and died.
So, we have to implement a WebKitClient for the sandbox host. We
cannot just pass in NULL because there's an assertion that it's
non-NULL. Also, we cannot pass in a bogus pointer because it actually
ends up getting called back.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/zygote_host_linux.cc')
| -rw-r--r-- | chrome/browser/zygote_host_linux.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/zygote_host_linux.cc b/chrome/browser/zygote_host_linux.cc index 230373c..afa55da 100644 --- a/chrome/browser/zygote_host_linux.cc +++ b/chrome/browser/zygote_host_linux.cc @@ -42,7 +42,7 @@ ZygoteHost::ZygoteHost() { // Start up the sandbox host process and get the file descriptor for the // renderers to talk to it. const int sfd = Singleton<RenderSandboxHostLinux>()->GetRendererSocket(); - fds_to_map.push_back(std::make_pair(sfd, 4)); + fds_to_map.push_back(std::make_pair(sfd, 5)); base::ProcessHandle process; base::LaunchApp(cmd_line.argv(), fds_to_map, false, &process); |