[webkit-changes] [131722] trunk/Source/WebKit2

Thu, 18 Oct 2012 03:31:11 -0700

Title: [131722] trunk/Source/WebKit2
Revision
131722
Author
[email protected]
Date
2012-10-18 03:25:25 -0700 (Thu, 18 Oct 2012)

Log Message

[WK2] Fix incorrect test expectations of messages_unittest.py.
https://bugs.webkit.org/show_bug.cgi?id=99699

Patch by Byungwoo Lee <[email protected]> on 2012-10-18
Reviewed by Gyuyoung Kim.

Fix the expected results of messages_unittest.py.

The expected result of messages_unittest.py has bugs, and it makes failure on python test.

* Scripts/webkit2/messages_unittest.py:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (131721 => 131722)


--- trunk/Source/WebKit2/ChangeLog	2012-10-18 10:23:44 UTC (rev 131721)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-18 10:25:25 UTC (rev 131722)
@@ -1,3 +1,16 @@
+2012-10-18  Byungwoo Lee  <[email protected]>
+
+        [WK2] Fix incorrect test expectations of messages_unittest.py.
+        https://bugs.webkit.org/show_bug.cgi?id=99699
+
+        Reviewed by Gyuyoung Kim.
+
+        Fix the expected results of messages_unittest.py.
+
+        The expected result of messages_unittest.py has bugs, and it makes failure on python test.
+
+        * Scripts/webkit2/messages_unittest.py:
+
 2012-10-18  Jussi Kukkonen  <[email protected]>
 
         Add PluginProcessProxy::platformInitializeLaunchOptions

Modified: trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py (131721 => 131722)


--- trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py	2012-10-18 10:23:44 UTC (rev 131721)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py	2012-10-18 10:25:25 UTC (rev 131722)
@@ -467,14 +467,14 @@
 struct GetPluginProcessConnection : CoreIPC::Arguments1<const WTF::String&> {
     static const Kind messageID = GetPluginProcessConnectionID;
     struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
-        DelayedReply(PassRefPtr<CoreIPC::Connection>, PassOwnPtr<CoreIPC::MessageEncoder>);
+        DelayedReply(PassRefPtr<CoreIPC::Connection>, PassOwnPtr<CoreIPC::ArgumentEncoder>);
         ~DelayedReply();
 
         bool send(const CoreIPC::Connection::Handle& connectionHandle);
 
     private:
         RefPtr<CoreIPC::Connection> m_connection;
-        OwnPtr<CoreIPC::MessageEncoder> m_encoder;
+        OwnPtr<CoreIPC::ArgumentEncoder> m_arguments;
     };
 
     typedef CoreIPC::Arguments1<CoreIPC::Connection::Handle&> Reply;
@@ -488,14 +488,14 @@
 struct TestMultipleAttributes : CoreIPC::Arguments0 {
     static const Kind messageID = TestMultipleAttributesID;
     struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
-        DelayedReply(PassRefPtr<CoreIPC::Connection>, PassOwnPtr<CoreIPC::MessageEncoder>);
+        DelayedReply(PassRefPtr<CoreIPC::Connection>, PassOwnPtr<CoreIPC::ArgumentEncoder>);
         ~DelayedReply();
 
         bool send();
 
     private:
         RefPtr<CoreIPC::Connection> m_connection;
-        OwnPtr<CoreIPC::MessageEncoder> m_encoder;
+        OwnPtr<CoreIPC::ArgumentEncoder> m_arguments;
     };
 
     typedef CoreIPC::Arguments0 Reply;
@@ -640,9 +640,9 @@
 
 namespace WebPage {
 
-GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<CoreIPC::Connection> connection, PassOwnPtr<CoreIPC::MessageEncoder> arguments)
+GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<CoreIPC::Connection> connection, PassOwnPtr<CoreIPC::ArgumentEncoder> arguments)
     : m_connection(connection)
-    , m_encoder(arguments)
+    , m_arguments(arguments)
 {
 }
 
@@ -653,16 +653,16 @@
 
 bool GetPluginProcessConnection::DelayedReply::send(const CoreIPC::Connection::Handle& connectionHandle)
 {
-    ASSERT(m_encoder);
-    m_encoder->encode(connectionHandle);
+    ASSERT(m_arguments);
+    m_arguments->encode(connectionHandle);
     bool result = m_connection->sendSyncReply(static_pointer_cast<CoreIPC::MessageEncoder>(m_arguments.release()));
     m_connection = nullptr;
     return result;
 }
 
-TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<CoreIPC::Connection> connection, PassOwnPtr<CoreIPC::MessageEncoder> arguments)
+TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<CoreIPC::Connection> connection, PassOwnPtr<CoreIPC::ArgumentEncoder> arguments)
     : m_connection(connection)
-    , m_encoder(arguments)
+    , m_arguments(arguments)
 {
 }
 
@@ -673,7 +673,7 @@
 
 bool TestMultipleAttributes::DelayedReply::send()
 {
-    ASSERT(m_encoder);
+    ASSERT(m_arguments);
     bool result = m_connection->sendSyncReply(static_pointer_cast<CoreIPC::MessageEncoder>(m_arguments.release()));
     m_connection = nullptr;
     return result;
@@ -755,7 +755,7 @@
     ASSERT_NOT_REACHED();
 }
 
-void WebPage::didReceiveSyncWebPageMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, OwnPtr<CoreIPC::MessageEncoder>& reply)
+void WebPage::didReceiveSyncWebPageMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, OwnPtr<CoreIPC::ArgumentEncoder>& reply)
 {
     switch (messageID.get<Messages::WebPage::Kind>()) {
     case Messages::WebPage::CreatePluginID:

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to