Changeset 85549 in webkit

Timestamp:

May 2, 2011 4:41:47 PM (13 years ago)

Author:

beidson@apple.com

Message:

<rdar://problem/9340945> and ​https://bugs.webkit.org/show_bug.cgi?id=59973
In Aperture, a WebView might be dealloc'ed before it finishes loading.

Reviewed by Anders Carlsson.

../WebCore:

• WebCore.exp.in:
• platform/RuntimeApplicationChecks.cpp:

(WebCore::applicationIsAperture): Perform a com.apple.Aperture bundle check.

• platform/RuntimeApplicationChecks.h:

../WebKit/mac:

• WebView/WebView.mm:

(needsSelfRetainWhileLoadingQuirk):
(-[WebView _didStartProvisionalLoadForFrame:]): If we need the quirk, retain self.
(-[WebView _didFinishLoadForFrame:]): If we need the quirk, release self on a delay.
(-[WebView _didFailLoadWithError:forFrame:]): Ditto.
(-[WebView _didFailProvisionalLoadWithError:forFrame:]): Ditto.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/platform/RuntimeApplicationChecks.cpp (modified) (1 diff)
• WebCore/platform/RuntimeApplicationChecks.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-02  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/9340945> and https://bugs.webkit.org/show_bug.cgi?id=59973
+        In Aperture, a WebView might be dealloc'ed before it finishes loading.
+
+        * WebCore.exp.in:
+        * platform/RuntimeApplicationChecks.cpp:
+        (WebCore::applicationIsAperture): Perform a com.apple.Aperture bundle check.
+        * platform/RuntimeApplicationChecks.h:
+
 2011-05-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -557 +557 @@
 __ZN7WebCore21UserContentURLPattern5parseERKN3WTF6StringE
 __ZN7WebCore21WindowsLatin1EncodingEv
+__ZN7WebCore21applicationIsApertureEv
 __ZN7WebCore21findEventWithKeyStateEPNS_5EventE
 __ZN7WebCore21isBackForwardLoadTypeENS_13FrameLoadTypeE

trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp

@@ -97 +97 @@
 }
 
+bool applicationIsAperture()
+{
+    static bool isAperture = mainBundleIsEqualTo("com.apple.Aperture");
+    return isAperture;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/platform/RuntimeApplicationChecks.h

@@ -29 +29 @@
 namespace WebCore {
 
+bool applicationIsAOLInstantMessenger();
+bool applicationIsAdobeInstaller();
+bool applicationIsAperture();
 bool applicationIsAppleMail();
-bool applicationIsSafari();
 bool applicationIsMicrosoftMessenger();
-bool applicationIsAdobeInstaller();
-bool applicationIsAOLInstantMessenger();
 bool applicationIsMicrosoftMyDay();
 bool applicationIsMicrosoftOutlook();
+bool applicationIsSafari();
 
 } // namespace WebCore

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-05-02  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/9340945> and https://bugs.webkit.org/show_bug.cgi?id=59973
+        In Aperture, a WebView might be dealloc'ed before it finishes loading.
+
+        * WebView/WebView.mm:
+        (needsSelfRetainWhileLoadingQuirk):
+        (-[WebView _didStartProvisionalLoadForFrame:]): If we need the quirk, retain self.
+        (-[WebView _didFinishLoadForFrame:]): If we need the quirk, release self on a delay.
+        (-[WebView _didFailLoadWithError:forFrame:]): Ditto.
+        (-[WebView _didFailProvisionalLoadWithError:forFrame:]): Ditto.
+
 2011-05-02  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1397 +1397 @@
 }
 
+static bool needsSelfRetainWhileLoadingQuirk()
+{
+    static bool needsQuirk = applicationIsAperture();
+    return needsQuirk;
+}
 
 - (BOOL)_needsPreHTML5ParserQuirks
@@ -1850 +1855 @@
 - (void)_didStartProvisionalLoadForFrame:(WebFrame *)frame
 {
+    if (needsSelfRetainWhileLoadingQuirk())
+        [self retain];
+
     [self _willChangeBackForwardKeys];
     if (frame == [self mainFrame]){
@@ -1871 +1879 @@
 - (void)_didFinishLoadForFrame:(WebFrame *)frame
 {
+    if (needsSelfRetainWhileLoadingQuirk())
+        [self performSelector:@selector(release) withObject:nil afterDelay:0];
+        
     [self _didChangeBackForwardKeys];
     if (frame == [self mainFrame]){
@@ -1882 +1893 @@
 - (void)_didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
 {
+    if (needsSelfRetainWhileLoadingQuirk())
+        [self performSelector:@selector(release) withObject:nil afterDelay:0];
+
     [self _didChangeBackForwardKeys];
     if (frame == [self mainFrame]){
@@ -1893 +1907 @@
 - (void)_didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
 {
+    if (needsSelfRetainWhileLoadingQuirk())
+        [self performSelector:@selector(release) withObject:nil afterDelay:0];
+
     [self _didChangeBackForwardKeys];
     if (frame == [self mainFrame]){