Changeset 155811 in webkit for trunk/Source/WebCore/rendering/RenderVideo.cpp

Timestamp:

Sep 15, 2013, 7:13:55 AM (12 years ago)

Author:

[email protected]

Message:

CTTE: RenderMedia and RenderVideo are never anonymous.
<​https://webkit.org/b/121388>

Reviewed by Sam Weinig.

Codify the following:

• RenderMedia always has an HTMLMediaElement.
• RenderVideo always has an HTMLVideoElement.

None of these renderers are ever anonymous, so delete element() and provide
strongly typed reference getters instead.

File:

• trunk/Source/WebCore/rendering/RenderVideo.cpp (modified) (18 diffs)

trunk/Source/WebCore/rendering/RenderVideo.cpp

@@ -49 +49 @@
 using namespace HTMLNames;
 
-RenderVideo::RenderVideo(HTMLVideoElement* video)
-    : RenderMedia(video)
+RenderVideo::RenderVideo(HTMLVideoElement& element)
+    : RenderMedia(element)
 {
     setIntrinsicSize(calculateIntrinsicSize());
@@ -57 +57 @@
 RenderVideo::~RenderVideo()
 {
-    if (MediaPlayer* p = mediaElement()->player()) {
-        p->setVisible(false);
-        p->setFrameView(0);
+    if (MediaPlayer* player = videoElement().player()) {
+        player->setVisible(false);
+        player->setFrameView(0);
     }
 }
@@ -74 +74 @@
 void RenderVideo::intrinsicSizeChanged()
 {
-    if (videoElement()->shouldDisplayPosterImage())
+    if (videoElement().shouldDisplayPosterImage())
         RenderMedia::intrinsicSizeChanged();
     updateIntrinsicSize(); 
@@ -85 +85 @@
 
     // Never set the element size to zero when in a media document.
-    if (size.isEmpty() && element()->document().isMediaDocument())
+    if (size.isEmpty() && document().isMediaDocument())
         return;
 
@@ -98 +98 @@
 LayoutSize RenderVideo::calculateIntrinsicSize()
 {
-    HTMLVideoElement* video = videoElement();
-    
     // Spec text from 4.8.6
     //
@@ -109 +107 @@
     // 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) {
+    MediaPlayer* player = videoElement().player();
+    if (player && videoElement().readyState() >= HTMLVideoElement::HAVE_METADATA) {
         LayoutSize size = player->naturalSize();
         if (!size.isEmpty())
@@ -116 +114 @@
     }
 
-    if (video->shouldDisplayPosterImage() && !m_cachedImageSize.isEmpty() && !imageResource()->errorOccurred())
+    if (videoElement().shouldDisplayPosterImage() && !m_cachedImageSize.isEmpty() && !imageResource()->errorOccurred())
         return m_cachedImageSize;
 
     // When the natural size of the video is unavailable, we use the provided
     // width and height attributes of the video element as the intrinsic size until
-    // better values become available. 
-    if (video->hasAttribute(widthAttr) && video->hasAttribute(heightAttr))
-        return LayoutSize(video->width(), video->height());
+    // better values become available.
+    if (videoElement().hasAttribute(widthAttr) && videoElement().hasAttribute(heightAttr))
+        return LayoutSize(videoElement().width(), videoElement().height());
 
     // <video> in standalone media documents should not use the default 300x150
@@ -129 +127 @@
     // size to 300x1 the video will resize itself in these cases, and audio will
     // have the correct height (it needs to be > 0 for controls to render properly).
-    if (video->document().isMediaDocument())
+    if (videoElement().document().isMediaDocument())
         return LayoutSize(defaultSize().width(), 1);
 
@@ -142 +140 @@
     // even if we know the video intrinsic size but aren't able to draw video frames yet
     // (we don't want to scale the poster to the video size without keeping aspect ratio).
-    if (videoElement()->shouldDisplayPosterImage())
+    if (videoElement().shouldDisplayPosterImage())
         m_cachedImageSize = intrinsicSize();
 
@@ -154 +152 @@
     LayoutSize intrinsicSize = this->intrinsicSize();
 
-    if (videoElement()->shouldDisplayPosterImage())
+    if (videoElement().shouldDisplayPosterImage())
         intrinsicSize = m_cachedImageSize;
 
@@ -162 +160 @@
 bool RenderVideo::shouldDisplayVideo() const
 {
-    return !videoElement()->shouldDisplayPosterImage();
+    return !videoElement().shouldDisplayPosterImage();
 }
 
 void RenderVideo::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    MediaPlayer* mediaPlayer = mediaElement()->player();
-    bool displayingPoster = videoElement()->shouldDisplayPosterImage();
+    MediaPlayer* mediaPlayer = videoElement().player();
+    bool displayingPoster = videoElement().shouldDisplayPosterImage();
 
     Page* page = frame().page();
@@ -212 +210 @@
 }
     
-HTMLVideoElement* RenderVideo::videoElement() const
-{
-    return toHTMLVideoElement(element()); 
+HTMLVideoElement& RenderVideo::videoElement() const
+{
+    return toHTMLVideoElement(RenderMedia::mediaElement());
 }
 
@@ -230 +228 @@
     updateIntrinsicSize();
 
-    MediaPlayer* mediaPlayer = mediaElement()->player();
+    MediaPlayer* mediaPlayer = videoElement().player();
     if (!mediaPlayer)
         return;
 
-    if (!videoElement()->inActiveDocument()) {
+    if (!videoElement().inActiveDocument()) {
         mediaPlayer->setVisible(false);
         return;
@@ -268 +266 @@
 bool RenderVideo::supportsAcceleratedRendering() const
 {
-    MediaPlayer* p = mediaElement()->player();
-    if (p)
-        return p->supportsAcceleratedRendering();
-
+    if (MediaPlayer* player = videoElement().player())
+        return player->supportsAcceleratedRendering();
     return false;
 }
@@ -277 +273 @@
 void RenderVideo::acceleratedRenderingStateChanged()
 {
-    MediaPlayer* p = mediaElement()->player();
-    if (p)
-        p->acceleratedRenderingStateChanged();
+    if (MediaPlayer* player = videoElement().player())
+        player->acceleratedRenderingStateChanged();
 }
 #endif  // USE(ACCELERATED_COMPOSITING)
@@ -285 +280 @@
 bool RenderVideo::requiresImmediateCompositing() const
 {
-    MediaPlayer* player = mediaElement()->player();
+    MediaPlayer* player = videoElement().player();
     return player && player->requiresImmediateCompositing();
 }
@@ -334 +329 @@
 bool RenderVideo::foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const
 {
-    if (videoElement()->shouldDisplayPosterImage())
+    if (videoElement().shouldDisplayPosterImage())
         return RenderImage::foregroundIsKnownToBeOpaqueInRect(localRect, maxDepthToTest);
 
@@ -340 +335 @@
         return false;
 
-    if (MediaPlayer* player = mediaElement()->player())
+    if (MediaPlayer* player = videoElement().player())
         return player->hasAvailableVideoFrame();