Changeset 28503 in webkit

Timestamp:

Dec 6, 2007 5:04:43 PM (16 years ago)

Author:

Adam Roben

Message:

Fix <rdar://5615283> Crash in WebFrame::receivedPolicyDecision

WebKit/mac:

Remove some assertions we know can fire and replace them with a FIXME

Reviewed by Anders.

• WebCoreSupport/WebFrameLoaderClient.mm:

WebKit/win:

Fix <rdar://5615283> Crash in WebFrame::receivedPolicyDecision

It's possible for a second policy listener to be created while we're
waiting for a decision on the first policy listener. In this case we
would crash when the first policy listener had a decision made. Mac
WebKit already handles this by invalidating any existing policy
listener when creating a new one.

A test case is coming in a future commit.

Reviewed by Anders.

• WebFrame.cpp: (WebFrame::setUpPolicyListener): Copy the Mac behavior of invalidating any existing policy listener, and remove some assertions that we know can fire.

Location:

trunk/WebKit

Files:

• mac/ChangeLog (modified) (1 diff)
• mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (1 diff)
• win/ChangeLog (modified) (1 diff)
• win/WebFrame.cpp (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2007-12-06  Adam Roben  <aroben@apple.com>
+
+        Remove some assertions we know can fire and replace them with a FIXME
+
+        Reviewed by Anders.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+
 2007-12-06  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -1061 +1061 @@
 RetainPtr<WebFramePolicyListener> WebFrameLoaderClient::setUpPolicyListener(FramePolicyFunction function)
 {
-    ASSERT(!m_policyListener);
-    ASSERT(!m_policyFunction);
+    // FIXME: <rdar://5634381> We need to support multiple active policy listeners.
 
     [m_policyListener.get() invalidate];

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2007-12-06  Adam Roben  <aroben@apple.com>
+
+        Fix <rdar://5615283> Crash in WebFrame::receivedPolicyDecision
+
+        It's possible for a second policy listener to be created while we're
+        waiting for a decision on the first policy listener. In this case we
+        would crash when the first policy listener had a decision made. Mac
+        WebKit already handles this by invalidating any existing policy
+        listener when creating a new one.
+
+        A test case is coming in a future commit.
+
+        Reviewed by Anders.
+
+        * WebFrame.cpp:
+        (WebFrame::setUpPolicyListener): Copy the Mac behavior of invalidating
+        any existing policy listener, and remove some assertions that we know
+        can fire.
+
 2007-12-06  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/win/WebFrame.cpp

@@ -1986 +1986 @@
 COMPtr<WebFramePolicyListener> WebFrame::setUpPolicyListener(WebCore::FramePolicyFunction function)
 {
-    ASSERT(!d->m_policyListener);
-    ASSERT(!d->m_policyFunction);
+    // FIXME: <rdar://5634381> We need to support multiple active policy listeners.
+
+    if (d->m_policyListener)
+        d->m_policyListener->invalidate();
 
     Frame* coreFrame = core(this);