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 0dc2abe3237296e7b7f4171aa333c3f346cd001e..c54292bfc4acf6c6a58d4084460ac1592ce8b244 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutVideo.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutVideo.cpp |
@@ -29,7 +29,6 @@ |
#include "core/HTMLNames.h" |
#include "core/dom/Document.h" |
#include "core/html/HTMLVideoElement.h" |
-#include "core/layout/LayoutFullScreen.h" |
#include "core/paint/VideoPainter.h" |
#include "public/platform/WebLayer.h" |
@@ -203,47 +202,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 |
-{ |
- if (const LayoutBlock* block = layoutObjectPlaceholder(this)) |
- return block->offsetLeft(); |
- return LayoutMedia::offsetLeft(); |
-} |
- |
-LayoutUnit LayoutVideo::offsetTop() const |
-{ |
- if (const LayoutBlock* block = layoutObjectPlaceholder(this)) |
- return block->offsetTop(); |
- return LayoutMedia::offsetTop(); |
-} |
- |
-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()); |