removed handling of generating datauri. passing raw base64 data to node

FWeinb · FWeinb · commit ae65193e8c44 · 2014-02-28T17:54:03.000+01:00
diff --git a/src/browser/capture_page_helper.cc b/src/browser/capture_page_helper.cc
@@ -43,8 +43,6 @@ namespace capture_page_helper_constants {
 
 const char kFormatValueJpeg[] = "jpeg";
 const char kFormatValuePng[] = "png";
-const char kMimeTypeJpeg[] = "image/jpeg";
-const char kMimeTypePng[] = "image/png";
 
 const int kDefaultQuality = 90;
 
@@ -110,7 +108,6 @@ void CapturePageHelper::SendResultFromBitmap(const SkBitmap& screen_capture) {
   std::vector<unsigned char> data;
   SkAutoLockPixels screen_capture_lock(screen_capture);
   bool encoded = false;
-  std::string mime_type;
   switch (image_format_) {
     case FORMAT_JPEG:
       encoded = gfx::JPEGCodec::Encode(
@@ -120,15 +117,12 @@ void CapturePageHelper::SendResultFromBitmap(const SkBitmap& screen_capture) {
           screen_capture.height(),
           static_cast<int>(screen_capture.rowBytes()),
           keys::kDefaultQuality,
-          &data);
-      mime_type = keys::kMimeTypeJpeg;
-      break;
+          &data);      break;
     case FORMAT_PNG:
       encoded = gfx::PNGCodec::EncodeBGRASkBitmap(
           screen_capture,
           true,  // Discard transparency.
           &data);
-      mime_type = keys::kMimeTypePng;
       break;
     default:
       NOTREACHED() << "Invalid image format.";
@@ -144,10 +138,8 @@ void CapturePageHelper::SendResultFromBitmap(const SkBitmap& screen_capture) {
       reinterpret_cast<const char*>(vector_as_array(&data)), data.size());
 
   base::Base64Encode(stream_as_string, &base64_result);
-  base64_result.insert(0, base::StringPrintf("data:%s;base64,",
-                                             mime_type.c_str()));
-
-  shell_->SendEvent("__nw_capturepagedone", base64_result);
+    
+  shell_->SendEvent("__nw_capturepagedone", base64_result );
 }
 
 void CapturePageHelper::OnSnapshot(const SkBitmap& bitmap) {
