| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
| |
I was filtering out 1x1 frames incorrectly by using the calculated width and
height which includes border and padding.
Bug: 2317776
|
| |
|
|
|
|
| |
The original assert was meant to assert that the body renderer layout state is
not modified during the expansion of the iframe. This can falsely fire if the
body renderer already needed a layout before the iframe expansion.
|
| |
|
|
| |
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
|
| |
|
|
| |
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem is that if updateWidgetPosition calls layout, the FrameView will
layout with 0x0 dimensions. Then, we resize the view and try to relayout. This
causes the body to be marked as needing a layout. But, the body does not get a
chance to relayout. If updateWidgetPosition does not layout, the view size will
match and the body will not be marked for layout. This makes everything sane
after layout of the iframe.
The root of the problem is that we are calling FrameView::layout() while in the
midst of a layout. This is causing a child RenderObject to need a layout
without the parent object needing a layout. We avoid this by not laying out
until we set the FrameView dimensions.
Bug: 2048855, 2134215
|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
WebCore/bindings/v8/ScriptController.cpp
WebCore/page/Geolocation.cpp
WebCore/platform/android/GeolocationServiceAndroid.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |/ |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
holds all
the frames. If this rectangle is larger than the computed content, make
the frame's view size equal to the computed total so that the content
will be the correct size.
When expanded iframes, set the width and height to the content width and
height plus the padding and border.
BUG=1719555
Automated import of CL 146317
|
| |
|
|
| |
Automated import of CL 145796
|
| |
|
|
|
|
|
| |
This fixes a few calls to calcWidth/calcHeight without doing a layout.
BUG=1360169
Automated import of CL 145074
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
