From bec39347bb3bb5bf1187ccaf471d26247f28b585 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Thu, 30 Sep 2010 15:42:16 +0100 Subject: Merge WebKit at r68651 : Initial merge by git. Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12 --- WebCore/rendering/RenderVideo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'WebCore/rendering/RenderVideo.h') diff --git a/WebCore/rendering/RenderVideo.h b/WebCore/rendering/RenderVideo.h index 2c47471..24f473d 100644 --- a/WebCore/rendering/RenderVideo.h +++ b/WebCore/rendering/RenderVideo.h @@ -70,8 +70,8 @@ private: virtual void layout(); - virtual int calcReplacedWidth(bool includeMaxWidth = true) const; - virtual int calcReplacedHeight() const; + virtual int computeReplacedWidth(bool includeMaxWidth = true) const; + virtual int computeReplacedHeight() const; virtual int minimumReplacedHeight() const; void updatePlayer(); -- cgit v1.1