Fix saved screenshots for feedback.

chrome/browser/ui/webui/screenshot_source.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_
 
 #include <string>
+#include <map>

[Daniel Erat, 2011/08/12 14:43:40]

nit: alphabetize

[rkc, 2011/08/22 13:23:52]

Done.

 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 // ScreenshotSource is the data source that serves screenshots (saved
 // or current) to the bug report html ui
 class ScreenshotSource : public ChromeURLDataManager::DataSource {
  public:
   explicit ScreenshotSource(
       std::vector<unsigned char>* current_screenshot);
 

[Daniel Erat, 2011/08/12 14:43:40]

nit: remove extra blank line

[rkc, 2011/08/22 13:23:52]

Done.

+
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string&) const;
 
-  std::vector<unsigned char> GetScreenshot(const std::string& path);
+  std::vector<unsigned char> GetCachedScreenshot(const std::string& path);
 
  private:
   virtual ~ScreenshotSource();
 
+
+  void CacheAndSendScreenshot(const std::string& path, int request_id,

[Daniel Erat, 2011/08/12 14:43:40]

nit: add comment and only put one param on each line unless they all fit on a
single line

[rkc, 2011/08/22 13:23:52]

Done.

+                              const std::vector<unsigned char> bytes);

[zel, 2011/08/12 13:01:37]

const std::vector<unsigned char>& bytes

[rkc, 2011/08/22 13:23:52]

Done.

+  void SendScreenshot(const std::string& path, int request_id);
+#if defined(OS_CHROMEOS)
+  void SendSavedScreenshot(const std::string& filename, int request_id);
+#endif
+
   std::vector<unsigned char> current_screenshot_;
+  std::map<std::string, std::vector<unsigned char> > cached_screenshots_;

[Daniel Erat, 2011/08/12 14:43:40]

don't store things that are expensive to copy inside STL containers.  you should
wrap the vectors in linked_ptrs (see base/memory/linked_ptr.h) or just use
RefCountedBytes, which i think will handle all of this for you, instead of
bytes.

[Daniel Erat, 2011/08/12 14:43:40]

is this code caching screenshots indefinitely?  if so, this is a poor use of
memory.

[rkc, 2011/08/22 13:23:52]

Done.

[rkc, 2011/08/22 13:23:52]

No, this gets put in the data sources delete queue once we clobber the
screenshots source in the bug_report destructor; all cached data should be
deleted then.

 
   DISALLOW_COPY_AND_ASSIGN(ScreenshotSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_