diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-18 16:38:47 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2011-01-18 16:41:45 -0500 |
| commit | b24f58947b87db91609cdd581b7e0c8e3ac5b27a (patch) | |
| tree | 22077829b1820fe715300485d23b8087445f58b1 /WebCore/page/FrameView.h | |
| parent | 3eee7f647df0557a7c476e21afb08031736aac8c (diff) | |
| download | external_webkit-b24f58947b87db91609cdd581b7e0c8e3ac5b27a.zip external_webkit-b24f58947b87db91609cdd581b7e0c8e3ac5b27a.tar.gz external_webkit-b24f58947b87db91609cdd581b7e0c8e3ac5b27a.tar.bz2 | |
Fix some sites not responding.
Enter compositing for iframes after all layout tasks have completed. Remember
the state of overflow scroll similar to RenderLayer so that it doesn't change
while updating the compositing state.
Return false in requiresAcceleratedCompositing if the iframe is hidden. I verified
that this fails on Safari and have submitted a bug.
Bug: 3325187
Change-Id: I20a9e1a595d14518f4c7a3e01fc1c4fa9035262c
Diffstat (limited to 'WebCore/page/FrameView.h')
| -rw-r--r-- | WebCore/page/FrameView.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h index d56b1ef..1b5b322 100644 --- a/WebCore/page/FrameView.h +++ b/WebCore/page/FrameView.h @@ -103,9 +103,9 @@ public: // Called when changes to the GraphicsLayer hierarchy have to be synchronized with // content rendered via the normal painting path. void setNeedsOneShotDrawingSynchronization(); -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - bool hasOverflowScroll() const; #endif +#if ENABLE(ANDROID_OVERFLOW_SCROLL) + bool hasOverflowScroll() const { return m_hasOverflowScroll; } #endif bool hasCompositedContent() const; @@ -390,6 +390,9 @@ private: static double s_initialDeferredRepaintDelayDuringLoading; static double s_maxDeferredRepaintDelayDuringLoading; static double s_deferredRepaintDelayIncrementDuringLoading; +#if ENABLE(ANDROID_OVERFLOW_SCROLL) + bool m_hasOverflowScroll; +#endif }; } // namespace WebCore |