Fix multi-arch support for Chrome: start downloading the nexe when SetWindow ...

src/trusted/plugin/plugin.cc

 /*
  * Copyright 2008 The Native Client 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 "native_client/src/trusted/plugin/plugin.h"
 
 #include <assert.h>
 #include <fcntl.h>
@@ skipping 361 matching lines @@
     PLUGIN_PRINTF(("Plugin::Init (origin='%s')\n", origin_.c_str()));
     // Check that origin is in the list of permitted origins.
     origin_valid_ = nacl::OriginIsInWhitelist(origin_);
     // This implementation of same-origin policy does not take
     // document.domain element into account.
   }
 
   // Set up the scriptable methods for the plugin.
   LoadMethods();
 
+// Firefox allows us to call NPN_GetUrl during initialization, so if the "src"

[Mark Seaborn, 2010/08/16 15:13:59]

Actually it's NPN_GetURLNotify().  Can you update the comment to make it easier
to cross-reference?

[gregoryd, 2010/08/16 18:41:09]

Done.

+// property has not been specified, we choose a path from the "nexes" list here
+// and start downloading the right nexe immediately.
+#if defined(NACL_STANDALONE)
   // If the <embed src='...'> attr was defined, the browser would have
   // implicitly called GET on it, which calls Load() and set_logical_url().
   // In the absence of this attr, we use the "nexes" attribute if present.
   if (logical_url() == NULL) {
     const char* nexes_attr = LookupArgument("nexes");
     if (nexes_attr != NULL) {
       SetNexesPropertyImpl(nexes_attr);
     }
   }
+#endif
 
   PLUGIN_PRINTF(("Plugin::Init (return 1)\n"));
   // Return success.
   return true;
 }
 
 Plugin::Plugin()
   : service_runtime_(NULL),
     receive_thread_running_(false),
     argc_(-1),
@@ skipping 253 matching lines @@
 
 void VideoGlobalLock() {
   g_VideoMutex.Lock();
 }
 
 void VideoGlobalUnlock() {
   g_VideoMutex.Unlock();
 }
 
 }  // namespace plugin