PPAPI: Take PPB_MessageLoop out of Dev

PPAPI: Take PPB_MessageLoop out of Dev

BUG=92909, 159700
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=168029

[darin (slow to review), 2012-11-12 20:49:06]

LGTM

[commit-bot: I haz the power, 2012-11-14 22:16:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dmichael@chromium.org/11364188/4021

[commit-bot: I haz the power, 2012-11-14 22:16:23]

Failed to apply patch for
ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
  Hunk #1 FAILED at 3.
  Hunk #3 succeeded at 52 (offset 1 line).
  Hunk #4 succeeded at 134 (offset 1 line).
  Hunk #5 succeeded at 177 (offset 1 line).
  Hunk #6 succeeded at 760 (offset 2 lines).
  Hunk #7 succeeded at 1618 (offset 2 lines).
  Hunk #8 succeeded at 3565 (offset 12 lines).
  Hunk #9 succeeded at 3797 (offset 12 lines).
  Hunk #10 succeeded at 4356 (offset 16 lines).
  Hunk #11 succeeded at 4614 (offset 16 lines).
  Hunk #12 succeeded at 5037 (offset 22 lines).
  Hunk #13 succeeded at 5074 (offset 22 lines).
  1 out of 13 hunks FAILED -- saving rejects to file
ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c.rej

Patch:       ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index
c38569a0c77d37b0b56be461930fa16a5eaf16e5..b6dad4fd2c5fcf24c182c881c4fd9dea2586d095
100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* Last generated from IDL: Fri Nov  9 15:24:06 2012. */
+/* Last generated from IDL: Mon Nov 12 13:37:45 2012. */
 #include "ppapi/generators/pnacl_shim.h"
 
 #include "ppapi/c/ppb.h"
@@ -20,7 +20,6 @@
 #include "ppapi/c/dev/ppb_ime_input_event_dev.h"
 #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h"
 #include "ppapi/c/dev/ppb_memory_dev.h"
-#include "ppapi/c/dev/ppb_message_loop_dev.h"
 #include "ppapi/c/dev/ppb_printing_dev.h"
 #include "ppapi/c/dev/ppb_resource_array_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
@@ -52,6 +51,7 @@
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/c/ppb_instance.h"
+#include "ppapi/c/ppb_message_loop.h"
 #include "ppapi/c/ppb_messaging.h"
 #include "ppapi/c/ppb_mouse_cursor.h"
 #include "ppapi/c/ppb_mouse_lock.h"
@@ -133,6 +133,7 @@ static struct __PnaclWrapperInfo
Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Instance_0_5;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Instance_1_0;
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MessageLoop_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseCursor_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseLock_1_0;
@@ -175,7 +176,6 @@ static struct __PnaclWrapperInfo
Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_2;
 static struct __PnaclWrapperInfo
Pnacl_WrapperInfo_PPB_KeyboardInputEvent_Dev_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Memory_Dev_0_1;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_6;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_7;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_ResourceArray_Dev_0_1;
@@ -758,6 +758,52 @@ PP_Bool Pnacl_M13_PPB_Instance_IsFullFrame(PP_Instance
instance) {
 
 /* Not generating wrapper methods for PPB_Instance_1_0 */
 
+/* Begin wrapper methods for PPB_MessageLoop_1_0 */
+
+static __attribute__((pnaclcall))
+PP_Resource Pnacl_M25_PPB_MessageLoop_Create(PP_Instance instance) {
+  const struct PPB_MessageLoop_1_0 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_1_0.real_iface;
+  return iface->Create(instance);
+}
+
+static __attribute__((pnaclcall))
+PP_Resource Pnacl_M25_PPB_MessageLoop_GetForMainThread() {
+  const struct PPB_MessageLoop_1_0 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_1_0.real_iface;
+  return iface->GetForMainThread();
+}
+
+static __attribute__((pnaclcall))
+PP_Resource Pnacl_M25_PPB_MessageLoop_GetCurrent() {
+  const struct PPB_MessageLoop_1_0 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_1_0.real_iface;
+  return iface->GetCurrent();
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M25_PPB_MessageLoop_AttachToCurrentThread(PP_Resource
message_loop) {
+  const struct PPB_MessageLoop_1_0 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_1_0.real_iface;
+  return iface->AttachToCurrentThread(message_loop);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M25_PPB_MessageLoop_Run(PP_Resource message_loop) {
+  const struct PPB_MessageLoop_1_0 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_1_0.real_iface;
+  return iface->Run(message_loop);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M25_PPB_MessageLoop_PostWork(PP_Resource message_loop, struct
PP_CompletionCallback callback, int64_t delay_ms) {
+  const struct PPB_MessageLoop_1_0 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_1_0.real_iface;
+  return iface->PostWork(message_loop, callback, delay_ms);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M25_PPB_MessageLoop_PostQuit(PP_Resource message_loop, PP_Bool
should_destroy) {
+  const struct PPB_MessageLoop_1_0 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_1_0.real_iface;
+  return iface->PostQuit(message_loop, should_destroy);
+}
+
+/* End wrapper methods for PPB_MessageLoop_1_0 */
+
 /* Begin wrapper methods for PPB_Messaging_1_0 */
 
 static __attribute__((pnaclcall))
@@ -1570,52 +1616,6 @@ void
Pnacl_M21_PPB_IMEInputEvent_Dev_GetSelection(PP_Resource ime_event, uint32_
 
 /* Not generating wrapper methods for PPB_Memory_Dev_0_1 */
 
-/* Begin wrapper methods for PPB_MessageLoop_Dev_0_1 */
-
-static __attribute__((pnaclcall))
-PP_Resource Pnacl_M18_PPB_MessageLoop_Dev_Create(PP_Instance instance) {
-  const struct PPB_MessageLoop_Dev_0_1 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1.real_iface;
-  return iface->Create(instance);
-}
-
-static __attribute__((pnaclcall))
-PP_Resource Pnacl_M18_PPB_MessageLoop_Dev_GetForMainThread() {
-  const struct PPB_MessageLoop_Dev_0_1 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1.real_iface;
-  return iface->GetForMainThread();
-}
-
-static __attribute__((pnaclcall))
-PP_Resource Pnacl_M18_PPB_MessageLoop_Dev_GetCurrent() {
-  const struct PPB_MessageLoop_Dev_0_1 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1.real_iface;
-  return iface->GetCurrent();
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M18_PPB_MessageLoop_Dev_AttachToCurrentThread(PP_Resource
message_loop) {
-  const struct PPB_MessageLoop_Dev_0_1 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1.real_iface;
-  return iface->AttachToCurrentThread(message_loop);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M18_PPB_MessageLoop_Dev_Run(PP_Resource message_loop) {
-  const struct PPB_MessageLoop_Dev_0_1 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1.real_iface;
-  return iface->Run(message_loop);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M18_PPB_MessageLoop_Dev_PostWork(PP_Resource message_loop, struct
PP_CompletionCallback callback, int64_t delay_ms) {
-  const struct PPB_MessageLoop_Dev_0_1 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1.real_iface;
-  return iface->PostWork(message_loop, callback, delay_ms);
-}
-
-static __attribute__((pnaclcall))
-int32_t Pnacl_M18_PPB_MessageLoop_Dev_PostQuit(PP_Resource message_loop,
PP_Bool should_destroy) {
-  const struct PPB_MessageLoop_Dev_0_1 *iface =
Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1.real_iface;
-  return iface->PostQuit(message_loop, should_destroy);
-}
-
-/* End wrapper methods for PPB_MessageLoop_Dev_0_1 */
-
 /* Not generating wrapper methods for PPB_Printing_Dev_0_6 */
 
 /* Begin wrapper methods for PPB_Printing_Dev_0_7 */
@@ -3553,6 +3553,16 @@ struct PPB_Instance_0_5 Pnacl_Wrappers_PPB_Instance_0_5 =
{
 
 /* Not generating wrapper interface for PPB_Instance_1_0 */
 
+struct PPB_MessageLoop_1_0 Pnacl_Wrappers_PPB_MessageLoop_1_0 = {
+    .Create = (PP_Resource (*)(PP_Instance
instance))&Pnacl_M25_PPB_MessageLoop_Create,
+    .GetForMainThread = (PP_Resource
(*)())&Pnacl_M25_PPB_MessageLoop_GetForMainThread,
+    .GetCurrent = (PP_Resource (*)())&Pnacl_M25_PPB_MessageLoop_GetCurrent,
+    .AttachToCurrentThread = (int32_t (*)(PP_Resource
message_loop))&Pnacl_M25_PPB_MessageLoop_AttachToCurrentThread,
+    .Run = (int32_t (*)(PP_Resource
message_loop))&Pnacl_M25_PPB_MessageLoop_Run,
+    .PostWork = (int32_t (*)(PP_Resource message_loop, struct
PP_CompletionCallback callback, int64_t
delay_ms))&Pnacl_M25_PPB_MessageLoop_PostWork,
+    .PostQuit = (int32_t (*)(PP_Resource message_loop, PP_Bool
should_destroy))&Pnacl_M25_PPB_MessageLoop_PostQuit
+};
+
 struct PPB_Messaging_1_0 Pnacl_Wrappers_PPB_Messaging_1_0 = {
     .PostMessage = (void (*)(PP_Instance instance, struct PP_Var
message))&Pnacl_M14_PPB_Messaging_PostMessage
 };
@@ -3775,16 +3785,6 @@ struct PPB_IMEInputEvent_Dev_0_2
Pnacl_Wrappers_PPB_IMEInputEvent_Dev_0_2 = {
 
 /* Not generating wrapper interface for PPB_Memory_Dev_0_1 */
 
-struct PPB_MessageLoop_Dev_0_1 Pnacl_Wrappers_PPB_MessageLoop_Dev_0_1 = {
-    .Create = (PP_Resource (*)(PP_Instance
instance))&Pnacl_M18_PPB_MessageLoop_Dev_Create,
-    .GetForMainThread = (PP_Resource
(*)())&Pnacl_M18_PPB_MessageLoop_Dev_GetForMainThread,
-    .GetCurrent = (PP_Resource (*)())&Pnacl_M18_PPB_MessageLoop_Dev_GetCurrent,
-    .AttachToCurrentThread = (int32_t (*)(PP_Resource
message_loop))&Pnacl_M18_PPB_MessageLoop_Dev_AttachToCurrentThread,
-    .Run = (int32_t (*)(PP_Resource
message_loop))&Pnacl_M18_PPB_MessageLoop_Dev_Run,
-    .PostWork = (int32_t (*)(PP_Resource message_loop, struct
PP_CompletionCallback callback, int64_t
delay_ms))&Pnacl_M18_PPB_MessageLoop_Dev_PostWork,
-   …
(message too large)

[commit-bot: I haz the power, 2012-11-15 17:54:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dmichael@chromium.org/11364188/13001

[commit-bot: I haz the power, 2012-11-15 18:51:10]

Retried try job too often for step(s) content_unittests

[commit-bot: I haz the power, 2012-11-15 19:10:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dmichael@chromium.org/11364188/22002

[commit-bot: I haz the power, 2012-11-15 21:01:24]

Change committed as 168029