Changeset 24455 in webkit

Timestamp:

Jul 19, 2007 4:48:42 PM (17 years ago)

Author:

treat

Message:

Do a recursive layout on frame's children.

Location:

trunk/WebKitQt

Files:

• Api/qwebframe.cpp (modified) (1 diff)
• Api/qwebframe.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKitQt/Api/qwebframe.cpp

@@ -232 +232 @@
         return;
 
+    layout();
+
+    GraphicsContext ctx(painter);
+    d->frameView->paint(&ctx, source);
+}
+
+void QWebFrame::layout()
+{
     if (d->frameView->needsLayout()) {
         d->frameView->layout();
     }
 
-    GraphicsContext ctx(painter);
-    d->frameView->paint(&ctx, source);
+    foreach (QWebFrame *child, childFrames()) {
+        child->layout();
+    }
 }
 

trunk/WebKitQt/Api/qwebframe.h

@@ -70 +70 @@
 
     void render(QPainter *painter, const QRect &source);
+    void layout();
 
     QPoint pos() const;

trunk/WebKitQt/ChangeLog

@@ +1 @@
+2007-07-19  Adam Treat  <treat@kde.org>
+
+        Reviewed by George.
+
+        Do a recursive layout on the frame's children.  This fixes a
+        segfault found when rendering some framesets.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::render):
+        (QWebFrame::layout):
+        * Api/qwebframe.h:
+
 2007-07-18  Timothy Hatcher  <timothy@apple.com>