Switch renderer in Moniker patch...

chrome_frame/bho.cc

 // Copyright (c) 2009 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.
 
 #include "chrome_frame/bho.h"
 
 #include <shlguid.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 233 matching lines @@
           // the current navigation (if all data is available) and fire off
           // script events such as onload and even render the page.
           // This will happen inside NavigateBrowserToMoniker below.
           // To work around this, we clear the contents of the document before
           // opening it up in CF.
           ClearDocumentContents(browser);
           mgr->NavigateToCurrentUrlInCF(browser);
         }
       }
     }
-  } else if (done) {
-    if (!CheckForCFNavigation(browser, false)) {
-      DLOG(INFO) << "Releasing cached data.";
-      NavigationManager* mgr = NavigationManager::GetThreadInstance();
-      if (mgr)
-        mgr->ReleaseRequestData();
-    } else {
-      DLOG(INFO) << __FUNCTION__
-          << " not freeing request data - browser tagged";
-    }
   }
 
   return original_httpequiv(browser, shell_view, done, in_arg, out_arg);
 }
 
 // static
 void Bho::ProcessOptInUrls(IWebBrowser2* browser, BSTR url) {
   if (!browser || !url) {
     NOTREACHED();
     return;
@@ skipping 45 matching lines @@
     // If we're going to start patching things for reals, we'd better make sure
     // that we stick around for ever more:
     if (!IsUnpinnedMode())
       PinModule();
 
     HttpNegotiatePatch::Initialize();
 
     ProtocolPatchMethod patch_method =
         static_cast<ProtocolPatchMethod>(
             GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
-
     if (patch_method == PATCH_METHOD_INET_PROTOCOL) {
       ProtocolSinkWrap::PatchProtocolHandlers();
       state_ = PATCH_PROTOCOL;
+    } else if (patch_method == PATCH_METHOD_IBROWSER) {
+        state_ =  PATCH_IBROWSER;
     } else {
-      DCHECK(patch_method == PATCH_METHOD_IBROWSER ||
-             patch_method == PATCH_METHOD_IBROWSER_AND_MONIKER);
-      state_ = PATCH_IBROWSER;
-      if (patch_method == PATCH_METHOD_IBROWSER_AND_MONIKER) {
-        MonikerPatch::Initialize();
-      }
+      DCHECK(patch_method == PATCH_METHOD_MONIKER);
+      state_ = PATCH_MONIKER;
+      MonikerPatch::Initialize();
     }
+
     ret = true;
   }
 
   _pAtlModule->m_csStaticDataInitAndTypeInfo.Unlock();
 
   return ret;
 }
 
 void PatchHelper::PatchBrowserService(IBrowserService* browser_service) {
   DCHECK(state_ == PATCH_IBROWSER);
   if (!IS_PATCHED(IBrowserService)) {
     vtable_patch::PatchInterfaceMethods(browser_service,
                                         IBrowserService_PatchInfo);
   }
 }
 
 void PatchHelper::UnpatchIfNeeded() {
   if (state_ == PATCH_PROTOCOL) {
     ProtocolSinkWrap::UnpatchProtocolHandlers();
   } else if (state_ == PATCH_IBROWSER) {
     vtable_patch::UnpatchInterfaceMethods(IBrowserService_PatchInfo);
     MonikerPatch::Uninitialize();
   }
 
   HttpNegotiatePatch::Uninitialize();
 
   state_ = UNKNOWN;
 }