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/rendering/RenderFrame.cpp | |
| 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/rendering/RenderFrame.cpp')
| -rw-r--r-- | WebCore/rendering/RenderFrame.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp index 46150ba..e7ad76a 100644 --- a/WebCore/rendering/RenderFrame.cpp +++ b/WebCore/rendering/RenderFrame.cpp @@ -28,7 +28,7 @@ #include "HTMLFrameElement.h" #include "RenderView.h" -#ifdef FLATTEN_FRAMESET +#ifdef ANDROID_FLATTEN_FRAMESET #include "Frame.h" #include "Document.h" #include "RenderView.h" @@ -65,7 +65,7 @@ void RenderFrame::viewCleared() view->setMarginHeight(marginh); } -#ifdef FLATTEN_FRAMESET +#ifdef ANDROID_FLATTEN_FRAMESET void RenderFrame::layout() { if (widget() && widget()->isFrameView()) { |