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

diff --git a/WebCore/rendering/RenderPartObject.h b/WebCore/rendering/RenderPartObject.h
index 7160ea3..1175a31 100644 (file)
--- 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();