Enable texture copy for webiew

content/renderer/media/android/stream_texture_wrapper_impl.cc

 // Copyright 2016 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/stream_texture_wrapper_impl.h"
 
 #include "base/callback.h"
 #include "cc/layers/video_frame_provider.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
@@ skipping 12 matching lines @@
   gl->WaitSyncTokenCHROMIUM(sync_token.GetConstData());
   gl->DeleteTextures(1, &texture_id);
   // Flush to ensure that the stream texture gets deleted in a timely fashion.
   gl->ShallowFlushCHROMIUM();
 }
 }
 
 namespace content {
 
 StreamTextureWrapperImpl::StreamTextureWrapperImpl(
+    bool enable_texture_copy,
     scoped_refptr<StreamTextureFactory> factory,
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner)
-    : texture_id_(0),
+    : enable_texture_copy_(enable_texture_copy),
+      texture_id_(0),
       factory_(factory),
       main_task_runner_(main_task_runner),
       weak_factory_(this) {}
 
 StreamTextureWrapperImpl::~StreamTextureWrapperImpl() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   if (texture_id_) {
     GLES2Interface* gl = factory_->ContextGL();
     gl->DeleteTextures(1, &texture_id_);
     // Flush to ensure that the stream texture gets deleted in a timely fashion.
     gl->ShallowFlushCHROMIUM();
   }
 
   SetCurrentFrameInternal(nullptr);
 }
 
 media::ScopedStreamTextureWrapper StreamTextureWrapperImpl::Create(
+    bool enable_texture_copy,
     scoped_refptr<StreamTextureFactory> factory,
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner) {
-  return media::ScopedStreamTextureWrapper(
-      new StreamTextureWrapperImpl(factory, main_task_runner));
+  return media::ScopedStreamTextureWrapper(new StreamTextureWrapperImpl(
+      enable_texture_copy, factory, main_task_runner));
 }
 
 scoped_refptr<media::VideoFrame> StreamTextureWrapperImpl::GetCurrentFrame() {
   base::AutoLock auto_lock(current_frame_lock_);
   return current_frame_;
 }
 
 void StreamTextureWrapperImpl::ReallocateVideoFrame(
     const gfx::Size& natural_size) {
   DVLOG(2) << __FUNCTION__;
@@ skipping 22 matching lines @@
                          texture_target)};
 
   scoped_refptr<media::VideoFrame> new_frame =
       media::VideoFrame::WrapNativeTextures(
           media::PIXEL_FORMAT_ARGB, holders,
           media::BindToCurrentLoop(
               base::Bind(&OnReleaseTexture, factory_, texture_id_ref)),
           natural_size, gfx::Rect(natural_size), natural_size,
           base::TimeDelta());
 
-  // TODO(tguilbert): Create and pipe the enable_texture_copy_ flag for Webview
-  // scenarios. See crbug.com/628066.
+  if (enable_texture_copy_)

[DaleCurtis, 2016/11/07 22:37:50]

multiline if needs {}

[tguilbert, 2016/11/07 23:25:01]

Oops, yes :) Done.

+    new_frame->metadata()->SetBoolean(media::VideoFrameMetadata::COPY_REQUIRED,
+                                      true);
 
   SetCurrentFrameInternal(new_frame);
 }
 
 void StreamTextureWrapperImpl::ForwardStreamTextureForSurfaceRequest(
     const base::UnguessableToken& request_token) {
   stream_texture_proxy_->ForwardStreamTextureForSurfaceRequest(request_token);
 }
 
 void StreamTextureWrapperImpl::SetCurrentFrameInternal(
@@ skipping 70 matching lines @@
     main_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&StreamTextureWrapperImpl::Destroy, base::Unretained(this)));
     return;
   }
 
   delete this;
 }
 
 }  // namespace content