Title: [179605] trunk/Source/WebKit2
- Revision
- 179605
- Author
- [email protected]
- Date
- 2015-02-04 09:49:05 -0800 (Wed, 04 Feb 2015)
Log Message
Build with seccomp filters broken since r179409
https://bugs.webkit.org/show_bug.cgi?id=141206
Patch by Michael Catanzaro <[email protected]> on 2015-02-04
Reviewed by Darin Adler.
Fix build by renaming SeccompBrokerClient::shared to SeccompBrokerClient::singleton.
* Shared/linux/SeccompFilters/SeccompBroker.cpp:
(WebKit::SeccompBrokerClient::singleton):
(WebKit::SeccompBroker::initialize):
(WebKit::SeccompBrokerClient::shared):
(WebKit::SeccompBroker::runLoop):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179604 => 179605)
--- trunk/Source/WebKit2/ChangeLog 2015-02-04 17:13:59 UTC (rev 179604)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-04 17:49:05 UTC (rev 179605)
@@ -1,3 +1,18 @@
+2015-02-04 Michael Catanzaro <[email protected]>
+
+ Build with seccomp filters broken since r179409
+ https://bugs.webkit.org/show_bug.cgi?id=141206
+
+ Reviewed by Darin Adler.
+
+ Fix build by renaming SeccompBrokerClient::shared to SeccompBrokerClient::singleton.
+
+ * Shared/linux/SeccompFilters/SeccompBroker.cpp:
+ (WebKit::SeccompBrokerClient::singleton):
+ (WebKit::SeccompBroker::initialize):
+ (WebKit::SeccompBrokerClient::shared):
+ (WebKit::SeccompBroker::runLoop):
+
2015-02-04 Simon Fraser <[email protected]>
[iOS WK2] Assert in ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren() on tab switching
Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp (179604 => 179605)
--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp 2015-02-04 17:13:59 UTC (rev 179604)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp 2015-02-04 17:49:05 UTC (rev 179605)
@@ -52,7 +52,7 @@
class SeccompBrokerClient {
public:
- static SeccompBrokerClient& shared(int socket = -1);
+ static SeccompBrokerClient& singleton(int socket = -1);
~SeccompBrokerClient();
void dispatch(Syscall*) const;
@@ -174,7 +174,7 @@
CRASH();
}
-SeccompBrokerClient& SeccompBrokerClient::shared(int socket)
+SeccompBrokerClient& SeccompBrokerClient::singleton(int socket)
{
DEPRECATED_DEFINE_STATIC_LOCAL(SeccompBrokerClient, brokerClient, (socket));
@@ -290,7 +290,7 @@
pid_t pid = fork();
if (pid) { // Sandboxed process.
close(sockets[1]);
- SeccompBrokerClient::shared(sockets[0]);
+ SeccompBrokerClient::singleton(sockets[0]);
registerSIGSYSHandler();
} else { // Broker.
// TODO: The broker should setup seccomp filters
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
