diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/rendering/RenderVideo.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/rendering/RenderVideo.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderVideo.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderVideo.h b/Source/WebCore/rendering/RenderVideo.h index 78f855068..4a256d188 100644 --- a/Source/WebCore/rendering/RenderVideo.h +++ b/Source/WebCore/rendering/RenderVideo.h @@ -70,7 +70,7 @@ private: virtual void layout(); - virtual LayoutUnit computeReplacedLogicalWidth(bool includeMaxWidth = true) const; + virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred = ComputeActual) const OVERRIDE; virtual LayoutUnit computeReplacedLogicalHeight() const; virtual LayoutUnit minimumReplacedHeight() const OVERRIDE; @@ -83,12 +83,14 @@ private: void updatePlayer(); + virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const OVERRIDE; + LayoutSize m_cachedImageSize; }; inline RenderVideo* toRenderVideo(RenderObject* object) { - ASSERT(!object || object->isVideo()); + ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isVideo()); return static_cast<RenderVideo*>(object); } |