Add support for HandleBlockingMessage to NaClMessageScanner

ppapi/proxy/nacl_message_scanner.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/nacl_message_scanner.h"
 
 #include <vector>
 #include "base/bind.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
@@ skipping 169 matching lines @@
   }
   bool ScanMessage(ScanningResults* results) {
     typename base::TupleTypes<typename MessageType::Schema::Param>::ValueTuple
         params;
     if (!MessageType::Read(msg_, &params))
       return false;
     ScanTuple(params, results);
     return true;
   }
 
+  bool ScanSyncMessage(ScanningResults* results) {
+    typename base::TupleTypes<
+        typename MessageType::Schema::SendParam>::ValueTuple params;
+    if (!MessageType::ReadSendParam(msg_, &params))
+      return false;
+    ScanTuple(params, results);

[Mark Seaborn, 2015/12/17 01:46:54]

This needs to be:

  bool ScanSyncMessage(ScanningResults* results) {
    typename base::TupleTypes<typename MessageType::Schema::SendParam>
        ::ValueTuple params;
    if (!MessageType::ReadSendParam(msg_, &params))
      return false;
    // If we need to rewrite the message, write the message id first.
    if (results->new_msg) {
      results->new_msg->set_sync();
      int id = IPC::SyncMessage::GetMessageId(*msg_);
      results->new_msg->WriteInt(id);
    }
    ScanTuple(params, results);
    return true;
  }

I figured this out for my change, https://codereview.chromium.org/1512733003/.

I was able to test that on Linux by setting "rewrite_msg = true" below.

[dmichael (off chromium), 2015/12/17 19:04:29]

Done.

+    return true;
+  }
+
   bool ScanReply(ScanningResults* results) {
     typename base::TupleTypes<typename MessageType::Schema::ReplyParam>
         ::ValueTuple params;
     if (!MessageType::ReadReplyParam(msg_, &params))
       return false;
     // If we need to rewrite the message, write the message id first.
     if (results->new_msg) {
       results->new_msg->set_reply();
       int id = IPC::SyncMessage::GetMessageId(*msg_);
       results->new_msg->WriteInt(id);
     }
     ScanTuple(params, results);
     return true;
   }
   // TODO(dmichael): Add ScanSyncMessage for outgoing sync messages, if we ever

[Mark Seaborn, 2015/12/17 01:49:04]

This TODO should be removed too.

[dmichael (off chromium), 2015/12/17 19:04:29]

Done.

   //                 need to scan those.
 
  private:
   const MessageType* msg_;
 };
 
 }  // namespace
 
 #define CASE_FOR_MESSAGE(MESSAGE_TYPE) \
       case MESSAGE_TYPE::ID: { \
         MessageScannerImpl<MESSAGE_TYPE> scanner(&msg); \
         if (rewrite_msg) \
           results.new_msg.reset( \
               new IPC::Message(msg.routing_id(), msg.type(), \
                                IPC::Message::PRIORITY_NORMAL)); \
         if (!scanner.ScanMessage(&results)) \
           return false; \
         break; \
       }
+#define CASE_FOR_SYNC_MESSAGE(MESSAGE_TYPE) \
+  case MESSAGE_TYPE::ID: { \

[Mark Seaborn, 2015/12/17 01:46:54]

Nit: can you make the indentation alignment match the macros above and below?

[dmichael (off chromium), 2015/12/17 19:04:29]

Done (actually changed the others; not sure why I had them weirdly indented. I
think this is now proper style.)

+    MessageScannerImpl<MESSAGE_TYPE> scanner(&msg); \
+    if (rewrite_msg) \
+      results.new_msg.reset(new IPC::Message(msg.routing_id(), msg.type(), \
+                                             IPC::Message::PRIORITY_NORMAL)); \
+    if (!scanner.ScanSyncMessage(&results)) \
+      return false; \
+    break; \
+  }
 #define CASE_FOR_REPLY(MESSAGE_TYPE) \
       case MESSAGE_TYPE::ID: { \
         MessageScannerImpl<MESSAGE_TYPE> scanner(&msg); \
         if (rewrite_msg) \
           results.new_msg.reset( \
               new IPC::Message(msg.routing_id(), msg.type(), \
                                IPC::Message::PRIORITY_NORMAL)); \
         if (!scanner.ScanReply(&results)) \
           return false; \
         break; \
@@ skipping 85 matching lines @@
   // that there are no handles, we can cancel the rewriting by clearing the
   // results.new_msg pointer.
   ScanningResults results;
   results.nested_msg_callback =
       base::Bind(&NaClMessageScanner::AuditNestedMessage,
                  base::Unretained(this));
   switch (type) {
     CASE_FOR_MESSAGE(PpapiMsg_PPBAudio_NotifyAudioStreamCreated)
     CASE_FOR_MESSAGE(PpapiMsg_PPPMessaging_HandleMessage)
     CASE_FOR_MESSAGE(PpapiPluginMsg_ResourceReply)
+    CASE_FOR_SYNC_MESSAGE(PpapiMsg_PPPMessageHandler_HandleBlockingMessage)
     CASE_FOR_REPLY(PpapiHostMsg_OpenResource)
     CASE_FOR_REPLY(PpapiHostMsg_PPBGraphics3D_Create)
     CASE_FOR_REPLY(PpapiHostMsg_PPBGraphics3D_CreateTransferBuffer)
     CASE_FOR_REPLY(PpapiHostMsg_PPBImageData_CreateSimple)
     CASE_FOR_REPLY(PpapiHostMsg_ResourceSyncCall)
     CASE_FOR_REPLY(PpapiHostMsg_SharedMemory_CreateSharedMemory)
     default:
       // Do nothing for messages we don't know.
       break;
   }
@@ skipping 180 matching lines @@
             fio_it->second->SetMaxWrittenOffset(offset_it->second);
         }
       }
       break;
     }
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi