From be8eaaca0526f55f497212ffc609a5155de3dd0e Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 18:38:55 +0000 Subject: [PATCH] Merge webkit.org at r54127 : Make FLATTEN_IFRAME method overrides protected RenderPartObject inherits calcWidth/calcHeight as public methods throught the chain RenderPart -> RenderWidget -> RenderReplaced -> RenderBox. On Android, RenderPartObject overrides calcWidth/calcHeight as private methods for FLATTEN_IFRAME. This is not yet upstreamed. The new WebKit uses calcWidth/calcHeight from RenderEmbeddedObject, which inherits from RenderPartObject. So we need to make the these methods protected in RenderPartObject Change-Id: Ifb48d5daa10fc14c80f6da987cbd034713febc12 --- WebCore/rendering/RenderPartObject.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/WebCore/rendering/RenderPartObject.h b/WebCore/rendering/RenderPartObject.h index 7160ea3c5..1175a319e 100644 --- a/WebCore/rendering/RenderPartObject.h +++ b/WebCore/rendering/RenderPartObject.h @@ -32,13 +32,15 @@ class RenderPartObject : public RenderPart { public: RenderPartObject(Element*); -private: - virtual const char* renderName() const { return "RenderPartObject"; } - #ifdef FLATTEN_IFRAME +protected: virtual void calcWidth(); virtual void calcHeight(); #endif + +private: + virtual const char* renderName() const { return "RenderPartObject"; } + virtual void layout(); virtual void viewCleared(); -- 2.11.0