diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-31 15:39:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-31 15:39:34 -0800 |
| commit | 02e2eb47c60483f447fe94a22dbaf8c8124c32d9 (patch) | |
| tree | 66aff689b414d4d1b2ca7fbf989475a82fbf3949 /WebCore | |
| parent | 3366e7bafd9fb2b49c660689688959b42e33cb57 (diff) | |
| parent | fcff94b0bbcd719f49120de639d7cac235cb547b (diff) | |
| download | external_webkit-02e2eb47c60483f447fe94a22dbaf8c8124c32d9.zip external_webkit-02e2eb47c60483f447fe94a22dbaf8c8124c32d9.tar.gz external_webkit-02e2eb47c60483f447fe94a22dbaf8c8124c32d9.tar.bz2 | |
Merge "Do not propagate compositing for some iframes." into honeycomb
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/RenderLayerCompositor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp index bcb1c84..f31ab9d 100644 --- a/WebCore/rendering/RenderLayerCompositor.cpp +++ b/WebCore/rendering/RenderLayerCompositor.cpp @@ -1129,6 +1129,10 @@ bool RenderLayerCompositor::allowsIndependentlyCompositedIFrames(const FrameView bool RenderLayerCompositor::shouldPropagateCompositingToEnclosingIFrame() const { +#if PLATFORM(ANDROID) + if (enclosingIFrameElement() && !allowsIndependentlyCompositedIFrames(m_renderView->frameView())) + return true; +#endif // Parent document content needs to be able to render on top of a composited iframe, so correct behavior // is to have the parent document become composited too. However, this can cause problems on platforms that // use native views for frames (like Mac), so disable that behavior on those platforms for now. |