Title: [110078] trunk/Source/WebCore
- Revision
- 110078
- Author
- [email protected]
- Date
- 2012-03-07 11:44:28 -0800 (Wed, 07 Mar 2012)
Log Message
Unreviewed ASSERT failure fix.
https://bugs.webkit.org/show_bug.cgi?id=75568
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::styleDidChange):
Fix a bad merge of the patch, we should call updateCachedSizeForOverflowClip if we lose
our layer.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110077 => 110078)
--- trunk/Source/WebCore/ChangeLog 2012-03-07 19:23:52 UTC (rev 110077)
+++ trunk/Source/WebCore/ChangeLog 2012-03-07 19:44:28 UTC (rev 110078)
@@ -1,3 +1,13 @@
+2012-03-07 Julien Chaffraix <[email protected]>
+
+ Unreviewed ASSERT failure fix.
+ https://bugs.webkit.org/show_bug.cgi?id=75568
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::styleDidChange):
+ Fix a bad merge of the patch, we should call updateCachedSizeForOverflowClip if we lose
+ our layer.
+
2012-03-07 ChangSeok Oh <[email protected]>
[EFL] Revise PlatformKeyboardEventEfl and EflKeyboardUtilities
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (110077 => 110078)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2012-03-07 19:23:52 UTC (rev 110077)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2012-03-07 19:44:28 UTC (rev 110078)
@@ -391,14 +391,14 @@
setChildNeedsLayout(true);
if (s_hadTransform)
setNeedsLayoutAndPrefWidthsRecalc();
+ if (hasOverflowClip())
+ toRenderBox(this)->updateCachedSizeForOverflowClip();
}
if (layer()) {
layer()->styleChanged(diff, oldStyle);
if (s_hadLayer && layer()->isSelfPaintingLayer() != s_layerWasSelfPainting)
setChildNeedsLayout(true);
- if (hasOverflowClip())
- toRenderBox(this)->updateCachedSizeForOverflowClip();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
