diff options
| author | Steve Block <steveblock@google.com> | 2010-04-30 15:36:55 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:14 +0100 |
| commit | fc38d325f67d0fc26fd82125299088a790627d31 (patch) | |
| tree | 6d2b08740ba106d2460a90aeefcc67d671e63a95 /WebCore/page | |
| parent | 8c053ec93ab9e7ff792eed9f0eb2fbc01155ad1d (diff) | |
| download | external_webkit-fc38d325f67d0fc26fd82125299088a790627d31.zip external_webkit-fc38d325f67d0fc26fd82125299088a790627d31.tar.gz external_webkit-fc38d325f67d0fc26fd82125299088a790627d31.tar.bz2 | |
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
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/FrameView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp index 1ebdf99..c69b514 100644 --- a/WebCore/page/FrameView.cpp +++ b/WebCore/page/FrameView.cpp @@ -1246,7 +1246,7 @@ void FrameView::scheduleRelayout() if (!m_frame->document()->shouldScheduleLayout()) return; -#if defined(FLATTEN_IFRAME) || defined(FLATTEN_FRAMESET) +#if defined(ANDROID_FLATTEN_IFRAME) || defined(ANDROID_FLATTEN_FRAMESET) // This is the Android frame flattening code. The common code below is not // used as frameSetFlatteningEnabled() is false on Android. if (m_frame->ownerRenderer()) |