diff options
| author | Patrick Scott <phanna@android.com> | 2009-08-14 08:21:09 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-08-17 15:05:06 -0400 |
| commit | 4e3a924fd8b5f88ef5e656393e8a0de568c2baa5 (patch) | |
| tree | 0c10c1a6cc75730e6420e6549cb6d8c1e36bf8d7 /WebKit | |
| parent | 7df3d98b242a15afb526fe8a7c8b0a5d28415f33 (diff) | |
| download | external_webkit-4e3a924fd8b5f88ef5e656393e8a0de568c2baa5.zip external_webkit-4e3a924fd8b5f88ef5e656393e8a0de568c2baa5.tar.gz external_webkit-4e3a924fd8b5f88ef5e656393e8a0de568c2baa5.tar.bz2 | |
Do not merge - pulled from master
Be more restrictive when expanding iframes.
If an iframe has no scrollbars and a fixed dimension, it serves no purpose to
try and expand the contents. Some sites like to use hidden iframes for
asynchronous loading and showing or expanding those iframes causes layout
problems.
Change the expansion logic slightly to only expand iframes and not contract
them. Also update calcWidth and calcHeight to check for scrollbars or a
non-fixed dimension.
BUG=2039520,2004093
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index c16d0a3..aa96b18 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -440,7 +440,7 @@ void WebViewCore::recordPictureSet(PictureSet* content) // If the frame doesn't have an owner then it is the top frame and the // view size is the frame size. WebCore::RenderPart* owner = frame->ownerRenderer(); - if (owner) { + if (owner && owner->style()->visibility() == VISIBLE) { int x = owner->x(); int y = owner->y(); |