OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4b1cfb1
)
Automated import from //branches/donutburger/...@141437,141437
author
Grace Kloba
<>
Wed, 25 Mar 2009 03:17:13 +0000
(20:17 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Wed, 25 Mar 2009 03:17:13 +0000
(20:17 -0700)
WebCore/rendering/RenderBlock.cpp
patch
|
blob
|
history
diff --git
a/WebCore/rendering/RenderBlock.cpp
b/WebCore/rendering/RenderBlock.cpp
index
6d18ba1
..
0d73961
100644
(file)
--- a/
WebCore/rendering/RenderBlock.cpp
+++ b/
WebCore/rendering/RenderBlock.cpp
@@
-1400,6
+1400,13
@@
bool RenderBlock::layoutOnlyPositionedObjects()
if (hasOverflowClip())
m_layer->updateScrollInfoAfterLayout();
+#ifdef ANDROID_FIX
+ // iframe flatten will call FrameView::layout() which calls performPostLayoutTasks,
+ // which may make us need to layout again
+ if (!posChildNeedsLayout() || normalChildNeedsLayout() || selfNeedsLayout())
+ return false;
+#endif
+
setNeedsLayout(false);
return true;
}