21 lines
1.2 KiB
Diff
21 lines
1.2 KiB
Diff
|
Pouze v qt-everywhere-opensource-src-4.6.3-CVE-2010-1400/src/3rdparty/webkit/WebCore: changeset_r54521.diff
|
||
|
|
diff -ur qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp qt-everywhere-opensource-src-4.6.3-CVE-2010-1400/src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp
|
||
|
|
--- qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp 2010-06-02 04:03:11.000000000 +0200
|
||
|
|
+++ qt-everywhere-opensource-src-4.6.3-CVE-2010-1400/src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp 2010-06-10 21:43:55.916193363 +0200
|
||
|
|
@@ -1684,6 +1684,15 @@
|
||
|
|
if (repaintContainer == this)
|
||
|
|
return;
|
||
|
|
|
||
|
|
+ // If the object already needs layout, then setNeedsLayout won't do
|
||
|
|
+ // any work. But if the containing block has changed, then we may need
|
||
|
|
+ // to make the new containing blocks for layout. The change that can
|
||
|
|
+ // directly affect the containing block of this object is a change to
|
||
|
|
+ // the position style.
|
||
|
|
+ if (m_needsLayout && oldStyle->position() != m_style->position())
|
||
|
|
+ markContainingBlocksForLayout();
|
||
|
|
+
|
||
|
|
+
|
||
|
|
RenderObject* o = parent();
|
||
|
|
if (!o)
|
||
|
|
return;
|