127946 2014-01-30 13:39:43 -0800 [iOS] Convert blocks to lambdas in iOS Full Screen code. 2014-01-30 14:54:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn philipj oldest_to_newest 973976 0 jer.noble 2014-01-30 13:39:43 -0800 [iOS] Convert blocks to lambdas in iOS Full Screen code. 973984 1 222729 jer.noble 2014-01-30 13:49:31 -0800 Created attachment 222729 Patch 973985 2 222730 jer.noble 2014-01-30 13:52:14 -0800 Created attachment 222730 Patch 974028 3 222730 commit-queue 2014-01-30 14:54:08 -0800 Comment on attachment 222730 Patch Clearing flags on attachment: 222730 Committed r163118: <http://trac.webkit.org/changeset/163118> 974029 4 commit-queue 2014-01-30 14:54:10 -0800 All reviewed patches have been landed. Closing bug. 222729 2014-01-30 13:49:31 -0800 2014-01-30 13:52:12 -0800 Patch bug-127946-20140130134931.patch text/plain 7706 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJiZjYzMjdlYjYyZGJi NTAxMzRjNDFjYTk0MTBjYTYyMDcyNzZhOC4uMjAzZmYzNzI1YzQ0ZjVlNWQ1NmZhZDFmMDNiZjE5 ZmY4MTFiY2RkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE0LTAxLTMwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtpT1NdIENvbnZlcnQgYmxv Y2tzIHRvIGxhbWJkYXMgaW4gaU9TIEZ1bGxzY3JlZW4gY29kZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzk0NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFB1c2hpbmcgYSBibG9jayBpbnRvIGEgc3Rk OjpmdW5jdGlvbiB3aWxsIGV2ZW50dWFsbHkgY2F1c2UgYSBjcmFzaCwgc2luY2Ugc3RkOjpmdW5j dGlvbgorICAgICAgICBkb2VzIG5vdCBrbm93IGFib3V0IEJsb2NrX2NvcHkgYW5kIEJsb2NrX3Jl bGVhc2UuCisKKyAgICAgICAgTGFtZGFzIGNhbiBiZSBpbnRyaW5zaWNseSBjb252ZXJ0ZWQgdG8g YmxvY2tzLCBidXQgbm90IHZpY2UgdmVyc2EuIFN3aXRjaCBvdmVyIGFsbCB0aGUKKyAgICAgICAg YmxhY2tzIGluIHRoZSBuZXcgaU9TIEZ1bGxzY3JlZW4gY29kZSB0byB1c2UgbGFtZGFzLCBhbmQg dXNlIHRoZSByZWYtY291bnRlZCB0aGlzIG9iamVjdAorICAgICAgICBkaXJlY3RseSByYXRoZXIg dGhhbiBpbXBsaWNpdGx5LgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkNvbnRyb2xsZXJBVktpdC5tbToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlciBleGl0RnVsbHNjcmVlbl0pOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0OjpzZXRWaWRlb0xheWVyKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW4pOgorICAgICAgICAoV2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKToKKworMjAxNC0wMS0zMCAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKwogICAgICAgICBbTWVkaWFDb250cm9s c11baU9TXSBGaXggYSBjb3VwbGUgb2YgVUkgYnVncyBpbiB0aGUgaU9TIE1lZGlhIENvbnRyb2xz CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc5MjkK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkNvbnRyb2xsZXJBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyQVZLaXQubW0KaW5kZXggMDE0Yzk0MGIyZmJiNjc2MGM4 MDFjYzJhYTc2NjcxNDg3MzBmYjFmZi4uZmUxMzlhYjU5MzFiOTIxNDMwNjVkZDcxMDU3ZGZhMWZk Yjk1MzZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXJBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckFWS2l0Lm1tCkBAIC04MCwxNiArODAs MTUgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIC0gKHZvaWQpZXhpdEZ1bGxzY3JlZW4K IHsKLSAgICBfX2Jsb2NrIFJldGFpblB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyPiBw cm90ZWN0e3NlbGZ9OworICAgIFJldGFpblB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVy PiBzdHJvbmdTZWxmKHNlbGYpOwogICAgIAotICAgIF9pbnRlcmZhY2UtPmV4aXRGdWxsc2NyZWVu KF57Ci0gICAgICAgIFdlYlRocmVhZFJ1biheewotICAgICAgICAgICAgX21vZGVsLT5zZXRNZWRp YUVsZW1lbnQobnVsbHB0cik7Ci0gICAgICAgICAgICBfaW50ZXJmYWNlLT5zZXRXZWJWaWRlb0Z1 bGxzY3JlZW5Nb2RlbChudWxscHRyKTsKLSAgICAgICAgICAgIF9tb2RlbC0+c2V0V2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlKG51bGxwdHIpOwotICAgICAgICAgICAgX21vZGVsID0gbnVsbHB0 cjsKLSAgICAgICAgICAgIF9pbnRlcmZhY2UgPSBudWxscHRyOwotICAgICAgICAgICAgcHJvdGVj dC5jbGVhcigpOworICAgIF9pbnRlcmZhY2UtPmV4aXRGdWxsc2NyZWVuKFtzdHJvbmdTZWxmXXsK KyAgICAgICAgV2ViVGhyZWFkUnVuKFtzdHJvbmdTZWxmXXsKKyAgICAgICAgICAgIHN0cm9uZ1Nl bGYtPl9tb2RlbC0+c2V0TWVkaWFFbGVtZW50KG51bGxwdHIpOworICAgICAgICAgICAgc3Ryb25n U2VsZi0+X2ludGVyZmFjZS0+c2V0V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwobnVsbHB0cik7Cisg ICAgICAgICAgICBzdHJvbmdTZWxmLT5fbW9kZWwtPnNldFdlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZShudWxscHRyKTsKKyAgICAgICAgICAgIHN0cm9uZ1NlbGYtPl9tb2RlbCA9IG51bGxwdHI7 CisgICAgICAgICAgICBzdHJvbmdTZWxmLT5faW50ZXJmYWNlID0gbnVsbHB0cjsKICAgICAgICAg fSk7CiAgICAgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggNjUyZmJl Y2QwZjVjZDBhYTc3ZGRlNDcyMTllZDk0MDgxYTk2ZTk0Ny4uOGVjOWQ0NTYzOTUxZTM3OTk3NTI5 YTUzZTdjYzRjYmRkZjQ3NzljMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAt MjY3LDYzICsyNjcsNjQgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 c2V0VmlkZW9MYXllcihQbGF0Zm9ybUxheWVyKiB2aWRlb0xheWVyKQogewogICAgIFttX3BsYXll ckNvbnRyb2xsZXIuZ2V0KCkucGxheWVyTGF5ZXIgcmVtb3ZlRnJvbVN1cGVybGF5ZXJdOwogICAg IFt2aWRlb0xheWVyIHJlbW92ZUZyb21TdXBlcmxheWVyXTsKLSAgICBBU1NFUlQoW3ZpZGVvTGF5 ZXIgaXNLaW5kT2ZDbGFzczpbY2xhc3NBVlBsYXllckxheWVyIGNsYXNzXV0KKyAgICBBU1NFUlQo IXZpZGVvTGF5ZXIKKyAgICAgICAgfHwgW3ZpZGVvTGF5ZXIgaXNLaW5kT2ZDbGFzczpbY2xhc3NB VlBsYXllckxheWVyIGNsYXNzXV0KICAgICAgICAgfHwgKFt2aWRlb0xheWVyIGlzS2luZE9mQ2xh c3M6W0NBTGF5ZXIgY2xhc3NdXSAmJiBbdmlkZW9MYXllciBjb25mb3Jtc1RvUHJvdG9jb2w6QHBy b3RvY29sKEFWUGxheWVyTGF5ZXIpXSkpOwogICAgIG1fcGxheWVyQ29udHJvbGxlci5nZXQoKS5w bGF5ZXJMYXllciA9IChDQUxheWVyPEFWUGxheWVyTGF5ZXI+Kil2aWRlb0xheWVyOwogfQogCiB2 b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW4oc3Rk OjpmdW5jdGlvbjx2b2lkKCk+IGNvbXBsZXRpb24pCiB7Ci0gICAgX19ibG9jayBSZWZQdHI8V2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ+IHByb3RlY3QodGhpcyk7CisgICAgUmVmUHRy PFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0PiBzdHJvbmdUaGlzKHRoaXMpOwogICAg IAotICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57Ci0gICAg ICAgIG1fcGxheWVyVmlld0NvbnRyb2xsZXIgPSBbW1tjbGFzc0FWUGxheWVyVmlld0NvbnRyb2xs ZXIgYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKLSAgICAgICAgbV9wbGF5ZXJWaWV3Q29udHJv bGxlci5nZXQoKS5wbGF5ZXJDb250cm9sbGVyID0gKEFWUGxheWVyQ29udHJvbGxlciAqKW1fcGxh eWVyQ29udHJvbGxlci5nZXQoKTsKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFp bl9xdWV1ZSgpLCBbc3Ryb25nVGhpcywgY29tcGxldGlvbl17CisgICAgICAgIHN0cm9uZ1RoaXMt Pm1fcGxheWVyVmlld0NvbnRyb2xsZXIgPSBbW1tjbGFzc0FWUGxheWVyVmlld0NvbnRyb2xsZXIg YWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgc3Ryb25nVGhpcy0+bV9wbGF5ZXJW aWV3Q29udHJvbGxlci5nZXQoKS5wbGF5ZXJDb250cm9sbGVyID0gKEFWUGxheWVyQ29udHJvbGxl ciAqKXN0cm9uZ1RoaXMtPm1fcGxheWVyQ29udHJvbGxlci5nZXQoKTsKICAgICAgICAgCi0gICAg ICAgIGlmIChbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKHNldERlbGVnYXRlOildKQotICAgICAgICAgICAgbV9wbGF5ZXJWaWV3Q29udHJvbGxlci5n ZXQoKS5kZWxlZ2F0ZSA9IG1fcGxheWVyQ29udHJvbGxlci5nZXQoKTsKKyAgICAgICAgaWYgKFtz dHJvbmdUaGlzLT5tX3BsYXllclZpZXdDb250cm9sbGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3Ioc2V0RGVsZWdhdGU6KV0pCisgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX3BsYXllclZp ZXdDb250cm9sbGVyLmdldCgpLmRlbGVnYXRlID0gc3Ryb25nVGhpcy0+bV9wbGF5ZXJDb250cm9s bGVyLmdldCgpOwogICAgICAgICAKLSAgICAgICAgbV92aWV3Q29udHJvbGxlciA9IGFkb3B0TlMo W1tjbGFzc1VJVmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgc3Ryb25nVGhp cy0+bV92aWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tjbGFzc1VJVmlld0NvbnRyb2xsZXIgYWxs b2NdIGluaXRdKTsKICAgICAgICAgCi0gICAgICAgIG1fd2luZG93ID0gW1tbY2xhc3NVSVdpbmRv dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpbW2NsYXNzVUlTY3JlZW4gbWFpblNjcmVlbl0gYm91bmRz XV0gYXV0b3JlbGVhc2VdOwotICAgICAgICBtX3dpbmRvdy5nZXQoKS5iYWNrZ3JvdW5kQ29sb3Ig PSBbY2xhc3NVSUNvbG9yIGNsZWFyQ29sb3JdOwotICAgICAgICBtX3dpbmRvdy5nZXQoKS5yb290 Vmlld0NvbnRyb2xsZXIgPSBtX3ZpZXdDb250cm9sbGVyLmdldCgpOwotICAgICAgICBbbV93aW5k b3cgbWFrZUtleUFuZFZpc2libGVdOworICAgICAgICBzdHJvbmdUaGlzLT5tX3dpbmRvdyA9IFtb W2NsYXNzVUlXaW5kb3cgYWxsb2NdIGluaXRXaXRoRnJhbWU6W1tjbGFzc1VJU2NyZWVuIG1haW5T Y3JlZW5dIGJvdW5kc11dIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgc3Ryb25nVGhpcy0+bV93aW5k b3cuZ2V0KCkuYmFja2dyb3VuZENvbG9yID0gW2NsYXNzVUlDb2xvciBjbGVhckNvbG9yXTsKKyAg ICAgICAgc3Ryb25nVGhpcy0+bV93aW5kb3cuZ2V0KCkucm9vdFZpZXdDb250cm9sbGVyID0gc3Ry b25nVGhpcy0+bV92aWV3Q29udHJvbGxlci5nZXQoKTsKKyAgICAgICAgW3N0cm9uZ1RoaXMtPm1f d2luZG93IG1ha2VLZXlBbmRWaXNpYmxlXTsKICAgICAgICAgCi0gICAgICAgIFttX3ZpZXdDb250 cm9sbGVyIHByZXNlbnRWaWV3Q29udHJvbGxlcjptX3BsYXllclZpZXdDb250cm9sbGVyLmdldCgp IGFuaW1hdGVkOllFUyBjb21wbGV0aW9uOm5pbF07Ci0gICAgICAgIGNvbXBsZXRpb24oKTsKLSAg ICAgICAgcHJvdGVjdC5jbGVhcigpOworICAgICAgICBbc3Ryb25nVGhpcy0+bV92aWV3Q29udHJv bGxlciBwcmVzZW50Vmlld0NvbnRyb2xsZXI6c3Ryb25nVGhpcy0+bV9wbGF5ZXJWaWV3Q29udHJv bGxlci5nZXQoKSBhbmltYXRlZDpZRVMgY29tcGxldGlvbjpuaWxdOworICAgICAgICBpZiAoY29t cGxldGlvbikKKyAgICAgICAgICAgIGNvbXBsZXRpb24oKTsKICAgICB9KTsKIH0KIAogdm9pZCBX ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZW50ZXJGdWxsc2NyZWVuKCkKIHsKLSAg ICBlbnRlckZ1bGxzY3JlZW4oXnsgfSk7CisgICAgZW50ZXJGdWxsc2NyZWVuKG51bGxwdHIpOwog fQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVl bihzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gY29tcGxldGlvbikKIHsKICAgICBtX3BsYXllckNvbnRy b2xsZXIuY2xlYXIoKTsKLSAgICBfX2Jsb2NrIFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdD4gcHJvdGVjdCh0aGlzKTsKKyAgICBSZWZQdHI8V2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ+IHN0cm9uZ1RoaXModGhpcyk7CiAgICAgCi0gICAgZGlzcGF0Y2hfYXN5 bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAgICAgICAgW21fdmlld0NvbnRyb2xs ZXIgZGlzbWlzc1ZpZXdDb250cm9sbGVyQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb246XnsKLSAgICAg ICAgICAgIG1fd2luZG93LmdldCgpLmhpZGRlbiA9IFlFUzsKLSAgICAgICAgICAgIG1fd2luZG93 LmdldCgpLnJvb3RWaWV3Q29udHJvbGxlciA9IG5pbDsKLSAgICAgICAgICAgIG1fcGxheWVyVmll d0NvbnRyb2xsZXIgPSBuaWw7Ci0gICAgICAgICAgICBtX3ZpZXdDb250cm9sbGVyID0gbmlsOwot ICAgICAgICAgICAgbV93aW5kb3cgPSBuaWw7Ci0gICAgICAgICAgICBpZiAobV92aWRlb0Z1bGxz Y3JlZW5Nb2RlbCkKLSAgICAgICAgICAgICAgICBtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsLT5kaWRF eGl0RnVsbHNjcmVlbigpOwotICAgICAgICAgICAgY29tcGxldGlvbigpOwotICAgICAgICAgICAg cHJvdGVjdC5jbGVhcigpOworICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1 ZXVlKCksIFtzdHJvbmdUaGlzLCBjb21wbGV0aW9uXXsKKyAgICAgICAgW3N0cm9uZ1RoaXMtPm1f dmlld0NvbnRyb2xsZXIgZGlzbWlzc1ZpZXdDb250cm9sbGVyQW5pbWF0ZWQ6WUVTIGNvbXBsZXRp b246W3N0cm9uZ1RoaXMsIGNvbXBsZXRpb25deworICAgICAgICAgICAgc3Ryb25nVGhpcy0+bV93 aW5kb3cuZ2V0KCkuaGlkZGVuID0gWUVTOworICAgICAgICAgICAgc3Ryb25nVGhpcy0+bV93aW5k b3cuZ2V0KCkucm9vdFZpZXdDb250cm9sbGVyID0gbmlsOworICAgICAgICAgICAgc3Ryb25nVGhp cy0+bV9wbGF5ZXJWaWV3Q29udHJvbGxlciA9IG5pbDsKKyAgICAgICAgICAgIHN0cm9uZ1RoaXMt Pm1fdmlld0NvbnRyb2xsZXIgPSBuaWw7CisgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX3dpbmRv dyA9IG5pbDsKKyAgICAgICAgICAgIGlmIChzdHJvbmdUaGlzLT5tX3ZpZGVvRnVsbHNjcmVlbk1v ZGVsKQorICAgICAgICAgICAgICAgIHN0cm9uZ1RoaXMtPm1fdmlkZW9GdWxsc2NyZWVuTW9kZWwt PmRpZEV4aXRGdWxsc2NyZWVuKCk7CisgICAgICAgICAgICBpZiAoY29tcGxldGlvbikKKyAgICAg ICAgICAgICAgICBjb21wbGV0aW9uKCk7CiAgICAgICAgIH1dOwogICAgIH0pOwogfQogCiB2b2lk IFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVlbigpCiB7Ci0g ICAgZXhpdEZ1bGxzY3JlZW4oXnsgfSk7CisgICAgZXhpdEZ1bGxzY3JlZW4obnVsbHB0cik7CiB9 CiAKICNlbmRpZgo= 222730 2014-01-30 13:52:14 -0800 2014-01-30 14:54:08 -0800 Patch bug-127946-20140130135213.patch text/plain 7706 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJiZjYzMjdlYjYyZGJi NTAxMzRjNDFjYTk0MTBjYTYyMDcyNzZhOC4uMjc0MGE4NWQ0MjU1YjkzZTIzZTI4YzlkNDAzYjQ1 ZWU0NWI1YzgyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE0LTAxLTMwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtpT1NdIENvbnZlcnQgYmxv Y2tzIHRvIGxhbWJkYXMgaW4gaU9TIEZ1bGxzY3JlZW4gY29kZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzk0NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFB1c2hpbmcgYSBibG9jayBpbnRvIGEgc3Rk OjpmdW5jdGlvbiB3aWxsIGV2ZW50dWFsbHkgY2F1c2UgYSBjcmFzaCwgc2luY2Ugc3RkOjpmdW5j dGlvbgorICAgICAgICBkb2VzIG5vdCBrbm93IGFib3V0IEJsb2NrX2NvcHkgYW5kIEJsb2NrX3Jl bGVhc2UuCisKKyAgICAgICAgTGFtZGFzIGNhbiBiZSBpbnRyaW5zaWNseSBjb252ZXJ0ZWQgdG8g YmxvY2tzLCBidXQgbm90IHZpY2UgdmVyc2EuIFN3aXRjaCBvdmVyIGFsbCB0aGUKKyAgICAgICAg YmxvY2tzIGluIHRoZSBuZXcgaU9TIEZ1bGxzY3JlZW4gY29kZSB0byB1c2UgbGFtZGFzLCBhbmQg dXNlIHRoZSByZWYtY291bnRlZCB0aGlzIG9iamVjdAorICAgICAgICBkaXJlY3RseSByYXRoZXIg dGhhbiBpbXBsaWNpdGx5LgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkNvbnRyb2xsZXJBVktpdC5tbToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlciBleGl0RnVsbHNjcmVlbl0pOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0OjpzZXRWaWRlb0xheWVyKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW4pOgorICAgICAgICAoV2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKToKKworMjAxNC0wMS0zMCAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKwogICAgICAgICBbTWVkaWFDb250cm9s c11baU9TXSBGaXggYSBjb3VwbGUgb2YgVUkgYnVncyBpbiB0aGUgaU9TIE1lZGlhIENvbnRyb2xz CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc5MjkK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkNvbnRyb2xsZXJBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyQVZLaXQubW0KaW5kZXggMDE0Yzk0MGIyZmJiNjc2MGM4 MDFjYzJhYTc2NjcxNDg3MzBmYjFmZi4uZmUxMzlhYjU5MzFiOTIxNDMwNjVkZDcxMDU3ZGZhMWZk Yjk1MzZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXJBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckFWS2l0Lm1tCkBAIC04MCwxNiArODAs MTUgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIC0gKHZvaWQpZXhpdEZ1bGxzY3JlZW4K IHsKLSAgICBfX2Jsb2NrIFJldGFpblB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyPiBw cm90ZWN0e3NlbGZ9OworICAgIFJldGFpblB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVy PiBzdHJvbmdTZWxmKHNlbGYpOwogICAgIAotICAgIF9pbnRlcmZhY2UtPmV4aXRGdWxsc2NyZWVu KF57Ci0gICAgICAgIFdlYlRocmVhZFJ1biheewotICAgICAgICAgICAgX21vZGVsLT5zZXRNZWRp YUVsZW1lbnQobnVsbHB0cik7Ci0gICAgICAgICAgICBfaW50ZXJmYWNlLT5zZXRXZWJWaWRlb0Z1 bGxzY3JlZW5Nb2RlbChudWxscHRyKTsKLSAgICAgICAgICAgIF9tb2RlbC0+c2V0V2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlKG51bGxwdHIpOwotICAgICAgICAgICAgX21vZGVsID0gbnVsbHB0 cjsKLSAgICAgICAgICAgIF9pbnRlcmZhY2UgPSBudWxscHRyOwotICAgICAgICAgICAgcHJvdGVj dC5jbGVhcigpOworICAgIF9pbnRlcmZhY2UtPmV4aXRGdWxsc2NyZWVuKFtzdHJvbmdTZWxmXXsK KyAgICAgICAgV2ViVGhyZWFkUnVuKFtzdHJvbmdTZWxmXXsKKyAgICAgICAgICAgIHN0cm9uZ1Nl bGYtPl9tb2RlbC0+c2V0TWVkaWFFbGVtZW50KG51bGxwdHIpOworICAgICAgICAgICAgc3Ryb25n U2VsZi0+X2ludGVyZmFjZS0+c2V0V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwobnVsbHB0cik7Cisg ICAgICAgICAgICBzdHJvbmdTZWxmLT5fbW9kZWwtPnNldFdlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZShudWxscHRyKTsKKyAgICAgICAgICAgIHN0cm9uZ1NlbGYtPl9tb2RlbCA9IG51bGxwdHI7 CisgICAgICAgICAgICBzdHJvbmdTZWxmLT5faW50ZXJmYWNlID0gbnVsbHB0cjsKICAgICAgICAg fSk7CiAgICAgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggNjUyZmJl Y2QwZjVjZDBhYTc3ZGRlNDcyMTllZDk0MDgxYTk2ZTk0Ny4uOGVjOWQ0NTYzOTUxZTM3OTk3NTI5 YTUzZTdjYzRjYmRkZjQ3NzljMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAt MjY3LDYzICsyNjcsNjQgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 c2V0VmlkZW9MYXllcihQbGF0Zm9ybUxheWVyKiB2aWRlb0xheWVyKQogewogICAgIFttX3BsYXll ckNvbnRyb2xsZXIuZ2V0KCkucGxheWVyTGF5ZXIgcmVtb3ZlRnJvbVN1cGVybGF5ZXJdOwogICAg IFt2aWRlb0xheWVyIHJlbW92ZUZyb21TdXBlcmxheWVyXTsKLSAgICBBU1NFUlQoW3ZpZGVvTGF5 ZXIgaXNLaW5kT2ZDbGFzczpbY2xhc3NBVlBsYXllckxheWVyIGNsYXNzXV0KKyAgICBBU1NFUlQo IXZpZGVvTGF5ZXIKKyAgICAgICAgfHwgW3ZpZGVvTGF5ZXIgaXNLaW5kT2ZDbGFzczpbY2xhc3NB VlBsYXllckxheWVyIGNsYXNzXV0KICAgICAgICAgfHwgKFt2aWRlb0xheWVyIGlzS2luZE9mQ2xh c3M6W0NBTGF5ZXIgY2xhc3NdXSAmJiBbdmlkZW9MYXllciBjb25mb3Jtc1RvUHJvdG9jb2w6QHBy b3RvY29sKEFWUGxheWVyTGF5ZXIpXSkpOwogICAgIG1fcGxheWVyQ29udHJvbGxlci5nZXQoKS5w bGF5ZXJMYXllciA9IChDQUxheWVyPEFWUGxheWVyTGF5ZXI+Kil2aWRlb0xheWVyOwogfQogCiB2 b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW4oc3Rk OjpmdW5jdGlvbjx2b2lkKCk+IGNvbXBsZXRpb24pCiB7Ci0gICAgX19ibG9jayBSZWZQdHI8V2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ+IHByb3RlY3QodGhpcyk7CisgICAgUmVmUHRy PFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0PiBzdHJvbmdUaGlzKHRoaXMpOwogICAg IAotICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57Ci0gICAg ICAgIG1fcGxheWVyVmlld0NvbnRyb2xsZXIgPSBbW1tjbGFzc0FWUGxheWVyVmlld0NvbnRyb2xs ZXIgYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKLSAgICAgICAgbV9wbGF5ZXJWaWV3Q29udHJv bGxlci5nZXQoKS5wbGF5ZXJDb250cm9sbGVyID0gKEFWUGxheWVyQ29udHJvbGxlciAqKW1fcGxh eWVyQ29udHJvbGxlci5nZXQoKTsKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFp bl9xdWV1ZSgpLCBbc3Ryb25nVGhpcywgY29tcGxldGlvbl17CisgICAgICAgIHN0cm9uZ1RoaXMt Pm1fcGxheWVyVmlld0NvbnRyb2xsZXIgPSBbW1tjbGFzc0FWUGxheWVyVmlld0NvbnRyb2xsZXIg YWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgc3Ryb25nVGhpcy0+bV9wbGF5ZXJW aWV3Q29udHJvbGxlci5nZXQoKS5wbGF5ZXJDb250cm9sbGVyID0gKEFWUGxheWVyQ29udHJvbGxl ciAqKXN0cm9uZ1RoaXMtPm1fcGxheWVyQ29udHJvbGxlci5nZXQoKTsKICAgICAgICAgCi0gICAg ICAgIGlmIChbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKHNldERlbGVnYXRlOildKQotICAgICAgICAgICAgbV9wbGF5ZXJWaWV3Q29udHJvbGxlci5n ZXQoKS5kZWxlZ2F0ZSA9IG1fcGxheWVyQ29udHJvbGxlci5nZXQoKTsKKyAgICAgICAgaWYgKFtz dHJvbmdUaGlzLT5tX3BsYXllclZpZXdDb250cm9sbGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3Ioc2V0RGVsZWdhdGU6KV0pCisgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX3BsYXllclZp ZXdDb250cm9sbGVyLmdldCgpLmRlbGVnYXRlID0gc3Ryb25nVGhpcy0+bV9wbGF5ZXJDb250cm9s bGVyLmdldCgpOwogICAgICAgICAKLSAgICAgICAgbV92aWV3Q29udHJvbGxlciA9IGFkb3B0TlMo W1tjbGFzc1VJVmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgc3Ryb25nVGhp cy0+bV92aWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tjbGFzc1VJVmlld0NvbnRyb2xsZXIgYWxs b2NdIGluaXRdKTsKICAgICAgICAgCi0gICAgICAgIG1fd2luZG93ID0gW1tbY2xhc3NVSVdpbmRv dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpbW2NsYXNzVUlTY3JlZW4gbWFpblNjcmVlbl0gYm91bmRz XV0gYXV0b3JlbGVhc2VdOwotICAgICAgICBtX3dpbmRvdy5nZXQoKS5iYWNrZ3JvdW5kQ29sb3Ig PSBbY2xhc3NVSUNvbG9yIGNsZWFyQ29sb3JdOwotICAgICAgICBtX3dpbmRvdy5nZXQoKS5yb290 Vmlld0NvbnRyb2xsZXIgPSBtX3ZpZXdDb250cm9sbGVyLmdldCgpOwotICAgICAgICBbbV93aW5k b3cgbWFrZUtleUFuZFZpc2libGVdOworICAgICAgICBzdHJvbmdUaGlzLT5tX3dpbmRvdyA9IFtb W2NsYXNzVUlXaW5kb3cgYWxsb2NdIGluaXRXaXRoRnJhbWU6W1tjbGFzc1VJU2NyZWVuIG1haW5T Y3JlZW5dIGJvdW5kc11dIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgc3Ryb25nVGhpcy0+bV93aW5k b3cuZ2V0KCkuYmFja2dyb3VuZENvbG9yID0gW2NsYXNzVUlDb2xvciBjbGVhckNvbG9yXTsKKyAg ICAgICAgc3Ryb25nVGhpcy0+bV93aW5kb3cuZ2V0KCkucm9vdFZpZXdDb250cm9sbGVyID0gc3Ry b25nVGhpcy0+bV92aWV3Q29udHJvbGxlci5nZXQoKTsKKyAgICAgICAgW3N0cm9uZ1RoaXMtPm1f d2luZG93IG1ha2VLZXlBbmRWaXNpYmxlXTsKICAgICAgICAgCi0gICAgICAgIFttX3ZpZXdDb250 cm9sbGVyIHByZXNlbnRWaWV3Q29udHJvbGxlcjptX3BsYXllclZpZXdDb250cm9sbGVyLmdldCgp IGFuaW1hdGVkOllFUyBjb21wbGV0aW9uOm5pbF07Ci0gICAgICAgIGNvbXBsZXRpb24oKTsKLSAg ICAgICAgcHJvdGVjdC5jbGVhcigpOworICAgICAgICBbc3Ryb25nVGhpcy0+bV92aWV3Q29udHJv bGxlciBwcmVzZW50Vmlld0NvbnRyb2xsZXI6c3Ryb25nVGhpcy0+bV9wbGF5ZXJWaWV3Q29udHJv bGxlci5nZXQoKSBhbmltYXRlZDpZRVMgY29tcGxldGlvbjpuaWxdOworICAgICAgICBpZiAoY29t cGxldGlvbikKKyAgICAgICAgICAgIGNvbXBsZXRpb24oKTsKICAgICB9KTsKIH0KIAogdm9pZCBX ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZW50ZXJGdWxsc2NyZWVuKCkKIHsKLSAg ICBlbnRlckZ1bGxzY3JlZW4oXnsgfSk7CisgICAgZW50ZXJGdWxsc2NyZWVuKG51bGxwdHIpOwog fQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVl bihzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gY29tcGxldGlvbikKIHsKICAgICBtX3BsYXllckNvbnRy b2xsZXIuY2xlYXIoKTsKLSAgICBfX2Jsb2NrIFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdD4gcHJvdGVjdCh0aGlzKTsKKyAgICBSZWZQdHI8V2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ+IHN0cm9uZ1RoaXModGhpcyk7CiAgICAgCi0gICAgZGlzcGF0Y2hfYXN5 bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAgICAgICAgW21fdmlld0NvbnRyb2xs ZXIgZGlzbWlzc1ZpZXdDb250cm9sbGVyQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb246XnsKLSAgICAg ICAgICAgIG1fd2luZG93LmdldCgpLmhpZGRlbiA9IFlFUzsKLSAgICAgICAgICAgIG1fd2luZG93 LmdldCgpLnJvb3RWaWV3Q29udHJvbGxlciA9IG5pbDsKLSAgICAgICAgICAgIG1fcGxheWVyVmll d0NvbnRyb2xsZXIgPSBuaWw7Ci0gICAgICAgICAgICBtX3ZpZXdDb250cm9sbGVyID0gbmlsOwot ICAgICAgICAgICAgbV93aW5kb3cgPSBuaWw7Ci0gICAgICAgICAgICBpZiAobV92aWRlb0Z1bGxz Y3JlZW5Nb2RlbCkKLSAgICAgICAgICAgICAgICBtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsLT5kaWRF eGl0RnVsbHNjcmVlbigpOwotICAgICAgICAgICAgY29tcGxldGlvbigpOwotICAgICAgICAgICAg cHJvdGVjdC5jbGVhcigpOworICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1 ZXVlKCksIFtzdHJvbmdUaGlzLCBjb21wbGV0aW9uXXsKKyAgICAgICAgW3N0cm9uZ1RoaXMtPm1f dmlld0NvbnRyb2xsZXIgZGlzbWlzc1ZpZXdDb250cm9sbGVyQW5pbWF0ZWQ6WUVTIGNvbXBsZXRp b246W3N0cm9uZ1RoaXMsIGNvbXBsZXRpb25deworICAgICAgICAgICAgc3Ryb25nVGhpcy0+bV93 aW5kb3cuZ2V0KCkuaGlkZGVuID0gWUVTOworICAgICAgICAgICAgc3Ryb25nVGhpcy0+bV93aW5k b3cuZ2V0KCkucm9vdFZpZXdDb250cm9sbGVyID0gbmlsOworICAgICAgICAgICAgc3Ryb25nVGhp cy0+bV9wbGF5ZXJWaWV3Q29udHJvbGxlciA9IG5pbDsKKyAgICAgICAgICAgIHN0cm9uZ1RoaXMt Pm1fdmlld0NvbnRyb2xsZXIgPSBuaWw7CisgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX3dpbmRv dyA9IG5pbDsKKyAgICAgICAgICAgIGlmIChzdHJvbmdUaGlzLT5tX3ZpZGVvRnVsbHNjcmVlbk1v ZGVsKQorICAgICAgICAgICAgICAgIHN0cm9uZ1RoaXMtPm1fdmlkZW9GdWxsc2NyZWVuTW9kZWwt PmRpZEV4aXRGdWxsc2NyZWVuKCk7CisgICAgICAgICAgICBpZiAoY29tcGxldGlvbikKKyAgICAg ICAgICAgICAgICBjb21wbGV0aW9uKCk7CiAgICAgICAgIH1dOwogICAgIH0pOwogfQogCiB2b2lk IFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVlbigpCiB7Ci0g ICAgZXhpdEZ1bGxzY3JlZW4oXnsgfSk7CisgICAgZXhpdEZ1bGxzY3JlZW4obnVsbHB0cik7CiB9 CiAKICNlbmRpZgo=