Replace RenderFullscreen with top layer - Take II

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 16 matching lines @@
 
 #include "core/rendering/RenderVideo.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/paint/VideoPainter.h"
 #include "core/rendering/PaintInfo.h"
-#include "core/rendering/RenderFullScreen.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "public/platform/WebLayer.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 RenderVideo::RenderVideo(HTMLVideoElement* video)
     : RenderMedia(video)
 {
@@ skipping 150 matching lines @@
 LayoutUnit RenderVideo::minimumReplacedHeight() const
 {
     return RenderReplaced::minimumReplacedHeight();
 }
 
 bool RenderVideo::supportsAcceleratedRendering() const
 {
     return !!mediaElement()->platformLayer();
 }
 
-static const RenderBlock* rendererPlaceholder(const RenderObject* renderer)
-{
-    RenderObject* parent = renderer->parent();
-    if (!parent)
-        return 0;
-
-    RenderFullScreen* fullScreen = parent->isRenderFullScreen() ? toRenderFullScreen(parent) : 0;
-    if (!fullScreen)
-        return 0;
-
-    return fullScreen->placeholder();
-}
-
-LayoutUnit RenderVideo::offsetLeft() const
-{
-    if (const RenderBlock* block = rendererPlaceholder(this))
-        return block->offsetLeft();
-    return RenderMedia::offsetLeft();
-}
-
-LayoutUnit RenderVideo::offsetTop() const
-{
-    if (const RenderBlock* block = rendererPlaceholder(this))
-        return block->offsetTop();
-    return RenderMedia::offsetTop();
-}
-
-LayoutUnit RenderVideo::offsetWidth() const
-{
-    if (const RenderBlock* block = rendererPlaceholder(this))
-        return block->offsetWidth();
-    return RenderMedia::offsetWidth();
-}
-
-LayoutUnit RenderVideo::offsetHeight() const
-{
-    if (const RenderBlock* block = rendererPlaceholder(this))
-        return block->offsetHeight();
-    return RenderMedia::offsetHeight();
-}
-
 CompositingReasons RenderVideo::additionalCompositingReasons() const
 {
     if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) {
         HTMLMediaElement* media = toHTMLMediaElement(node());
         if (media->isFullscreen())
             return CompositingReasonVideo;
     }
 
     if (shouldDisplayVideo() && supportsAcceleratedRendering())
         return CompositingReasonVideo;
 
     return CompositingReasonNone;
 }
 
 } // namespace blink