Add memory usage info to SyslogsProvider, and clean up bug report screenshot data.

chrome/browser/ui/webui/bug_report_ui.cc

 // Copyright (c) 2011 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/browser/ui/webui/bug_report_ui.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 109 matching lines @@
   }
 
   return -1;
 }
 
 }  // namespace
 
 
 namespace browser {
 
-// TODO(rkc): Eventually find a better way to do this
-std::vector<unsigned char>* last_screenshot_png = 0;
-gfx::Rect screen_size;

[stevenjb, 2011/08/03 01:55:20]

Eliminated global variables (including a non basic type!) and moved to
bug_report_util.cc.

-
-void RefreshLastScreenshot(Browser* browser) {
-  if (last_screenshot_png)
-    last_screenshot_png->clear();
-  else
-    last_screenshot_png = new std::vector<unsigned char>;
-
-  gfx::NativeWindow native_window = browser->window()->GetNativeHandle();
-  screen_size = browser::GrabWindowSnapshot(native_window, last_screenshot_png);
-}
-
 void ShowHtmlBugReportView(Browser* browser,
                            const std::string& description_template,
                            size_t issue_type) {
   // First check if we're already open (we cannot depend on ShowSingletonTab
   // for this functionality since we need to make *sure* we never get
   // instantiated again while we are open - with singleton tabs, that can
   // happen)
   int feedback_tab_index = GetIndexOfFeedbackTab(browser);
   if (feedback_tab_index >= 0) {
     // Do not refresh screenshot, do not create a new tab
     browser->ActivateTabAt(feedback_tab_index, true);
     return;
   }
 
-  RefreshLastScreenshot(browser);
+  std::vector<unsigned char>* last_screenshot_png =
+      BugReportUtil::GetScreenshotPng();
+  last_screenshot_png->clear();
+
+  gfx::NativeWindow native_window = browser->window()->GetNativeHandle();
+  BugReportUtil::SetScreenshotSize(
+      browser::GrabWindowSnapshot(native_window, last_screenshot_png));
+
   std::string bug_report_url = std::string(chrome::kChromeUIBugReportURL) +
       "#" + base::IntToString(browser->active_index()) +
       "?description=" + EscapeUrlEncodedData(description_template, false) +
       "&issueType=" + base::IntToString(issue_type);
   browser->ShowSingletonTab(GURL(bug_report_url));
 }
 
 }  // namespace browser
 
 
@@ skipping 210 matching lines @@
 
   std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
       bug_report_html_, &localized_strings);
 
   SendResponse(request_id, base::RefCountedString::TakeString(&full_html));
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// BugReportData
-//
-////////////////////////////////////////////////////////////////////////////////
-void BugReportData::SendReport() {

[stevenjb, 2011/08/03 01:55:20]

BugReportData member function moved to its proper place in bug_report_data.cc.

-#if defined(OS_CHROMEOS)
-  // In case we already got the syslogs and sent the report, leave
-  if (sent_report_) return;
-  // Set send_report_ so that no one else processes SendReport
-  sent_report_ = true;
-#endif
-
-  int image_data_size = image_.size();
-  char* image_data = image_data_size ?
-      reinterpret_cast<char*>(&(image_.front())) : NULL;
-  BugReportUtil::SendReport(profile_
-                            , problem_type_
-                            , page_url_
-                            , description_
-                            , image_data
-                            , image_data_size
-                            , browser::screen_size.width()
-                            , browser::screen_size.height()
-#if defined(OS_CHROMEOS)
-                            , user_email_
-                            , zip_content_ ? zip_content_->c_str() : NULL
-                            , zip_content_ ? zip_content_->length() : 0
-                            , send_sys_info_ ? sys_info_ : NULL
-#endif
-                            );
-
-#if defined(OS_CHROMEOS)
-  if (sys_info_) {
-    delete sys_info_;
-    sys_info_ = NULL;
-  }
-  if (zip_content_) {
-    delete zip_content_;
-    zip_content_ = NULL;
-  }
-#endif
-
-  // Once the report has been sent, this object has no purpose in life, delete
-  // ourselves.
-  delete this;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-//
 // BugReportHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 BugReportHandler::BugReportHandler(TabContents* tab)
     : tab_(tab),
       screenshot_source_(NULL),
       bug_report_(NULL)
 #if defined(OS_CHROMEOS)
     , syslogs_handle_(0)
 #endif
 {
 }
 
 BugReportHandler::~BugReportHandler() {

[James Cook, 2011/08/03 17:06:49]

Should this call BugReportUtil::GetScreenshotPng()->clear()?  Or is there
another place to do cleanup when the user is done with the dialog?  I don't want
to leave around the bitmap for the last screenshot after the user sends the
report.

[stevenjb, 2011/08/03 19:11:39]

It should be getting called in ClobberScreenshotsSource, but no harm in adding
an extra call here.

   // Just in case we didn't send off bug_report_ to SendReport
   if (bug_report_) {
     // If we're deleting the report object, cancel feedback collection first
     CancelFeedbackCollection();
     delete bug_report_;
   }
 }
 
 void BugReportHandler::ClobberScreenshotsSource() {
   // Re-create our screenshots data source (this clobbers the last source)
   // setting the screenshot to NULL, effectively disabling the source
   // TODO(rkc): Once there is a method to 'remove' a source, change this code
   Profile* profile = Profile::FromBrowserContext(tab_->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(new ScreenshotSource(NULL));
 
   // clobber last screenshot
-  if (browser::last_screenshot_png)
-    browser::last_screenshot_png->clear();
+  BugReportUtil::GetScreenshotPng()->clear();
 }
 
 void BugReportHandler::SetupScreenshotsSource() {
   // If we don't already have a screenshot source object created, create one.
-  if (!screenshot_source_)
-    screenshot_source_ = new ScreenshotSource(browser::last_screenshot_png);
-
+  if (!screenshot_source_) {
+    screenshot_source_ =
+        new ScreenshotSource(BugReportUtil::GetScreenshotPng());
+  }
   // Add the source to the data manager.
   Profile* profile = Profile::FromBrowserContext(tab_->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(screenshot_source_);
 }
 
 WebUIMessageHandler* BugReportHandler::Attach(WebUI* web_ui) {
   SetupScreenshotsSource();
   return WebUIMessageHandler::Attach(web_ui);
 }
 
@@ skipping 52 matching lines @@
 #endif
   web_ui_->RegisterMessageCallback("sendReport",
       NewCallback(this, &BugReportHandler::HandleSendReport));
   web_ui_->RegisterMessageCallback("cancel",
       NewCallback(this, &BugReportHandler::HandleCancel));
   web_ui_->RegisterMessageCallback("openSystemTab",
       NewCallback(this, &BugReportHandler::HandleOpenSystemTab));
 }
 
 void BugReportHandler::HandleGetDialogDefaults(const ListValue*) {
+  // Will delete itself when bug_report_->SendReport() is called.
   bug_report_ = new BugReportData();
 
   // send back values which the dialog js needs initially
   ListValue dialog_defaults;
 
   // 0: current url
   if (target_tab_url_.length())
     dialog_defaults.Append(new StringValue(target_tab_url_));
   else
     dialog_defaults.Append(new StringValue(""));
@@ skipping 190 matching lines @@
   AddMessageHandler((handler)->Attach(this));
 
   // The handler's init will specify which html
   // resource we'll display to the user
   BugReportUIHTMLSource* html_source =
       new BugReportUIHTMLSource(handler->Init());
   // Set up the chrome://bugreport/ source.
   Profile* profile = Profile::FromBrowserContext(tab->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }