148266 2015-08-20 16:45:26 -0700 Merge Lock and LockBase 2015-08-20 17:43:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified REOPENED P2 Normal --- 148272 1 andersca andersca benjamin cmarcelo commit-queue oldest_to_newest 1119450 0 andersca 2015-08-20 16:45:26 -0700 Merge Lock and LockBase 1119452 1 259524 andersca 2015-08-20 16:50:33 -0700 Created attachment 259524 Patch 1119453 2 259524 fpizlo 2015-08-20 16:51:16 -0700 Comment on attachment 259524 Patch Any reason you left out Condition? 1119461 3 andersca 2015-08-20 17:00:38 -0700 Committed r188717: <http://trac.webkit.org/changeset/188717> 1119497 4 commit-queue 2015-08-20 17:43:06 -0700 Re-opened since this is blocked by bug 148272 259524 2015-08-20 16:50:33 -0700 2015-08-20 16:51:16 -0700 Patch bug-148266-20150820165028.patch text/plain 4152 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE4MzNlZmFhOGQxODQ2NzJiZDhmZmYz YzRmODk4YTk5OWFmY2Y5ZWUuLjJiZGNjMzU4MmE4ZmM4ZGVkYWIxMzYzYzJjNmMxMDY5NDFhMjk2 Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTUtMDgtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBNZXJnZSBMb2NrIGFuZCBMb2NrQmFzZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MjY2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvQXRvbWlj cy5oOgorICAgICAgICAoV1RGOjpBdG9taWM6OkF0b21pYyk6CisgICAgICAgIEFkZCBhIGRlZmF1 bHQgY29uc3RydWN0b3IgYXMgd2VsbCBhcyBhIGNvbnN0ZXhwciBjb25zdHJ1Y3RvciB0aGF0IHRh a2VzIGEgdmFsdWUuCisKKyAgICAgICAgKiB3dGYvTG9jay5jcHA6CisgICAgICAgIChXVEY6Okxv Y2s6OmxvY2tTbG93KToKKyAgICAgICAgKFdURjo6TG9jazo6dW5sb2NrU2xvdyk6CisgICAgICAg IFJlbmFtZSBMb2NrQmFzZSB0byBMb2NrLgorCisgICAgICAgICogd3RmL0xvY2suaDoKKyAgICAg ICAgUmVuYW1lIExvY2tCYXNlIHRvIExvY2sgYW5kIGRpcmVjdC1pbml0aWFsaXplIEF0b21pYyB0 byAwLiBTaW5jZSB0aGUgQXRvbWljIGNvbnN0cnVjdG9yIGlzIGNvbnN0ZXhwciwKKyAgICAgICAg TG9jayBhbHNvIGdldHMgYSBjb25zdGV4cHIgY29uc3RydWN0b3IuIENoYW5nZSB0aGUgTG9ja0Jh c2UgLT4gU3RhdGljTG9jayB0eXBlZGVmIGFuZCBhZGQgYSBmaXhtZS4KKworICAgICAgICAqIHd0 Zi9Xb3JkTG9jay5oOgorICAgICAgICBEaXJlY3QgaW5pdGlhbGl6ZSBtX3dvcmQgdG8gMC4KKwog MjAxNS0wOC0xOSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIFJl bW92ZSBXVEY6OlNwaW5Mb2NrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9BdG9taWNzLmgg Yi9Tb3VyY2UvV1RGL3d0Zi9BdG9taWNzLmgKaW5kZXggM2UxZTMyNDM0ODZlODRkNDdhYWY5NmE1 MGQxZmE2ODc5ZTEyNjIzNS4uMDg3NDMxODlhMWExNjc3OTk0NDJlMzg1ZWFlZTc5M2M3ZDEwNzk4 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQXRvbWljcy5oCisrKyBiL1NvdXJjZS9XVEYv d3RmL0F0b21pY3MuaApAQCAtODEsNiArODEsMTIgQEAgbmFtZXNwYWNlIFdURiB7CiAKIHRlbXBs YXRlPHR5cGVuYW1lIFQ+CiBzdHJ1Y3QgQXRvbWljIHsKKyAgICBBdG9taWMoKSA9IGRlZmF1bHQ7 CisgICAgQ09OU1RFWFBSIEF0b21pYyhUIHZhbHVlKQorICAgICAgICA6IHZhbHVlKHZhbHVlKQor ICAgIHsKKyAgICB9CisKICAgICAvLyBEb24ndCBwYXNzIGEgbm9uLWRlZmF1bHQgdmFsdWUgZm9y IHRoZSBvcmRlciBwYXJhbWV0ZXIgdW5sZXNzIHlvdSByZWFsbHkga25vdwogICAgIC8vIHdoYXQg eW91IGFyZSBkb2luZyBhbmQgaGF2ZSB0aG91Z2h0IGFib3V0IGl0IHZlcnkgaGFyZC4gVGhlIGNv c3Qgb2Ygc2VxX2NzdAogICAgIC8vIGlzIHVzdWFsbHkgbm90IGhpZ2ggZW5vdWdoIHRvIGp1c3Rp ZnkgdGhlIHJpc2suCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Mb2NrLmNwcCBiL1NvdXJj ZS9XVEYvd3RmL0xvY2suY3BwCmluZGV4IGM4NDQyNzEzYTM2NDIzMmQ0ZDg1Mjk0YzE3YWNkYzUy MDE5NWRkOTUuLjM4ZTUxMWRkOGVhZDI0MzQzOTNlMjU3MjNiM2QyODBhNDgzNjcwNzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0xvY2suY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0xvY2su Y3BwCkBAIC0zNiw3ICszNiw3IEBAIG5hbWVzcGFjZSBXVEYgewogCiBzdGF0aWMgY29uc3QgYm9v bCB2ZXJib3NlID0gZmFsc2U7CiAKLXZvaWQgTG9ja0Jhc2U6OmxvY2tTbG93KCkKK3ZvaWQgTG9j azo6bG9ja1Nsb3coKQogewogICAgIHVuc2lnbmVkIHNwaW5Db3VudCA9IDA7CiAKQEAgLTc0LDcg Kzc0LDcgQEAgdm9pZCBMb2NrQmFzZTo6bG9ja1Nsb3coKQogICAgIH0KIH0KIAotdm9pZCBMb2Nr QmFzZTo6dW5sb2NrU2xvdygpCit2b2lkIExvY2s6OnVubG9ja1Nsb3coKQogewogICAgIC8vIFdl IGNvdWxkIGdldCBoZXJlIGJlY2F1c2UgdGhlIHdlYWsgQ0FTIGluIHVubG9jaygpIGZhaWxlZCBz cHVyaW91c2x5LCBvciBiZWNhdXNlIHRoZXJlIGlzCiAgICAgLy8gc29tZW9uZSBwYXJrZWQuIFNv LCB3ZSBuZWVkIGEgQ0FTIGxvb3A6IGV2ZW4gaWYgcmlnaHQgbm93IHRoZSBsb2NrIGlzIGp1c3Qg aGVsZCwgaXQgY291bGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xvY2suaCBiL1NvdXJj ZS9XVEYvd3RmL0xvY2suaAppbmRleCA4Mzk1NjUzZGMzYzlhMjA0YjA3MjM4MmRmY2IxOGRiODJj ZWNkOTBhLi5iMmM2OGY3ZjAxNDIwZWRjZGI2ODQxNzU3MjMxODE1OTE0M2NmODU1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV1RGL3d0Zi9Mb2NrLmgKKysrIGIvU291cmNlL1dURi93dGYvTG9jay5oCkBA IC00NSw3ICs0NSw3IEBAIG5hbWVzcGFjZSBXVEYgewogCiAvLyBUaGlzIGlzIGEgc3RydWN0IHdp dGhvdXQgYSBjb25zdHJ1Y3RvciBvciBkZXN0cnVjdG9yIHNvIHRoYXQgaXQgY2FuIGJlIHN0YXRp Y2FsbHkgaW5pdGlhbGl6ZWQuCiAvLyBVc2UgTG9jayBpbiBpbnN0YW5jZSB2YXJpYWJsZXMuCi1z dHJ1Y3QgTG9ja0Jhc2Ugeworc3RydWN0IExvY2sgewogICAgIHZvaWQgbG9jaygpCiAgICAgewog ICAgICAgICBpZiAoTElLRUxZKG1fYnl0ZS5jb21wYXJlRXhjaGFuZ2VXZWFrKDAsIGlzSGVsZEJp dCwgc3RkOjptZW1vcnlfb3JkZXJfYWNxdWlyZSkpKSB7CkBAIC0xMDgsMjAgKzEwOCwxMyBAQCBw cm90ZWN0ZWQ6CiAgICAgICAgIHJldHVybiAhbV9ieXRlLmxvYWQoKTsKICAgICB9CiAKLSAgICBB dG9taWM8dWludDhfdD4gbV9ieXRlOworICAgIEF0b21pYzx1aW50OF90PiBtX2J5dGUgeyAwIH07 CiB9OwogCi1jbGFzcyBMb2NrIDogcHVibGljIExvY2tCYXNlIHsKLSAgICBXVEZfTUFLRV9OT05D T1BZQUJMRShMb2NrKTsKLXB1YmxpYzoKLSAgICBMb2NrKCkKLSAgICB7Ci0gICAgICAgIG1fYnl0 ZS5zdG9yZSgwLCBzdGQ6Om1lbW9yeV9vcmRlcl9yZWxheGVkKTsKLSAgICB9Ci19OwordHlwZWRl ZiBMb2NrZXI8TG9jaz4gTG9ja0hvbGRlcjsKIAotdHlwZWRlZiBMb2NrQmFzZSBTdGF0aWNMb2Nr OwotdHlwZWRlZiBMb2NrZXI8TG9ja0Jhc2U+IExvY2tIb2xkZXI7CisvLyBGSVhNRTogT25jZSBh bGwgY2xpZW50cyBoYXZlIGJlZW4gbW92ZWQgZnJvbSBTdGF0aWNMb2NrIHRvIExvY2sgd2UgY2Fu IGdldCByaWQgb2YgdGhpcyB0eXBlZGVmLgordHlwZWRlZiBMb2NrIFN0YXRpY0xvY2s7CiAKIH0g Ly8gbmFtZXNwYWNlIFdURgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Xb3JkTG9jay5o IGIvU291cmNlL1dURi93dGYvV29yZExvY2suaAppbmRleCBjN2UyMDhiMGFjNWU2ZjNmZDRjNzcz YzZhNWU0Mzg2OWJkNDgzOWVjLi5lYTVmNTQ1MmM0YTIzNjAxNWM2Mjc4MzlmM2IxNjM4MDJkZGZh NzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Xb3JkTG9jay5oCisrKyBiL1NvdXJjZS9X VEYvd3RmL1dvcmRMb2NrLmgKQEAgLTQ1LDEwICs0NSw3IEBAIG5hbWVzcGFjZSBXVEYgewogY2xh c3MgV29yZExvY2sgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFdvcmRMb2NrKTsKIHB1Ymxp YzoKLSAgICBXb3JkTG9jaygpCi0gICAgewotICAgICAgICBtX3dvcmQuc3RvcmUoMCwgc3RkOjpt ZW1vcnlfb3JkZXJfcmVsYXhlZCk7Ci0gICAgfQorICAgIENPTlNURVhQUiBXb3JkTG9jaygpID0g ZGVmYXVsdDsKIAogICAgIHZvaWQgbG9jaygpCiAgICAgewpAQCAtOTYsNyArOTMsNyBAQCBwcml2 YXRlOgogICAgICAgICByZXR1cm4gIW1fd29yZC5sb2FkKCk7CiAgICAgfQogCi0gICAgQXRvbWlj PHVpbnRwdHJfdD4gbV93b3JkOworICAgIEF0b21pYzx1aW50cHRyX3Q+IG1fd29yZCB7IDAgfTsK IH07CiAKIHR5cGVkZWYgTG9ja2VyPFdvcmRMb2NrPiBXb3JkTG9ja0hvbGRlcjsK