| Index: third_party/WebKit/Source/core/layout/LayoutVideo.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutVideo.cpp b/third_party/WebKit/Source/core/layout/LayoutVideo.cpp
|
| index b9d00e0482c0437a9ae0ddf11ae58dea93c36a66..701a54fdf9e7fe9a5553ec85c53d873d21c92a90 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutVideo.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutVideo.cpp
|
| @@ -28,8 +28,6 @@
|
| #include "core/HTMLNames.h"
|
| #include "core/dom/Document.h"
|
| #include "core/html/HTMLVideoElement.h"
|
| -#include "core/layout/LayoutBlockFlow.h"
|
| -#include "core/layout/LayoutFullScreen.h"
|
| #include "core/paint/VideoPainter.h"
|
| #include "public/platform/WebLayer.h"
|
|
|
| @@ -193,44 +191,6 @@ bool LayoutVideo::supportsAcceleratedRendering() const {
|
| return !!mediaElement()->platformLayer();
|
| }
|
|
|
| -static const LayoutBlock* layoutObjectPlaceholder(
|
| - const LayoutObject* layoutObject) {
|
| - LayoutObject* parent = layoutObject->parent();
|
| - if (!parent)
|
| - return nullptr;
|
| -
|
| - LayoutFullScreen* fullScreen =
|
| - parent->isLayoutFullScreen() ? toLayoutFullScreen(parent) : 0;
|
| - if (!fullScreen)
|
| - return nullptr;
|
| -
|
| - return fullScreen->placeholder();
|
| -}
|
| -
|
| -LayoutUnit LayoutVideo::offsetLeft(const Element* parent) const {
|
| - if (const LayoutBlock* block = layoutObjectPlaceholder(this))
|
| - return block->offsetLeft(parent);
|
| - return LayoutMedia::offsetLeft(parent);
|
| -}
|
| -
|
| -LayoutUnit LayoutVideo::offsetTop(const Element* parent) const {
|
| - if (const LayoutBlock* block = layoutObjectPlaceholder(this))
|
| - return block->offsetTop(parent);
|
| - return LayoutMedia::offsetTop(parent);
|
| -}
|
| -
|
| -LayoutUnit LayoutVideo::offsetWidth() const {
|
| - if (const LayoutBlock* block = layoutObjectPlaceholder(this))
|
| - return block->offsetWidth();
|
| - return LayoutMedia::offsetWidth();
|
| -}
|
| -
|
| -LayoutUnit LayoutVideo::offsetHeight() const {
|
| - if (const LayoutBlock* block = layoutObjectPlaceholder(this))
|
| - return block->offsetHeight();
|
| - return LayoutMedia::offsetHeight();
|
| -}
|
| -
|
| CompositingReasons LayoutVideo::additionalCompositingReasons() const {
|
| HTMLMediaElement* element = toHTMLMediaElement(node());
|
| if (element->isFullscreen() && element->usesOverlayFullscreenVideo())
|
|
|