diff options
| author | mkosiba <mkosiba@chromium.org> | 2015-01-09 05:10:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 13:11:05 +0000 |
| commit | 3c766cc321a77febd8cf726436e22ab385f8ac1b (patch) | |
| tree | 69f80a3088b48f0cd108a179f30adcc315b862b2 /content/zygote | |
| parent | c5feb0407d876d63c4db686e0b7c8b8f2b73bf6e (diff) | |
| download | chromium_src-3c766cc321a77febd8cf726436e22ab385f8ac1b.zip chromium_src-3c766cc321a77febd8cf726436e22ab385f8ac1b.tar.gz chromium_src-3c766cc321a77febd8cf726436e22ab385f8ac1b.tar.bz2 | |
mmap V8 snapshot and ICU data file in the android_webview
This makes it possible to mmap the V8 snapshot and ICU data file
directly from the WebView APK.
Doing so makes it possible to remove the android_webview_telemetry_build
flag which in turns means we can build the WebView with the same
set of flags that Chrome on Android uses.
BUG=442338
Review URL: https://codereview.chromium.org/812393002
Cr-Commit-Position: refs/heads/master@{#310765}
Diffstat (limited to 'content/zygote')
| -rw-r--r-- | content/zygote/zygote_linux.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc index e9b940e..051f791 100644 --- a/content/zygote/zygote_linux.cc +++ b/content/zygote/zygote_linux.cc @@ -51,8 +51,8 @@ void SIGCHLDHandler(int signal) { int LookUpFd(const base::GlobalDescriptors::Mapping& fd_mapping, uint32_t key) { for (size_t index = 0; index < fd_mapping.size(); ++index) { - if (fd_mapping[index].first == key) - return fd_mapping[index].second; + if (fd_mapping[index].key == key) + return fd_mapping[index].fd; } return -1; } @@ -506,10 +506,10 @@ base::ProcessId Zygote::ReadArgsAndFork(PickleIterator iter, base::GlobalDescriptors::Key key; if (!iter.ReadUInt32(&key)) return -1; - mapping.push_back(std::make_pair(key, fds[i]->get())); + mapping.push_back(base::GlobalDescriptors::Descriptor(key, fds[i]->get())); } - mapping.push_back(std::make_pair( + mapping.push_back(base::GlobalDescriptors::Descriptor( static_cast<uint32_t>(kSandboxIPCChannel), GetSandboxFD())); // Returns twice, once per process. |