Changeset 31521 in webkit

Timestamp:

Apr 1, 2008 1:47:04 AM (16 years ago)

Author:

Simon Hausmann

Message:

Holger Hans Peter Freyther <​holger.freyther@trolltech.com>

• Get the RefCounting of WebCore::Frame right and make sure that both QWebFrame and WebCore::Frame get destroyed if we leave site with subframes and on the end of the application.
• Use adoptRef in FrameLoaderClientQt::createFrame to get the refs right for subframes. We do not want to add an extra reference. Without this we are leaking subframes.
• Assume that the lifetime of a Frame and FrameLoader are the same, when the Frame is gone we want to destroy the QWebFrame (e.g. on a page with subframes). Add delete m_webFrame in the frameLoaderDestroyed method to do that.
• If we happen to delete the QWebFrame before the FrameLoaderClientQt we set m_webFrame to zero in the FrameLoaderClientQt to avoid bad things.

Location:

trunk/WebKit/qt

Files:

• Api/qwebframe.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientQt.cpp (modified) (3 diffs)
• WebCoreSupport/FrameLoaderClientQt.h (modified) (2 diffs)

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -154 +154 @@
 QWebFrame::~QWebFrame()
 {
-    Q_ASSERT(d->frame == 0);
+    if (d->frame && d->frame->loader() && d->frame->loader()->client())
+        static_cast<FrameLoaderClientQt*>(d->frame->loader()->client())->m_webFrame = 0;
+        
     delete d;
 }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2008-04-01  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
+
+        Reviewed by Simon.
+
+        * Get the RefCounting of WebCore::Frame right and make sure that both QWebFrame
+        and WebCore::Frame get destroyed if we leave site with subframes and on the
+        end of the application.
+        * Use adoptRef in FrameLoaderClientQt::createFrame to get the refs right for subframes. We
+        do not want to add an extra reference. Without this we are leaking subframes.
+        * Assume that the lifetime of a Frame and FrameLoader are the same, when the Frame is gone
+        we want to destroy the QWebFrame (e.g. on a page with subframes). Add delete m_webFrame
+        in the frameLoaderDestroyed method to do that.
+        * If we happen to delete the QWebFrame before the FrameLoaderClientQt we set m_webFrame to
+        zero in the FrameLoaderClientQt to avoid bad things.
+        
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::~QWebFrame):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::shouldGoToHistoryItem):
+        (WebCore::FrameLoaderClientQt::objectContentType):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+
 2008-04-01  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -191 +191 @@
 void FrameLoaderClientQt::detachedFromParent4()
 {
-    if (!m_webFrame)
-        return;
-    m_webFrame->d->frame = 0;
-    m_webFrame = 0;
-    m_frame = 0;
 }
 
@@ -445 +440 @@
 void FrameLoaderClientQt::frameLoaderDestroyed()
 {
-    Q_ASSERT(m_webFrame == 0);
-    Q_ASSERT(m_frame == 0);
+    delete m_webFrame;
+    m_frame = 0;
+    m_webFrame = 0;
+
     delete this;
 }
@@ -735 +732 @@
     emit m_webFrame->page()->frameCreated(webFrame);
 
-    RefPtr<Frame> childFrame = adoptRef(webFrame->d->frame.get());
+    RefPtr<Frame> childFrame = adoptRef(webFrame->d->frame);
 
     // FIXME: All of the below should probably be moved over into WebCore

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h

@@ -2 +2 @@
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2007-2008 Trolltech ASA
  *
  * All rights reserved.
@@ -55 +56 @@
         Q_OBJECT
 
+        friend class ::QWebFrame;
         void callPolicyFunction(FramePolicyFunction function, PolicyAction action);
     private slots: