OSDN Git Service

Merge webkit.org at r54127 : Make FLATTEN_IFRAME method overrides protected
authorSteve Block <steveblock@google.com>
Tue, 2 Feb 2010 18:38:55 +0000 (18:38 +0000)
committerSteve Block <steveblock@google.com>
Thu, 4 Feb 2010 22:39:57 +0000 (22:39 +0000)
commitbe8eaaca0526f55f497212ffc609a5155de3dd0e
tree3c15f13b07e10db27e371d93b0db0debf6fb9383
parent29d77cd449f8aaf1783d8d33f30453c400170f53
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