142765 2015-03-16 19:15:01 -0700 Don't pass nil as a fireDate for NSTimer 2015-03-16 19:58:49 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 conrad_shultz conrad_shultz conrad_shultz oldest_to_newest 1077692 0 conrad_shultz 2015-03-16 19:15:01 -0700 WKFullScreenWindowController uses nil as the fireDate for a deferred one-shot timer. It shouldn't. 1077693 1 conrad_shultz 2015-03-16 19:15:40 -0700 <rdar://problem/20149806> 1077702 2 248784 conrad_shultz 2015-03-16 19:46:34 -0700 Created attachment 248784 Patch 1077705 3 248784 mitz 2015-03-16 19:49:29 -0700 Comment on attachment 248784 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248784&action=review > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:75 > +- (void)_watchdogTimerFired:(NSTimer *)timer; I don’t think this is necessary anymore. > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:678 > + ASSERT_ARG(timer, timer == _watchdogTimer); I can’t remember a single time this kind of assertion was useful. 1077709 4 conrad_shultz 2015-03-16 19:57:31 -0700 (In reply to comment #3) > Comment on attachment 248784 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=248784&action=review > > > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:75 > > +- (void)_watchdogTimerFired:(NSTimer *)timer; > > I don’t think this is necessary anymore. As of Xcode 4.3, correct. I only added it to parallel the other methods; removed. > > > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:678 > > + ASSERT_ARG(timer, timer == _watchdogTimer); > > I can’t remember a single time this kind of assertion was useful. Removed. 1077711 5 conrad_shultz 2015-03-16 19:58:49 -0700 Committed r181607: <http://trac.webkit.org/changeset/181607> 248784 2015-03-16 19:46:34 -0700 2015-03-16 19:49:29 -0700 Patch bug-142765-20150316194602.patch text/plain 2846 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzJjNmMwZTE5M2NjOWQ2 YjA0NzYwODhkOTZjMjBhMmNhNGI4NWU5ZS4uMjMwYTBkOTk1ZDgxZjExYTk1YjIxMTlmYWI4OGU4 YzdmNTQ1ODgyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAzLTE2ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgcGFz cyBuaWwgYXMgYSBmaXJlRGF0ZSBmb3IgTlNUaW1lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNzY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2hpbGUgd2UncmUgaGVyZSwgc3dpdGNoIHRvIGEgc2Vs ZWN0b3IgdGhhdCBjb25mb3JtcyB0byBkb2N1bWVudGVkIE5TVGltZXIgQVBJLgorCisgICAgICAg ICogVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tOgorICAgICAg ICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGNhbmNlbE9wZXJhdGlvbjpdKToKKyAg ICAgICAgU2V0IHRoZSB0aW1lcidzIGZpcmVEYXRlIGFzIHRoZSBmdXR1cmUgZGF0ZSBtYXRjaGlu ZyB0aGUgZm9ybWVyIGludGVydmFsOyB1cGRhdGUgdGhlIHNlbGVjdG9yLgorICAgICAgICAoLVtX S0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIF93YXRjaGRvZ1RpbWVyRmlyZWQ6XSk6CisgICAg ICAgIFRpbWVyIGNhbGxiYWNrOyB3cmFwIC1leGl0RnVsbFNjcmVlbi4KKwogMjAxNS0wMy0xNiAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFBy b2dyZXNzIHRvd2FyZHMgQ01ha2Ugb24gTWFjCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KaW5kZXgg YzU0MmU5YmEzYTU3YzBlOWUwYzE1ZThkMzg1MmFlNDY3MmM2MWE4My4uMzdjYmE3NzFiZjU2YzNm M2JlMGZhMDk5YTI0Y2M4YzMyZjU5M2U0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQpAQCAt NzIsNiArNzIsNyBAQCBlbnVtIEZ1bGxTY3JlZW5TdGF0ZSA6IE5TSW50ZWdlciB7CiAtIChXZWJG dWxsU2NyZWVuTWFuYWdlclByb3h5KilfbWFuYWdlcjsKIC0gKHZvaWQpX3N0YXJ0RW50ZXJGdWxs U2NyZWVuQW5pbWF0aW9uV2l0aER1cmF0aW9uOihOU1RpbWVJbnRlcnZhbClkdXJhdGlvbjsKIC0g KHZvaWQpX3N0YXJ0RXhpdEZ1bGxTY3JlZW5BbmltYXRpb25XaXRoRHVyYXRpb246KE5TVGltZUlu dGVydmFsKWR1cmF0aW9uOworLSAodm9pZClfd2F0Y2hkb2dUaW1lckZpcmVkOihOU1RpbWVyICop dGltZXI7CiBAZW5kCiAKIHN0YXRpYyBOU1JlY3QgY29udmVydFJlY3RUb1NjcmVlbihOU1dpbmRv dyAqd2luZG93LCBOU1JlY3QgcmVjdCkKQEAgLTE1NCw3ICsxNTUsNyBAQCBzdGF0aWMgdm9pZCBt YWtlUmVzcG9uZGVyRmlyc3RSZXNwb25kZXJJZkRlc2NlbmRhbnRPZlZpZXcoTlNXaW5kb3cgKndp bmRvdywgTlNSZQogICAgIC8vIHRoZSBXZWJQcm9jZXNzIGhhcyBodW5nLCBzbyBleGl0IGFueXdh eS4KICAgICBpZiAoIV93YXRjaGRvZ1RpbWVyKSB7CiAgICAgICAgIFtzZWxmIF9tYW5hZ2VyXS0+ cmVxdWVzdEV4aXRGdWxsU2NyZWVuKCk7Ci0gICAgICAgIF93YXRjaGRvZ1RpbWVyID0gYWRvcHRO UyhbW05TVGltZXIgYWxsb2NdIGluaXRXaXRoRmlyZURhdGU6bmlsIGludGVydmFsOkRlZmF1bHRX YXRjaGRvZ1RpbWVySW50ZXJ2YWwgdGFyZ2V0OnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKGV4aXRG dWxsU2NyZWVuKSB1c2VySW5mbzpuaWwgcmVwZWF0czpOT10pOworICAgICAgICBfd2F0Y2hkb2dU aW1lciA9IGFkb3B0TlMoW1tOU1RpbWVyIGFsbG9jXSBpbml0V2l0aEZpcmVEYXRlOltOU0RhdGUg ZGF0ZVdpdGhUaW1lSW50ZXJ2YWxTaW5jZU5vdzpEZWZhdWx0V2F0Y2hkb2dUaW1lckludGVydmFs XSBpbnRlcnZhbDowIHRhcmdldDpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2F0Y2hkb2dUaW1l ckZpcmVkOikgdXNlckluZm86bmlsIHJlcGVhdHM6Tk9dKTsKICAgICAgICAgW1tOU1J1bkxvb3Ag bWFpblJ1bkxvb3BdIGFkZFRpbWVyOl93YXRjaGRvZ1RpbWVyLmdldCgpIGZvck1vZGU6TlNEZWZh dWx0UnVuTG9vcE1vZGVdOwogICAgIH0KIH0KQEAgLTY3MSw2ICs2NzIsMTQgQEAgc3RhdGljIE5T UmVjdCB3aW5kb3dGcmFtZUZyb21BcHBhcmVudEZyYW1lcyhOU1JlY3Qgc2NyZWVuRnJhbWUsIE5T UmVjdCBpbml0aWFsRnIKICAgICBbW3NlbGYgd2luZG93XSBkaXNwbGF5SWZOZWVkZWRdOwogICAg IE5TRW5hYmxlU2NyZWVuVXBkYXRlcygpOwogfQorCistICh2b2lkKV93YXRjaGRvZ1RpbWVyRmly ZWQ6KE5TVGltZXIgKil0aW1lcgoreworICAgIEFTU0VSVF9BUkcodGltZXIsIHRpbWVyID09IF93 YXRjaGRvZ1RpbWVyKTsKKworICAgIFtzZWxmIGV4aXRGdWxsU2NyZWVuXTsKK30KKwogQGVuZAog CiAjZW5kaWYgLy8gRU5BQkxFKEZVTExTQ1JFRU5fQVBJKSAmJiAhUExBVEZPUk0oSU9TKQo=