Merge webkit.org at r58033 : Move Android iframe-flattening code to RenderIFrame.cpp

The Android iframe-flattening code was in RenderPartObject. The rendering
classes have been refactored upstream in http://trac.webkit.org/changeset/57866
so that most of RenderPartObject was moved to RenderIFrame. RenderPartObject was
then removed in http://trac.webkit.org/changeset/57900.

Iframe-flattening was also added upstream in
http://trac.webkit.org/changeset/56718.

This change takes the Android iframe-flattening code from RenderPartObject and
moves it to RenderIFrame. It also renames FLATTEN_IFRAME to
ANDROID_FLATTEN_IFRAME and FLATTEN_FRAMESET to ANDROID_FLATTEN_FRAMESET for
clarity.

Change-Id: I1af8d042f8d0c4abd513f8a315ac681360c1cc53

1 files changed, 0 insertions, 60 deletions

diff --git a/WebCore/rendering/RenderPartObject.h b/WebCore/rendering/RenderPartObject.h
deleted file mode 100644
index 1175a31..0000000
--- a/WebCore/rendering/RenderPartObject.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- *           (C) 2000 Simon Hausmann <hausmann@kde.org>
- * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef RenderPartObject_h
-#define RenderPartObject_h
-
-#include "RenderPart.h"
-
-namespace WebCore {
-
-// Renderer for iframes. Is subclassed in RenderEmbeddedObject for object and embed.
-class RenderPartObject : public RenderPart {
-public:
-    RenderPartObject(Element*);
-
-#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();
-};
-
-inline RenderPartObject* toRenderPartObject(RenderObject* object)
-{
-    ASSERT(!object || !strcmp(object->renderName(), "RenderPartObject"));
-    return static_cast<RenderPartObject*>(object);
-}
-
-// This will catch anyone doing an unnecessary cast.
-void toRenderPartObject(const RenderPartObject*);
-
-} // namespace WebCore
-
-#endif // RenderPartObject_h