Changeset 35327 in webkit

Timestamp:

Jul 24, 2008 1:24:11 PM (16 years ago)

Author:

hyatt@apple.com

Message:

2008-07-24 David Hyatt <​hyatt@apple.com>

Fix for bug 18673, crash when using full page zoom on generated content. Don't call
intrinsicSizeChanged when we are first setting our style.

Reviewed by olliej

• ChangeLog:
• rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::setStyle):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-07-24  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 18673, crash when using full page zoom on generated content.  Don't call
+        intrinsicSizeChanged when we are first setting our style.
+
+        Reviewed by olliej
+
+        * ChangeLog:
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::setStyle):
+
 2008-07-24  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/WebCore/rendering/RenderReplaced.cpp

@@ -64 +64 @@
 void RenderReplaced::setStyle(RenderStyle* newStyle)
 {
-    float oldZoom = style() ? style()->effectiveZoom() : RenderStyle::initialZoom();
+    bool hadStyle = style();
+    float oldZoom = hadStyle ? style()->effectiveZoom() : RenderStyle::initialZoom();
     RenderBox::setStyle(newStyle);
-    if (newStyle && newStyle->effectiveZoom() != oldZoom)
+    if (hadStyle && newStyle && newStyle->effectiveZoom() != oldZoom)
         intrinsicSizeChanged();
 }