Flush pending writes on Skia scratch textures used in Chromium

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 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 "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <limits>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
@@ skipping 99 matching lines @@
   desc.fSampleCnt = 0;
   desc.fOrigin = kTopLeft_GrSurfaceOrigin;
   desc.fWidth = size.width();
   desc.fHeight = size.height();
   skia::RefPtr<GrTexture> texture = skia::AdoptRef(
       gr->textureProvider()->refScratchTexture(
           desc, GrTextureProvider::kExact_ScratchTexMatch));
   if (!texture.get())
     return false;
 
+  // A recycled texture may have pending writes. Make sure they are flushed
+  // before the texture is handed over for subsequent operations done outside
+  // of Skia.
+  texture->flushWrites();
+
   SkImageInfo info = SkImageInfo::MakeN32Premul(desc.fWidth, desc.fHeight);
   SkGrPixelRef* pixel_ref = SkNEW_ARGS(SkGrPixelRef, (info, texture.get()));
   if (!pixel_ref)
     return false;
   bitmap->setInfo(info);
   bitmap->setPixelRef(pixel_ref)->unref();
   return true;
 }
 
 class SyncPointClientImpl : public media::VideoFrame::SyncPointClient {
@@ skipping 1727 matching lines @@
 
 bool WebMediaPlayerAndroid::IsHLSStream() const {
   std::string mime;
   GURL url = redirected_url_.is_empty() ? url_ : redirected_url_;
   if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime))
     return false;
   return !mime.compare("application/x-mpegurl");
 }
 
 }  // namespace content