Merge ~abreu-alexandre/oxide:mh into oxide:master

[Alexandre Abreu]

Fix mh build w/ deprecated media player paint()

[Chris Coulson (chrisccoulson)]

review: Approve

diff --git a/shared/renderer/media/oxide_web_media_player.cc b/shared/renderer/media/oxide_web_media_player.cc
index 9fd3e41..a641a5b 100644
--- a/shared/renderer/media/oxide_web_media_player.cc
+++ b/shared/renderer/media/oxide_web_media_player.cc
@@ -32,7 +32,6 @@
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/bind_to_current_loop.h"
-#include "media/base/media_keys.h"
 #include "media/base/media_switches.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_frame.h"
@@ -406,10 +405,6 @@ size_t WebMediaPlayer::videoDecodedByteCount() const {
   return 0;
 }
 
-void WebMediaPlayer::paint(blink::WebCanvas*, const blink::WebRect&, unsigned char alpha, SkXfermode::Mode) {
-  NOTIMPLEMENTED();
-}
-
 void WebMediaPlayer::OnHidden() {
   // RendererMediaPlayerManager will not call SuspendAndReleaseResources() if we
   // were already in the paused state; thus notify the MediaWebContentsObserver
diff --git a/shared/renderer/media/oxide_web_media_player.h b/shared/renderer/media/oxide_web_media_player.h
index 2380906..22427d8 100644
--- a/shared/renderer/media/oxide_web_media_player.h
+++ b/shared/renderer/media/oxide_web_media_player.h
@@ -17,12 +17,10 @@
 #include "content/public/renderer/render_frame_observer.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "media/base/demuxer_stream.h"
-#include "media/base/media_keys.h"
 #include "media/blink/webmediaplayer_delegate.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/SkXfermode.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "shared/common/oxide_message_enums.h"
 
@@ -93,7 +91,7 @@ class WebMediaPlayer : public blink::WebMediaPlayer,
   // Methods for painting.
   void paint(blink::WebCanvas* canvas,
              const blink::WebRect& rect,
-             SkPaint&);
+             SkPaint&) override;
 
   // True if the loaded media has a playable video/audio track.
   bool hasVideo() const;
@@ -127,8 +125,6 @@ class WebMediaPlayer : public blink::WebMediaPlayer,
   size_t audioDecodedByteCount() const;
   size_t videoDecodedByteCount() const;
 
-  void paint(blink::WebCanvas*, const blink::WebRect&, unsigned char alpha, SkXfermode::Mode);
-    //
   // Media player callback handlers.
   void OnMediaMetadataChanged(const base::TimeDelta& duration, int width,
                               int height, bool success);