소스 검색

fix plugin for Safari 5 lameness

David Rose 14 년 전
부모
커밋
443fff604b
2개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      direct/src/plugin/p3dInstance.cxx
  2. 6 0
      direct/src/plugin_npapi/ppInstance.cxx

+ 1 - 0
direct/src/plugin/p3dInstance.cxx

@@ -3864,6 +3864,7 @@ add_cocoa_modifier_flags(unsigned int &swb_flags, int modifiers) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void P3DInstance::
 void P3DInstance::
 send_notify(const string &message) {
 send_notify(const string &message) {
+  nout << "send_notify(" << message << ")\n";
   P3D_request *request = new P3D_request;
   P3D_request *request = new P3D_request;
   request->_instance = NULL;
   request->_instance = NULL;
   request->_request_type = P3D_RT_notify;
   request->_request_type = P3D_RT_notify;

+ 6 - 0
direct/src/plugin_npapi/ppInstance.cxx

@@ -210,6 +210,12 @@ begin() {
     set_failed();
     set_failed();
     return;
     return;
   }
   }
+#else
+  // While Safari 5 on Mac claims to provide this function, it doesn't
+  // appear to work. (!)  So we pretend we never have it on Mac.
+  // Fortunately, this hack does us no harm because the _request_timer
+  // hack works fine on OSX.
+  has_plugin_thread_async_call = false;
 #endif  // __APPLE__
 #endif  // __APPLE__
 
 
   string url = PANDA_PACKAGE_HOST_URL;
   string url = PANDA_PACKAGE_HOST_URL;