Implement proxy for FlashMenu and Run/QuitMessageLoop

BUG=none
TEST=Pepper Flash

Review URL: http://codereview.chromium.org/6432001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74981 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 6 deletions

diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index a99a29c..4e852c1 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -185,14 +185,14 @@ PP_Bool ReadImageData(PP_Resource device_context_2d,
   return BoolToPPBool(context->ReadImageData(image, top_left));
 }
 
-void RunMessageLoop() {
+void RunMessageLoop(PP_Instance instance) {
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   MessageLoop::current()->SetNestableTasksAllowed(true);
   MessageLoop::current()->Run();
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
-void QuitMessageLoop() {
+void QuitMessageLoop(PP_Instance instance) {
   MessageLoop::current()->QuitNow();
 }
 
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc
index 36ba4ac..2a922c0 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_impl.cc
@@ -218,14 +218,14 @@ PP_Bool NavigateToURL(PP_Instance pp_instance,
   return BoolToPPBool(instance->NavigateToURL(url, target));
 }
 
-void RunMessageLoop() {
+void RunMessageLoop(PP_Instance instance) {
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   MessageLoop::current()->SetNestableTasksAllowed(true);
   MessageLoop::current()->Run();
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
-void QuitMessageLoop() {
+void QuitMessageLoop(PP_Instance instance) {
   MessageLoop::current()->QuitNow();
 }
 
diff --git a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
index f41e941..52f81b6 100644
--- a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
@@ -72,13 +72,13 @@ bool ConvertMenuData(const PP_Flash_Menu* in_menu,
                      size_t depth,
                      PPB_Flash_Menu_Impl::MenuData* out_menu,
                      std::vector<int32_t>* menu_id_map) {
-  if (depth > kMaxMenuDepth)
+  if (depth > kMaxMenuDepth || !in_menu)
     return false;
 
   // Clear the output, just in case.
   out_menu->clear();
 
-  if (!in_menu || !in_menu->count)
+  if (!in_menu->count)
     return true;  // Nothing else to do.
 
   if (!in_menu->items || in_menu->count > kMaxMenuEntries)