IE CEEE: Explicitly assign window properties/methods into the script host glo...

ceee/ie/plugin/scripting/content_script_manager.cc

 // Copyright (c) 2010 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.
 //
 // @file
 // Content script manager implementation.
 #include "ceee/ie/plugin/scripting/content_script_manager.h"
 
 #include "ceee/ie/common/ceee_module_util.h"
 #include "ceee/ie/plugin/bho/dom_utils.h"
@@ skipping 139 matching lines @@
   return ScriptHost::CreateInitializedIID(IID_IScriptHost, script_host);
 }
 
 HRESULT ContentScriptManager::InitializeScriptHost(
     IHTMLDocument2* document, IScriptHost* script_host) {
   DCHECK(document != NULL);
   DCHECK(script_host != NULL);
 
   CComPtr<IExtensionPortMessagingProvider> messaging_provider;
   HRESULT hr = host_->GetExtensionPortMessagingProvider(&messaging_provider);
+  if (FAILED(hr))

[Sigurður Ásgeirsson, 2010/11/15 16:33:30]

thanks...
Can you see whether the caller logs errors, and if not, add logging to the error
cases here?

[Eric Dingle, 2010/11/15 16:37:51]

This method is private and only called internally. The caller (also a private
method) does log errors on failure :)

On 2010/11/15 16:33:30, Ruðrugis wrote:

+    return hr;
   hr = ContentScriptNativeApi::CreateInitialized(messaging_provider,
                                                  &native_api_);
   if (FAILED(hr))
     return hr;
 
   std::wstring extension_id;
   host_->GetExtensionId(&extension_id);
   DCHECK(extension_id.size()) <<
       "Need to revisit async loading of enabled extension list.";
 
   // Execute the bootstrap scripts.
   hr = BootstrapScriptHost(script_host, native_api_, extension_id.c_str());
+  if (FAILED(hr))
+    return hr;
 
+  // Register the window object and manually make its members global.
   CComPtr<IHTMLWindow2> window;
   hr = document->get_parentWindow(&window);
   if (FAILED(hr))
     return hr;
-
-  // Register the window object and make its members global.
-  hr = script_host->RegisterScriptObject(L"window", window, true);
+  hr = script_host->RegisterScriptObject(L"window", window, false);
+  if (FAILED(hr))
+    return hr;
+  hr = InvokeNamedFunction(script_host, L"ceee.initGlobals_", NULL, 0);
 
   return hr;
 }
 
 HRESULT ContentScriptManager::BootstrapScriptHost(IScriptHost* script_host,
                                                   IDispatch* native_api,
                                                   const wchar_t* extension_id) {
   bool loaded = EnsureBoostrapScriptsLoaded();
   if (!loaded) {
     NOTREACHED() << "Unable to load bootstrap scripts";
@@ skipping 185 matching lines @@
     hr = script_host_with_site->SetSite(NULL);
     DCHECK(SUCCEEDED(hr));
   }
 
   // TODO(siggi@chromium.org): Kill off open extension ports.
 
   script_host_.Release();
 
   return hr;
 }