Fixing issues with new activity image readback

athena/content/content_proxy.cc

 // Copyright 2014 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 "athena/content/content_proxy.h"
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "base/bind.h"
 #include "base/threading/worker_pool.h"
@@ skipping 64 matching lines @@
   // again.
   ShowOriginalContent();
 }
 
 void ContentProxy::ContentWillUnload() {
   content_loaded_ = false;
 }
 
 gfx::ImageSkia ContentProxy::GetContentImage() {
   // While we compress to PNG, we use the original read back.
-  if (!raw_image_.isNull() || !png_data_.get())
+  if (!png_data_.get())
     return raw_image_;
 
   // Otherwise we convert the PNG.
   std::vector<gfx::ImagePNGRep> image_reps;
-  image_reps.push_back(gfx::ImagePNGRep(png_data_, 0.0f));
+  image_reps.push_back(gfx::ImagePNGRep(png_data_, 1.0f));
   return *(gfx::Image(image_reps).ToImageSkia());
 }
 
 void ContentProxy::EvictContent() {
   raw_image_ = gfx::ImageSkia();
   png_data_->Release();
 }
 
 void ContentProxy::OnPreContentDestroyed() {
   // Since we are breaking now the connection to the old content, we make the
@@ skipping 79 matching lines @@
 
 void ContentProxy::OnContentImageEncodeComplete(
     scoped_refptr<ProxyImageData> image) {
   png_data_ = image->data();
 
   // From now on we decode the image as needed to save memory.
   raw_image_ = gfx::ImageSkia();
 }
 
 }  // namespace athena