Changeset 87644 in webkit

Timestamp:

May 29, 2011 1:12:27 PM (13 years ago)

Author:

Darin Adler

Message:

2011-05-29 Darin Adler <Darin Adler>

Reviewed by Dan Bernstein.

Race condition in full screen controller, which leads to problem when web process crashes
​https://bugs.webkit.org/show_bug.cgi?id=61707

Saw this while debugging a crash. We don't have a way to make regression tests for this
kind of issue at this time.

• UIProcess/mac/WKFullScreenWindowController.mm: (-[WKFullScreenWindowController exitAcceleratedCompositingMode]): Retain the controller here since we are keeping a pointer to it. (exitCompositedModeRepaintCompleted): Release the controller here.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-29  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Race condition in full screen controller, which leads to problem when web process crashes
+        https://bugs.webkit.org/show_bug.cgi?id=61707
+
+        Saw this while debugging a crash. We don't have a way to make regression tests for this
+        kind of issue at this time.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController exitAcceleratedCompositingMode]): Retain the controller
+        here since we are keeping a pointer to it.
+        (exitCompositedModeRepaintCompleted): Release the controller here.
+
 2011-05-29  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

@@ -396 +396 @@
 
     NSDisableScreenUpdates();
+    [self retain]; // Balanced by release in exitCompositedModeRepaintCompleted below.
     [self _page]->forceRepaint(VoidCallback::create(self, exitCompositedModeRepaintCompleted));
 }
@@ -415 +416 @@
 static void exitCompositedModeRepaintCompleted(WKErrorRef, void* context)
 {
-    [(WKFullScreenWindowController*)context exitCompositedModeRepaintCompleted];
+    WKFullScreenWindowController *controller = static_cast<WKFullScreenWindowController *>(context);
+    [controller exitCompositedModeRepaintCompleted];
+    [controller release]; // Balanced by retain in exitAcceleratedCompositingMode above.
 }