diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:38:55 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 22:39:57 +0000 |
| commit | be8eaaca0526f55f497212ffc609a5155de3dd0e (patch) | |
| tree | 3c15f13b07e10db27e371d93b0db0debf6fb9383 /WebCore/rendering | |
| parent | 29d77cd449f8aaf1783d8d33f30453c400170f53 (diff) | |
| download | external_webkit-be8eaaca0526f55f497212ffc609a5155de3dd0e.zip external_webkit-be8eaaca0526f55f497212ffc609a5155de3dd0e.tar.gz external_webkit-be8eaaca0526f55f497212ffc609a5155de3dd0e.tar.bz2 | |
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
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderPartObject.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderPartObject.h b/WebCore/rendering/RenderPartObject.h index 7160ea3..1175a31 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(); |