Title: [157490] trunk
Revision
157490
Author
commit-qu...@webkit.org
Date
2013-10-15 21:36:24 -0700 (Tue, 15 Oct 2013)

Log Message

[EFL][WK2] Make SeccompFilters build again after r156349 and r156353
https://bugs.webkit.org/show_bug.cgi?id=122872

Patch by Sergio Correia <sergio.corr...@openbossa.org> on 2013-10-15
Reviewed by Anders Carlsson.

Source/WebKit2:

* Shared/linux/SeccompFilters/SeccompBroker.cpp:
(WebKit::SeccompBrokerClient::dispatch): Fix usage of extinct 'create'
methods of ArgumentEncoder/ArgumentDecoder.
(WebKit::SeccompBroker::runLoop): Ditto.

Tools:

* TestWebKitAPI/PlatformEfl.cmake: Mark SeccompFilters API test as
failing.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (157489 => 157490)


--- trunk/Source/WebKit2/ChangeLog	2013-10-16 04:32:50 UTC (rev 157489)
+++ trunk/Source/WebKit2/ChangeLog	2013-10-16 04:36:24 UTC (rev 157490)
@@ -1,3 +1,15 @@
+2013-10-15  Sergio Correia  <sergio.corr...@openbossa.org>
+
+        [EFL][WK2] Make SeccompFilters build again after r156349 and r156353
+        https://bugs.webkit.org/show_bug.cgi?id=122872
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/linux/SeccompFilters/SeccompBroker.cpp:
+        (WebKit::SeccompBrokerClient::dispatch): Fix usage of extinct 'create'
+        methods of ArgumentEncoder/ArgumentDecoder.
+        (WebKit::SeccompBroker::runLoop): Ditto.
+
 2013-10-15  Jinwoo Song  <jinwoo7.s...@samsung.com>
 
         Removed argument coders for FloatPoint3D in CoodinatedGraphicsArgumentCoders.

Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp (157489 => 157490)


--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp	2013-10-16 04:32:50 UTC (rev 157489)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp	2013-10-16 04:36:24 UTC (rev 157490)
@@ -196,7 +196,7 @@
 
 void SeccompBrokerClient::dispatch(Syscall* syscall) const
 {
-    OwnPtr<CoreIPC::ArgumentEncoder> encoder = CoreIPC::ArgumentEncoder::create();
+    auto encoder = std::make_unique<CoreIPC::ArgumentEncoder>();
     encoder->encode(*syscall);
 
     char buffer[messageMaxSize];
@@ -219,7 +219,7 @@
 
     m_socketLock.unlock();
 
-    OwnPtr<CoreIPC::ArgumentDecoder> decoder = CoreIPC::ArgumentDecoder::create((const uint8_t*) buffer, receivedBytes);
+    auto decoder = std::make_unique<CoreIPC::ArgumentDecoder>((const uint8_t*) buffer, receivedBytes);
     OwnPtr<SyscallResult> result = SyscallResult::createFromDecoder(decoder.get(), fd);
     if (!result)
         CRASH();
@@ -324,7 +324,7 @@
         if (receivedBytes <= 0)
             exit(receivedBytes ? EXIT_FAILURE : EXIT_SUCCESS);
 
-        OwnPtr<CoreIPC::ArgumentDecoder> decoder = CoreIPC::ArgumentDecoder::create((const uint8_t*) buffer, receivedBytes);
+        auto decoder = std::make_unique<CoreIPC::ArgumentDecoder>((const uint8_t*) buffer, receivedBytes);
         OwnPtr<Syscall> syscall = Syscall::createFromDecoder(decoder.get());
         if (!syscall)
             exit(EXIT_FAILURE);
@@ -333,7 +333,7 @@
         if (!result)
             exit(EXIT_FAILURE);
 
-        OwnPtr<CoreIPC::ArgumentEncoder> encoder = CoreIPC::ArgumentEncoder::create();
+        auto encoder = std::make_unique<CoreIPC::ArgumentEncoder>();
         encoder->encode(*result);
 
         Vector<CoreIPC::Attachment> attachments = encoder->releaseAttachments();

Modified: trunk/Tools/ChangeLog (157489 => 157490)


--- trunk/Tools/ChangeLog	2013-10-16 04:32:50 UTC (rev 157489)
+++ trunk/Tools/ChangeLog	2013-10-16 04:36:24 UTC (rev 157490)
@@ -1,3 +1,13 @@
+2013-10-15  Sergio Correia  <sergio.corr...@openbossa.org>
+
+        [EFL][WK2] Make SeccompFilters build again after r156349 and r156353
+        https://bugs.webkit.org/show_bug.cgi?id=122872
+
+        Reviewed by Anders Carlsson.
+
+        * TestWebKitAPI/PlatformEfl.cmake: Mark SeccompFilters API test as
+        failing.
+
 2013-10-15  Dean Jackson  <d...@apple.com>
 
         Add ENABLE_WEB_ANIMATIONS flag

Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (157489 => 157490)


--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake	2013-10-16 04:32:50 UTC (rev 157489)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake	2013-10-16 04:36:24 UTC (rev 157490)
@@ -107,15 +107,6 @@
     efl/WKViewClientWebProcessCallbacks
 )
 
-# Seccomp filters is an internal API and its symbols
-# are not (and should not) be exposed by default. We
-# can only test it when building shared core.
-if (ENABLE_SECCOMP_FILTERS AND SHARED_CORE)
-    list(APPEND test_webkit2_api_BINARIES
-        SeccompFilters
-    )
-endif ()
-
 set(test_webkit2_api_fail_BINARIES
     CanHandleRequest
     DOMWindowExtensionBasic
@@ -127,6 +118,15 @@
     WKPageGetScaleFactorNotZero
 )
 
+# Seccomp filters is an internal API and its symbols
+# are not (and should not) be exposed by default. We
+# can only test it when building shared core.
+if (ENABLE_SECCOMP_FILTERS AND SHARED_CORE)
+    list(APPEND test_webkit2_api_fail_BINARIES
+        SeccompFilters
+    )
+endif ()
+
 # Tests disabled because of missing features on the test harness:
 #
 #   SpacebarScrolling
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to