OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/render_sandbox_host_linux.h" | 5 #include "content/browser/renderer_host/render_sandbox_host_linux.h" |
6 | 6 |
7 #include <fcntl.h> | 7 #include <fcntl.h> |
8 #include <fontconfig/fontconfig.h> | 8 #include <fontconfig/fontconfig.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 #include <unistd.h> | 10 #include <unistd.h> |
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
654 | 654 |
655 SandboxIPCProcess::~SandboxIPCProcess() { | 655 SandboxIPCProcess::~SandboxIPCProcess() { |
656 if (webkit_platform_support_.get()) | 656 if (webkit_platform_support_.get()) |
657 WebKit::shutdown(); | 657 WebKit::shutdown(); |
658 } | 658 } |
659 | 659 |
660 void SandboxIPCProcess::EnsureWebKitInitialized() { | 660 void SandboxIPCProcess::EnsureWebKitInitialized() { |
661 if (webkit_platform_support_.get()) | 661 if (webkit_platform_support_.get()) |
662 return; | 662 return; |
663 webkit_platform_support_.reset(new content::WebKitPlatformSupportImpl); | 663 webkit_platform_support_.reset(new content::WebKitPlatformSupportImpl); |
664 WebKit::initialize(webkit_platform_support_.get()); | 664 WebKit::initializeWithoutV8(webkit_platform_support_.get()); |
665 } | 665 } |
666 | 666 |
667 // ----------------------------------------------------------------------------- | 667 // ----------------------------------------------------------------------------- |
668 | 668 |
669 // Runs on the main thread at startup. | 669 // Runs on the main thread at startup. |
670 RenderSandboxHostLinux::RenderSandboxHostLinux() | 670 RenderSandboxHostLinux::RenderSandboxHostLinux() |
671 : initialized_(false), | 671 : initialized_(false), |
672 renderer_socket_(0), | 672 renderer_socket_(0), |
673 childs_lifeline_fd_(0), | 673 childs_lifeline_fd_(0), |
674 pid_(0) { | 674 pid_(0) { |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
716 } | 716 } |
717 | 717 |
718 RenderSandboxHostLinux::~RenderSandboxHostLinux() { | 718 RenderSandboxHostLinux::~RenderSandboxHostLinux() { |
719 if (initialized_) { | 719 if (initialized_) { |
720 if (HANDLE_EINTR(close(renderer_socket_)) < 0) | 720 if (HANDLE_EINTR(close(renderer_socket_)) < 0) |
721 PLOG(ERROR) << "close"; | 721 PLOG(ERROR) << "close"; |
722 if (HANDLE_EINTR(close(childs_lifeline_fd_)) < 0) | 722 if (HANDLE_EINTR(close(childs_lifeline_fd_)) < 0) |
723 PLOG(ERROR) << "close"; | 723 PLOG(ERROR) << "close"; |
724 } | 724 } |
725 } | 725 } |
OLD | NEW |