Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Side by Side Diff: content/browser/renderer_host/sandbox_ipc_linux.h

Issue 825353003: Revert of Remove deprecated methods from Pickle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // http://code.google.com/p/chromium/wiki/LinuxSandboxIPC 5 // http://code.google.com/p/chromium/wiki/LinuxSandboxIPC
6 6
7 #ifndef CONTENT_BROWSER_RENDERER_HOST_SANDBOX_IPC_H_ 7 #ifndef CONTENT_BROWSER_RENDERER_HOST_SANDBOX_IPC_H_
8 #define CONTENT_BROWSER_RENDERER_HOST_SANDBOX_IPC_H_ 8 #define CONTENT_BROWSER_RENDERER_HOST_SANDBOX_IPC_H_
9 9
10 #include <vector> 10 #include <vector>
(...skipping 18 matching lines...) Expand all
29 void Run() override; 29 void Run() override;
30 30
31 private: 31 private:
32 void EnsureWebKitInitialized(); 32 void EnsureWebKitInitialized();
33 33
34 int FindOrAddPath(const SkString& path); 34 int FindOrAddPath(const SkString& path);
35 35
36 void HandleRequestFromRenderer(int fd); 36 void HandleRequestFromRenderer(int fd);
37 37
38 void HandleFontMatchRequest(int fd, 38 void HandleFontMatchRequest(int fd,
39 const Pickle& pickle,
39 PickleIterator iter, 40 PickleIterator iter,
40 const std::vector<base::ScopedFD*>& fds); 41 const std::vector<base::ScopedFD*>& fds);
41 42
42 void HandleFontOpenRequest(int fd, 43 void HandleFontOpenRequest(int fd,
44 const Pickle& pickle,
43 PickleIterator iter, 45 PickleIterator iter,
44 const std::vector<base::ScopedFD*>& fds); 46 const std::vector<base::ScopedFD*>& fds);
45 47
46 void HandleGetFallbackFontForChar(int fd, 48 void HandleGetFallbackFontForChar(int fd,
49 const Pickle& pickle,
47 PickleIterator iter, 50 PickleIterator iter,
48 const std::vector<base::ScopedFD*>& fds); 51 const std::vector<base::ScopedFD*>& fds);
49 52
50 void HandleGetStyleForStrike(int fd, 53 void HandleGetStyleForStrike(int fd,
54 const Pickle& pickle,
51 PickleIterator iter, 55 PickleIterator iter,
52 const std::vector<base::ScopedFD*>& fds); 56 const std::vector<base::ScopedFD*>& fds);
53 57
54 void HandleLocaltime(int fd, 58 void HandleLocaltime(int fd,
59 const Pickle& pickle,
55 PickleIterator iter, 60 PickleIterator iter,
56 const std::vector<base::ScopedFD*>& fds); 61 const std::vector<base::ScopedFD*>& fds);
57 62
58 void HandleMakeSharedMemorySegment(int fd, 63 void HandleMakeSharedMemorySegment(int fd,
64 const Pickle& pickle,
59 PickleIterator iter, 65 PickleIterator iter,
60 const std::vector<base::ScopedFD*>& fds); 66 const std::vector<base::ScopedFD*>& fds);
61 67
62 void HandleMatchWithFallback(int fd, 68 void HandleMatchWithFallback(int fd,
69 const Pickle& pickle,
63 PickleIterator iter, 70 PickleIterator iter,
64 const std::vector<base::ScopedFD*>& fds); 71 const std::vector<base::ScopedFD*>& fds);
65 72
66 void SendRendererReply(const std::vector<base::ScopedFD*>& fds, 73 void SendRendererReply(const std::vector<base::ScopedFD*>& fds,
67 const Pickle& reply, 74 const Pickle& reply,
68 int reply_fd); 75 int reply_fd);
69 76
70 const int lifeline_fd_; 77 const int lifeline_fd_;
71 const int browser_socket_; 78 const int browser_socket_;
72 scoped_ptr<BlinkPlatformImpl> blink_platform_impl_; 79 scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
73 SkTDArray<SkString*> paths_; 80 SkTDArray<SkString*> paths_;
74 81
75 DISALLOW_COPY_AND_ASSIGN(SandboxIPCHandler); 82 DISALLOW_COPY_AND_ASSIGN(SandboxIPCHandler);
76 }; 83 };
77 84
78 } // namespace content 85 } // namespace content
79 86
80 #endif // CONTENT_BROWSER_RENDERER_HOST_SANDBOX_IPC_H_ 87 #endif // CONTENT_BROWSER_RENDERER_HOST_SANDBOX_IPC_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/sandbox_ipc_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698