OSDN Git Service

Be more restrictive when expanding iframes.
authorPatrick Scott <phanna@android.com>
Fri, 14 Aug 2009 12:21:09 +0000 (08:21 -0400)
committerPatrick Scott <phanna@android.com>
Mon, 17 Aug 2009 18:43:23 +0000 (14:43 -0400)
commit6f005c9e8f4b80ca59aaacd9e8fee9670a4a5c8f
treeb9de1627a9b0f986bb1a2c6fda0cff77181aa04c
parent08ed5007c291b48f32522b00fab79634f608c3cf
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
WebCore/rendering/RenderPartObject.cpp
WebKit/android/jni/WebViewCore.cpp