Ganesh: images upload to GPU performance fix (skip copying encoded data)

third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 33 matching lines @@
 {
 }
 
 DecodingImageGenerator::~DecodingImageGenerator()
 {
 }
 
 SkData* DecodingImageGenerator::onRefEncodedData()
 {
     TRACE_EVENT0("blink", "DecodingImageGenerator::refEncodedData");
-
-    // FIXME: If the image has been clipped or scaled, do not return the original
-    // encoded data, since on playback it will not be known how the clipping/scaling
-    // was done.
-    RefPtr<SharedBuffer> buffer = nullptr;
-    bool allDataReceived = false;
-    m_frameGenerator->copyData(&buffer, &allDataReceived);
-    if (buffer && allDataReceived)
-        return SkData::NewWithCopy(buffer->data(), buffer->size());
-    return 0;
+    return m_frameGenerator->refEncodedData();

[Noel Gordon, 2015/12/08 15:41:58]

Space before this line, as done elsewhere in this file.

[aleksandar.stojiljkovic, 2015/12/08 20:28:13]

Done.

 }
 
 bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
     SkPMColor ctable[], int* ctableCount)
 {
     TRACE_EVENT1("blink", "DecodingImageGenerator::getPixels", "frame index", static_cast<int>(m_frameIndex));
 
     // Implementation doesn't support scaling yet so make sure we're not given a different size.
     if (info.width() != getInfo().width() || info.height() != getInfo().height())
         return false;
@@ skipping 50 matching lines @@
     const SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
 
     RefPtr<ImageFrameGenerator> frame = ImageFrameGenerator::create(SkISize::Make(size.width(), size.height()), buffer, true, false);
     if (!frame)
         return 0;
 
     return new DecodingImageGenerator(frame, info, 0);
 }
 
 } // namespace blink