Reviewed by Adele.

        Remove redundant call to Frame::cancelAndClear from ~Frame, since it's
        already called frome ~FrameMac.

        * page/Frame.cpp:
        (WebCore::Frame::~Frame):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16932 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3f234c8ef23cdfa524e5483a9abe8f14c5898aee..c2fedc2c210185f1e45c5de34a3fc9c19a0e98f5 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-09  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Adele.
+
+        Remove redundant call to Frame::cancelAndClear from ~Frame, since it's
+        already called frome ~FrameMac.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::~Frame):
+

 2006-10-09  Anders Carlsson  <acarlsson@apple.com>
 
         * bridge/win/FrameWin.h:
 2006-10-09  Anders Carlsson  <acarlsson@apple.com>
 
         * bridge/win/FrameWin.h:

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 09f6a794e3411b13e6f50fe076814caef6da528d..4eab0ef5990bd630aa8c69fcfb0520eecc3667b9 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -191,8 +191,6 @@ Frame::~Frame()
     --FrameCounter::count;
 #endif
 
     --FrameCounter::count;
 #endif
 

-    cancelAndClear();
-

     if (d->m_jscript && d->m_jscript->haveInterpreter())
         if (Window* w = Window::retrieveWindow(this)) {
             w->disconnectFrame();
     if (d->m_jscript && d->m_jscript->haveInterpreter())
         if (Window* w = Window::retrieveWindow(this)) {
             w->disconnectFrame();