Eliminate MediaPlayer abstraction(paint APIs- chromium changes)

content/renderer/media/android/webmediaplayer_android.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "content/renderer/media/android/stream_texture_factory.h"
 #include "content/renderer/media/crypto/proxy_decryptor.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_keys.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/gpu/GrContext.h"
+#include "third_party/skia/include/gpu/SkGrPixelRef.h"
 #include "ui/gfx/rect_f.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace blink {
 class WebContentDecryptionModule;
 class WebFrame;
 class WebURL;
@@ skipping 53 matching lines @@
   virtual void seek(double seconds);
   virtual bool supportsSave() const;
   virtual void setRate(double rate);
   virtual void setVolume(double volume);
   virtual blink::WebTimeRanges buffered() const;
   virtual double maxTimeSeekable() const;
 
   // Poster image, as defined in the <video> element.
   virtual void setPoster(const blink::WebURL& poster) OVERRIDE;
 
+  // FIXME: This path "only works" on Android. It is a workaround for the problem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES
+  // texture internally. It should be removed and replaced by the normal paint path.
+  // https://code.google.com/p/skia/issues/detail?id=1189
   // Methods for painting.
   virtual void paint(blink::WebCanvas* canvas,
                      const blink::WebRect& rect,
                      unsigned char alpha);
 
   virtual bool copyVideoTextureToPlatformTexture(
       blink::WebGraphicsContext3D* web_graphics_context,
       unsigned int texture,
       unsigned int level,
       unsigned int internal_format,
@@ skipping 154 matching lines @@
                                    const std::string& session_id);
   MediaKeyException CancelKeyRequestInternal(const std::string& key_system,
                                              const std::string& session_id);
 
   // Requests that this object notifies when a decryptor is ready through the
   // |decryptor_ready_cb| provided.
   // If |decryptor_ready_cb| is null, the existing callback will be fired with
   // NULL immediately and reset.
   void SetDecryptorReadyCB(const media::DecryptorReadyCB& decryptor_ready_cb);
 
+  bool ensureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap, const blink::WebSize& size, GrSurfaceOrigin origin, GrPixelConfig config);

[qinmin, 2014/07/25 17:01:10]

s/ensure/Ensure/

[Srirama, 2014/07/25 18:06:29]

Done.

+
   blink::WebFrame* const frame_;
 
   blink::WebMediaPlayerClient* const client_;
 
   // |delegate_| is used to notify the browser process of the player status, so
   // that the browser process can control screen locks.
   // TODO(qinmin): Currently android mediaplayer takes care of the screen
   // lock. So this is only used for media source. Will apply this to regular
   // media tag once http://crbug.com/247892 is fixed.
   base::WeakPtr<WebMediaPlayerDelegate> delegate_;
@@ skipping 146 matching lines @@
   // Non-owned pointer to the CDM. Updated via calls to
   // setContentDecryptionModule().
   WebContentDecryptionModuleImpl* web_cdm_;
 
   // This is only Used by Clear Key key system implementation, where a renderer
   // side CDM will be used. This is similar to WebMediaPlayerImpl. For other key
   // systems, a browser side CDM will be used and we set CDM by calling
   // player_manager_->SetCdm() directly.
   media::DecryptorReadyCB decryptor_ready_cb_;
 
+  SkBitmap m_bitmap;

[qinmin, 2014/07/25 17:01:10]

chromium doesn't use this naming scheme, use bitmap_ instead. And I am not so
sure whether this variable is even needed, since this variable is only used in
the paint function.

[Srirama, 2014/07/25 18:06:29]

Done. Changed name to bitmap_ and regarding whether it is needed or not: the
memory is being reused, there are proper checks for reusing it in
EnsureTextureBackedSkBitmap(). Only when there is a change in width, height the
memory is reallocated. Please correct me if i am wrong.

+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_