Firing event to broker without worker thread.

ceee/ie/plugin/bho/web_progress_notifier.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.
 //
 // Web progress notifier implementation.
 #include "ceee/ie/plugin/bho/web_progress_notifier.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "ceee/common/com_utils.h"
 #include "ceee/ie/plugin/bho/dom_utils.h"
+#include "ceee/ie/plugin/bho/webnavigation_events_funnel.h"
 
 namespace {
 
 // In milliseconds. It defines the "effective period" of user action. A user
 // action is considered as a possible cause of the next navigation if the
 // navigation happens in this period.
 // This is a number we feel confident of based on past experience.
 const int kUserActionTimeThresholdMs = 500;
 
 // String constants for the values of TransitionQualifier.
@@ skipping 92 matching lines @@
     return;
 
   if (FilterOutWebBrowserEvent(browser, FilteringInfo::BEFORE_NAVIGATE))
     return;
 
   FrameInfo* frame_info = NULL;
   if (!GetFrameInfo(browser, &frame_info))
     return;
 
   // TODO(yzshen@google.com): add support for requestId.
-  HRESULT hr = webnavigation_events_funnel().OnBeforeNavigate(
-      tab_handle_, url, frame_info->frame_id, -1, base::Time::Now());
+  HRESULT hr = E_POINTER;
+  WebNavigationEventsFunnel* funel = webnavigation_events_funnel();

[Sigurður Ásgeirsson, 2010/11/19 20:53:20]

nit: funel -> funnel

+  DCHECK(funel != NULL);
+  if (funel) {
+    hr = funel->OnBeforeNavigate(tab_handle_, url, frame_info->frame_id, -1,
+                                 base::Time::Now());
+  }
   DCHECK(SUCCEEDED(hr))
       << "Failed to fire the webNavigation.onBeforeNavigate event "
       << com::LogHr(hr);
 
   if (frame_info->IsMainFrame()) {
     frame_info->ClearTransition();
 
     // The order in which we set these transitions is **very important.**
     // If there was no DocumentComplete, then there are two likely options:
     // the transition was a JavaScript redirect, or the user navigated to a
@@ skipping 47 matching lines @@
   if (!GetFrameInfo(browser, &frame_info))
     return;
 
   if (frame_info->IsMainFrame()) {
     main_frame_document_complete_ = true;
 
     has_potential_javascript_redirect_ =
         HasPotentialJavaScriptRedirect(browser);
   }
 
-  HRESULT hr = webnavigation_events_funnel().OnCompleted(
-      tab_handle_, url, frame_info->frame_id, base::Time::Now());
+  HRESULT hr = E_POINTER;
+  WebNavigationEventsFunnel* funel = webnavigation_events_funnel();

[Sigurður Ásgeirsson, 2010/11/19 20:53:20]

ditto.

[Vitaly Buka corp, 2010/11/19 21:21:28]

Done.

+  DCHECK(funel != NULL);
+  if (funel) {
+    hr = funel->OnCompleted(tab_handle_, url, frame_info->frame_id,
+                            base::Time::Now());
+  }
   DCHECK(SUCCEEDED(hr)) << "Failed to fire the webNavigation.onCompleted event "
                         << com::LogHr(hr);
 }
 
 void WebProgressNotifier::OnNavigateComplete(IWebBrowser2* browser, BSTR url) {
   if (browser == NULL || url == NULL)
     return;
 
   if (FilterOutWebBrowserEvent(browser, FilteringInfo::NAVIGATE_COMPLETE)) {
     filtering_info_.pending_navigate_complete_browser = browser;
@@ skipping 18 matching lines @@
     return;
 
   if (frame_info->IsMainFrame()) {
     main_frame_document_complete_ = false;
 
     if (IsForwardBack(url)) {
       frame_info->SetTransition(PageTransition::AUTO_BOOKMARK, FORWARD_BACK);
     }
   }
 
-  HRESULT hr = webnavigation_events_funnel().OnCommitted(
+  HRESULT hr = E_POINTER;
+  WebNavigationEventsFunnel* funel = webnavigation_events_funnel();
+  DCHECK(funel != NULL);
+  if (funel) {
+    hr = funel->OnCommitted(
       tab_handle_, url, frame_info->frame_id,
       PageTransition::CoreTransitionString(frame_info->transition_type),
       TransitionQualifiersString(frame_info->transition_qualifiers).c_str(),
       timestamp);
+  }
   DCHECK(SUCCEEDED(hr)) << "Failed to fire the webNavigation.onCommitted event "
                         << com::LogHr(hr);
 
   if (frame_info->IsMainFrame())
     subframe_map_.clear();
 }
 
 void WebProgressNotifier::OnNavigateError(IWebBrowser2* browser, BSTR url,
                                           long status_code) {
   if (browser == NULL || url == NULL)
     return;
 
   if (FilterOutWebBrowserEvent(browser, FilteringInfo::NAVIGATE_ERROR))
     return;
 
   FrameInfo* frame_info = NULL;
   if (!GetFrameInfo(browser, &frame_info))
     return;
 
-  HRESULT hr = webnavigation_events_funnel().OnErrorOccurred(
-      tab_handle_, url, frame_info->frame_id, CComBSTR(L""), base::Time::Now());
+  HRESULT hr = E_POINTER;
+  WebNavigationEventsFunnel* funel = webnavigation_events_funnel();

[Sigurður Ásgeirsson, 2010/11/19 20:53:20]

et al.

+  DCHECK(funel != NULL);
+  if (funel) {
+    hr = funel->OnErrorOccurred(tab_handle_, url,
+        frame_info->frame_id, CComBSTR(L""), base::Time::Now());
+  }
   DCHECK(SUCCEEDED(hr))
       << "Failed to fire the webNavigation.onErrorOccurred event "
       << com::LogHr(hr);
 }
 
 void WebProgressNotifier::OnNewWindow(BSTR url_context, BSTR url) {
   if (url_context == NULL || url == NULL)
     return;
 
   if (FilterOutWebBrowserEvent(NULL, FilteringInfo::NEW_WINDOW))
     return;
 
-  HRESULT hr = webnavigation_events_funnel().OnBeforeRetarget(
-      tab_handle_, url_context, url, base::Time::Now());
+  HRESULT hr = E_POINTER;
+  WebNavigationEventsFunnel* funel = webnavigation_events_funnel();
+  DCHECK(funel != NULL);
+  if (funel) {
+    hr = funel->OnBeforeRetarget(tab_handle_, url_context, url,
+                                 base::Time::Now());
+  }
   DCHECK(SUCCEEDED(hr))
       << "Failed to fire the webNavigation.onBeforeRetarget event "
       << com::LogHr(hr);
 }
 
 void WebProgressNotifier::OnHandleMessage(
     WindowMessageSource::MessageType type,
     const MSG* message_info) {
   DCHECK(create_thread_id_ == ::GetCurrentThreadId());
 
@@ skipping 15 matching lines @@
       }
       break;
     }
     default: {
       NOTREACHED();
       break;
     }
   }
 }
 
+WebNavigationEventsFunnel* WebProgressNotifier::webnavigation_events_funnel() {
+  if (!webnavigation_events_funnel_.get())
+    webnavigation_events_funnel_.reset(new WebNavigationEventsFunnel());
+  return webnavigation_events_funnel_.get();
+}
+
+WebRequestNotifier* WebProgressNotifier::webrequest_notifier() {
+  if (cached_webrequest_notifier_ == NULL) {
+    cached_webrequest_notifier_ = ProductionWebRequestNotifier::get();
+  }
+  return cached_webrequest_notifier_;
+}
+
 WindowMessageSource* WebProgressNotifier::CreateWindowMessageSource() {
   scoped_ptr<WindowMessageSource> source(new WindowMessageSource());
 
   return source->Initialize() ? source.release() : NULL;
 }
 
 std::string WebProgressNotifier::TransitionQualifiersString(
     TransitionQualifiers qualifiers) {
   std::string result;
   for (unsigned int current_qualifier = FIRST_TRANSITION_QUALIFIER;
@@ skipping 327 matching lines @@
         break;
       }
       default: {
         NOTREACHED() << "Unknown state type.";
         break;
       }
     }
   }
   return false;
 }