From fc38d325f67d0fc26fd82125299088a790627d31 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 30 Apr 2010 15:36:55 +0100 Subject: 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 --- WebCore/rendering/RenderFrameSet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'WebCore/rendering/RenderFrameSet.h') diff --git a/WebCore/rendering/RenderFrameSet.h b/WebCore/rendering/RenderFrameSet.h index 345648f..cdc7b5a 100644 --- a/WebCore/rendering/RenderFrameSet.h +++ b/WebCore/rendering/RenderFrameSet.h @@ -70,7 +70,7 @@ public: bool canResizeRow(const IntPoint&) const; bool canResizeColumn(const IntPoint&) const; -#ifdef FLATTEN_FRAMESET +#ifdef ANDROID_FLATTEN_FRAMESET void setGridNeedsLayout() { m_gridCalculated = false; } #endif @@ -128,7 +128,7 @@ private: bool m_isResizing; bool m_isChildResizing; -#ifdef FLATTEN_FRAMESET +#ifdef ANDROID_FLATTEN_FRAMESET bool m_gridCalculated; #endif }; -- cgit v1.1