Eliminate MediaPlayer & MediaPlayerClient abstractions

Source/core/rendering/RenderVideo.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderFullScreen.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "public/platform/WebLayer.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
+using blink::WebMediaPlayer;

[acolwell GONE FROM CHROMIUM, 2014/05/20 16:40:21]

nit: Just use blink:: at the one location where you reference WebMediaPlayer.
There is no need for a using here.

 
 RenderVideo::RenderVideo(HTMLVideoElement* video)
     : RenderMedia(video)
 {
     setIntrinsicSize(calculateIntrinsicSize());
 }
 
 RenderVideo::~RenderVideo()
 {
 }
@@ skipping 37 matching lines @@
 
     // Spec text from 4.8.6
     //
     // The intrinsic width of a video element's playback area is the intrinsic width
     // of the video resource, if that is available; otherwise it is the intrinsic
     // width of the poster frame, if that is available; otherwise it is 300 CSS pixels.
     //
     // The intrinsic height of a video element's playback area is the intrinsic height
     // of the video resource, if that is available; otherwise it is the intrinsic
     // height of the poster frame, if that is available; otherwise it is 150 CSS pixels.
-    MediaPlayer* player = mediaElement()->player();
-    if (player && video->readyState() >= HTMLVideoElement::HAVE_METADATA) {
-        LayoutSize size = player->naturalSize();
+    WebMediaPlayer* webMediaPlayer = mediaElement()->webMediaPlayer();
+    if (webMediaPlayer && video->readyState() >= HTMLVideoElement::HAVE_METADATA) {
+        LayoutSize size = static_cast<IntSize>(webMediaPlayer->naturalSize());

[acolwell GONE FROM CHROMIUM, 2014/05/20 16:40:21]

nit: If you make size an IntSize instead of a LayoutSize, does the need for a
cast go away?

         if (!size.isEmpty())
             return size;
     }
 
     if (video->shouldDisplayPosterImage() && !m_cachedImageSize.isEmpty() && !imageResource()->errorOccurred())
         return m_cachedImageSize;
 
     // <video> in standalone media documents should not use the default 300x150
     // size since they also have audio-only files. By setting the intrinsic
     // size to 300x1 the video will resize itself in these cases, and audio will
@@ skipping 169 matching lines @@
             return CompositingReasonVideo;
     }
 
     if ((triggers & VideoTrigger) && shouldDisplayVideo() && supportsAcceleratedRendering())
         return CompositingReasonVideo;
 
     return CompositingReasonNone;
 }
 
 } // namespace WebCore