109881 2013-02-14 18:44:44 -0800 Implement RenderGrid::computeIntrinsicLogicalWidths 2013-02-15 13:19:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109880 1 ojan ojan jchaffraix tony oldest_to_newest 833616 0 ojan 2013-02-14 18:44:44 -0800 Implement RenderGrid::computeIntrinsicLogicalWidths 833617 1 188464 ojan 2013-02-14 18:47:35 -0800 Created attachment 188464 Patch 833618 2 ojan 2013-02-14 18:48:14 -0800 Bug 109880 was done in preparation for this. 834272 3 188619 ojan 2013-02-15 12:34:01 -0800 Created attachment 188619 Patch 834278 4 188619 tony 2013-02-15 12:39:37 -0800 Comment on attachment 188619 Patch Now that I've seen the code, I think a const_cast of |this| in computeIntrinsicLogicalWidths would be better. It feels weird to me that placeItemsOnGrid is const. 834321 5 ojan 2013-02-15 13:19:59 -0800 Committed r143043: <http://trac.webkit.org/changeset/143043> 188464 2013-02-14 18:47:35 -0800 2013-02-15 12:33:59 -0800 Patch bug-109881-20130214184402.patch text/plain 4672 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyOTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzEyMjkyYTQwYjFkNTJi YTdhODQ5ZGQ1Zjc0ZGM3MmZlYjEyODU3Ni4uNThmOTE4ZjRkNmQxM2UxYTNlNzY3MDZiZTYyMjkx ZmUxMGY3Y2IzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEzLTAyLTE0ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgSW1wbGVtZW50IFJlbmRlckdy aWQ6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk4ODEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3Igbm93IHRoaXMgaXMgbm90IG9ic2VydmFibGUg ZHVlIHRvIHRoZSBGSVhNRXMgZm9yIHVuaW1wbGVtZW50ZWQgYml0cworICAgICAgICBvZiBjb21w dXRlUHJlZmVycmVkTG9naWNhbFdpZHRocy4gQnV0LCBzb29uLCBJJ2xsIGJlIHJlbW92aW5nIHRo ZSBjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocworICAgICAgICBvdmVycmlkZSBlbnRpcmVs eSBhbmQgaW5zdGVhZCB1c2UgUmVuZGVyQmxvY2sncywgd2hpY2ggd2lsbCBhbHNvIGFkZHJlc3Mg dGhlCisgICAgICAgIFJlbmRlckdyaWQgRklYTUVzLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0 ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6 cGxhY2VJdGVtc09uR3JpZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKwor MjAxMy0wMi0xNCAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFN0 YWNrIGFsbG9jYXRlZCB0aGUgZ3JpZCBkYXRhIGluIFJlbmRlckdyaWQKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTg4MAogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggOTliN2VmMGQ1ZjcwYjg2OWVlZTc3NmUyOTUy MjhlYmI1ZjVkYjg3YS4uODAwYzU4YmUwOTM2M2RhNWM3MTM2ZGEzMDZiMDc2OTRkNzk2ZTI4MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtMTY4LDE4ICsxNjgs MTEgQEAgdm9pZCBSZW5kZXJHcmlkOjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4s IExheW91dFVuaXQpCiAgICAgc2V0TmVlZHNMYXlvdXQoZmFsc2UpOwogfQogCi12b2lkIFJlbmRl ckdyaWQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKK3ZvaWQgUmVuZGVyR3JpZDo6 Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRo LCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKHByZWZl cnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKTsKLQogICAgIEdyaWREYXRhIGdyaWQ7CiAgICAgcGxh Y2VJdGVtc09uR3JpZChncmlkKTsKIAotICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0g MDsKLSAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IDA7Ci0KLSAgICAvLyBGSVhNRTog V2UgZG9uJ3QgdGFrZSBvdXIgb3duIGxvZ2ljYWwgd2lkdGggaW50byBhY2NvdW50LgotCiAgICAg Y29uc3QgVmVjdG9yPEdyaWRUcmFja1NpemU+JiB0cmFja1N0eWxlcyA9IHN0eWxlKCktPmdyaWRD b2x1bW5zKCk7CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHRyYWNrU3R5bGVzLnNpemUo KTsgKytpKSB7CkBAIC0xODcsMTIgKzE4MCwyMiBAQCB2b2lkIFJlbmRlckdyaWQ6OmNvbXB1dGVQ cmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICAgICAgTGF5b3V0VW5pdCBtYXhUcmFja0JyZWFk dGggPSBjb21wdXRlUHJlZmVycmVkVHJhY2tXaWR0aChncmlkLCB0cmFja1N0eWxlc1tpXS5tYXhU cmFja0JyZWFkdGgoKSwgaSk7CiAgICAgICAgIG1heFRyYWNrQnJlYWR0aCA9IHN0ZDo6bWF4KG1h eFRyYWNrQnJlYWR0aCwgbWluVHJhY2tCcmVhZHRoKTsKIAotICAgICAgICBtX21pblByZWZlcnJl ZExvZ2ljYWxXaWR0aCArPSBtaW5UcmFja0JyZWFkdGg7Ci0gICAgICAgIG1fbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoICs9IG1heFRyYWNrQnJlYWR0aDsKKyAgICAgICAgbWluTG9naWNhbFdpZHRo ICs9IG1pblRyYWNrQnJlYWR0aDsKKyAgICAgICAgbWF4TG9naWNhbFdpZHRoICs9IG1heFRyYWNr QnJlYWR0aDsKIAogICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYWRkIGluIHRoZSBzY3Jv bGxiYXJXaWR0aCAoZS5nLiBzZWUgUmVuZGVyRmxleGlibGVCb3gpLgogICAgIH0KK30KIAordm9p ZCBSZW5kZXJHcmlkOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCit7CisgICAgQVNT RVJUKHByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKTsKKworICAgIG1fbWluUHJlZmVycmVk TG9naWNhbFdpZHRoID0gMDsKKyAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IDA7CisK KyAgICAvLyBGSVhNRTogV2UgZG9uJ3QgdGFrZSBvdXIgb3duIGxvZ2ljYWwgd2lkdGggaW50byBh Y2NvdW50LgorICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1fbWluUHJlZmVycmVk TG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7CiAgICAgLy8gRklYTUU6 IFdlIHNob3VsZCBhY2NvdW50IGZvciBtaW4gLyBtYXggbG9naWNhbCB3aWR0aC4KIAogICAgIExh eW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0luSW5saW5lRGlyZWN0aW9uID0gYm9yZGVyQW5kUGFk ZGluZ0xvZ2ljYWxXaWR0aCgpOwpAQCAtNDY2LDcgKzQ2OSw3IEBAIGJvb2wgUmVuZGVyR3JpZDo6 dHJhY2tzQXJlV2lkZXJUaGFuTWluVHJhY2tCcmVhZHRoKFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRp cmVjdGlvCiB9CiAjZW5kaWYKIAotdm9pZCBSZW5kZXJHcmlkOjpwbGFjZUl0ZW1zT25HcmlkKEdy aWREYXRhJiBncmlkKQordm9pZCBSZW5kZXJHcmlkOjpwbGFjZUl0ZW1zT25HcmlkKEdyaWREYXRh JiBncmlkKSBjb25zdAogewogICAgIEFTU0VSVChncmlkLmlzRW1wdHkoKSk7CiAgICAgZ3JpZC5n cm93KG1heGltdW1JbmRleEluRGlyZWN0aW9uKEZvclJvd3MpKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyR3JpZC5oCmluZGV4IDQ0ODYxZTQzZGRhMDhlZDUyZjczMmI2ZTMyYWRmZDI2N2U4 YzM3YTAuLmY3Y2MxNTQxMWRiMjAxNzZlNTU1MGNkMGY2NjkxN2QxNGUyMWFjNGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtNDYsNiArNDYsNyBAQCBwdWJsaWM6CiAK IHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGlzUmVuZGVyR3JpZCgpIGNvbnN0IE9WRVJSSURF IHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUludHJpbnNpY0xvZ2lj YWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dp Y2FsV2lkdGgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlUHJlZmVy cmVkTG9naWNhbFdpZHRocygpIE9WRVJSSURFOwogCiAgICAgY2xhc3MgR3JpZEl0ZXJhdG9yOwpA QCAtNTgsNyArNTksNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgY29tcHV0ZVVzZWRCcmVh ZHRoT2ZNYXhMZW5ndGgoVHJhY2tTaXppbmdEaXJlY3Rpb24sIGNvbnN0IExlbmd0aCYpIGNvbnN0 OwogICAgIExheW91dFVuaXQgY29tcHV0ZVVzZWRCcmVhZHRoT2ZTcGVjaWZpZWRMZW5ndGgoVHJh Y2tTaXppbmdEaXJlY3Rpb24sIGNvbnN0IExlbmd0aCYpIGNvbnN0OwogICAgIHZvaWQgcmVzb2x2 ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zKGNvbnN0IEdyaWREYXRhJiwgVHJhY2tT aXppbmdEaXJlY3Rpb24sIFZlY3RvcjxHcmlkVHJhY2s+JiBjb2x1bW5UcmFja3MsIFZlY3RvcjxH cmlkVHJhY2s+JiByb3dUcmFja3MsIExheW91dFVuaXQmIGF2YWlsYWJsZUxvZ2ljYWxTcGFjZSk7 Ci0gICAgdm9pZCBwbGFjZUl0ZW1zT25HcmlkKEdyaWREYXRhJik7CisgICAgdm9pZCBwbGFjZUl0 ZW1zT25HcmlkKEdyaWREYXRhJikgY29uc3Q7CiAgICAgdm9pZCBsYXlvdXRHcmlkSXRlbXMoKTsK IAogICAgIHR5cGVkZWYgTGF5b3V0VW5pdCAoUmVuZGVyR3JpZDo6KiBTaXppbmdGdW5jdGlvbiko UmVuZGVyQm94KiwgVHJhY2tTaXppbmdEaXJlY3Rpb24sIFZlY3RvcjxHcmlkVHJhY2s+Jik7Cg== 188619 2013-02-15 12:34:01 -0800 2013-02-15 12:39:37 -0800 Patch bug-109881-20130215203028.patch text/plain 5589 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyOTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM5NmE3NGU3NGI3NTkx ZmUwNTVjN2RlMzM2ZmI2ODA2YzVkMGFlMy4uMzY0YzUzMTI4ZDgzMmRjY2MyYWU0NGVjYzJkOTMy MWM2Y2NjM2U1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAyLTE0ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50IFJlbmRlckdy aWQ6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk4ODEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3Igbm93IHRoaXMgaXMgbm90IG9ic2VydmFibGUg ZHVlIHRvIHRoZSBGSVhNRXMgZm9yIHVuaW1wbGVtZW50ZWQgYml0cworICAgICAgICBvZiBjb21w dXRlUHJlZmVycmVkTG9naWNhbFdpZHRocy4gQnV0LCBzb29uLCBJJ2xsIGJlIHJlbW92aW5nIHRo ZSBjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocworICAgICAgICBvdmVycmlkZSBlbnRpcmVs eSBhbmQgaW5zdGVhZCB1c2UgUmVuZGVyQmxvY2sncywgd2hpY2ggd2lsbCBhbHNvIGFkZHJlc3Mg dGhlCisgICAgICAgIFJlbmRlckdyaWQgRklYTUVzLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0 ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6 cGxhY2VJdGVtc09uR3JpZCk6CisgICAgICAgIE5lZWQgdG8gbWFrZSBpdCBjb25zdCBzbyB3ZSBj YW4gY2FsbCBpdCBmcm9tIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzLgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisgICAgICAgIE1ha2UgbV9ncmlkIG11dGFibGUgc28g dGhhdCBwbGFjZUl0ZW1zT25HcmlkIGNhbiBiZSBjb25zdC4KKyAgICAgICAgQWx0ZXJuYXRlbHks IHdlIGNvdWxkIHN0YWNrIGFsbG9jYXRlIGl0LCBidXQgdGhlcmUncyBkaXNhZ3JlZW1lbnQgb24K KyAgICAgICAgd2hldGhlciB0aGF0J3MgdGhlIHJpZ2h0IGNob2ljZS4gU2VlIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk4ODAuCisKIDIwMTMtMDItMTQgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgRU1FOiByZXBsYWNlIE1lZGlh S2V5U2Vzc2lvbi5hZGRLZXkoKSAtPiB1cGRhdGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwCmluZGV4IDEzZWZhZDk5OWYyNGU0NzJmMTI1MzYwY2Y2YzljYzI4NzIyYzE5 ZTMuLmMzMTVmYzBmZWM5NTYxZTE4NTJjOGI4MTBhZWQ2YjhlOTMzZGE1ZmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTE2OCwzMCArMTY4LDM0IEBAIHZvaWQg UmVuZGVyR3JpZDo6bGF5b3V0QmxvY2soYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0 KQogICAgIHNldE5lZWRzTGF5b3V0KGZhbHNlKTsKIH0KIAotdm9pZCBSZW5kZXJHcmlkOjpjb21w dXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCit2b2lkIFJlbmRlckdyaWQ6OmNvbXB1dGVJbnRy aW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5p dCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdAogewotICAgIEFTU0VSVChwcmVmZXJyZWRMb2dpY2Fs V2lkdGhzRGlydHkoKSk7Ci0KICAgICBwbGFjZUl0ZW1zT25HcmlkKCk7CiAKLSAgICBtX21pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCA9IDA7Ci0gICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgg PSAwOwotCi0gICAgLy8gRklYTUU6IFdlIGRvbid0IHRha2Ugb3VyIG93biBsb2dpY2FsIHdpZHRo IGludG8gYWNjb3VudC4KLQogICAgIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2tTaXplPiYgdHJhY2tT dHlsZXMgPSBzdHlsZSgpLT5ncmlkQ29sdW1ucygpOwotCiAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCB0cmFja1N0eWxlcy5zaXplKCk7ICsraSkgewogICAgICAgICBMYXlvdXRVbml0IG1pblRy YWNrQnJlYWR0aCA9IGNvbXB1dGVQcmVmZXJyZWRUcmFja1dpZHRoKHRyYWNrU3R5bGVzW2ldLm1p blRyYWNrQnJlYWR0aCgpLCBpKTsKICAgICAgICAgTGF5b3V0VW5pdCBtYXhUcmFja0JyZWFkdGgg PSBjb21wdXRlUHJlZmVycmVkVHJhY2tXaWR0aCh0cmFja1N0eWxlc1tpXS5tYXhUcmFja0JyZWFk dGgoKSwgaSk7CiAgICAgICAgIG1heFRyYWNrQnJlYWR0aCA9IHN0ZDo6bWF4KG1heFRyYWNrQnJl YWR0aCwgbWluVHJhY2tCcmVhZHRoKTsKIAotICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxX aWR0aCArPSBtaW5UcmFja0JyZWFkdGg7Ci0gICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdp ZHRoICs9IG1heFRyYWNrQnJlYWR0aDsKKyAgICAgICAgbWluTG9naWNhbFdpZHRoICs9IG1pblRy YWNrQnJlYWR0aDsKKyAgICAgICAgbWF4TG9naWNhbFdpZHRoICs9IG1heFRyYWNrQnJlYWR0aDsK IAogICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYWRkIGluIHRoZSBzY3JvbGxiYXJXaWR0 aCAoZS5nLiBzZWUgUmVuZGVyRmxleGlibGVCb3gpLgogICAgIH0KIAorICAgIG1fZ3JpZC5jbGVh cigpOworfQorCit2b2lkIFJlbmRlckdyaWQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhz KCkKK3sKKyAgICBBU1NFUlQocHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KCkpOworCisgICAg bV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSAwOworICAgIG1fbWF4UHJlZmVycmVkTG9naWNh bFdpZHRoID0gMDsKKworICAgIC8vIEZJWE1FOiBXZSBkb24ndCB0YWtlIG91ciBvd24gbG9naWNh bCB3aWR0aCBpbnRvIGFjY291bnQuCisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMo bV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKTsK ICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGFjY291bnQgZm9yIG1pbiAvIG1heCBsb2dpY2FsIHdp ZHRoLgogCiAgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nSW5JbmxpbmVEaXJlY3Rpb24g PSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CkBAIC0xOTksNyArMjAzLDYgQEAgdm9p ZCBSZW5kZXJHcmlkOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAgICAgbV9tYXhQ cmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gYm9yZGVyQW5kUGFkZGluZ0luSW5saW5lRGlyZWN0aW9u OwogCiAgICAgc2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKLSAgICBtX2dy aWQuY2xlYXIoKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpjb21wdXRlUHJlZmVycmVk VHJhY2tXaWR0aChjb25zdCBMZW5ndGgmIGxlbmd0aCwgc2l6ZV90IHRyYWNrSW5kZXgpIGNvbnN0 CkBAIC00NjYsNyArNDY5LDcgQEAgYm9vbCBSZW5kZXJHcmlkOjp0cmFja3NBcmVXaWRlclRoYW5N aW5UcmFja0JyZWFkdGgoVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW8KIH0KICNlbmRpZgog Ci12b2lkIFJlbmRlckdyaWQ6OnBsYWNlSXRlbXNPbkdyaWQoKQordm9pZCBSZW5kZXJHcmlkOjpw bGFjZUl0ZW1zT25HcmlkKCkgY29uc3QKIHsKICAgICBBU1NFUlQobV9ncmlkLmlzRW1wdHkoKSk7 CiAgICAgbV9ncmlkLmdyb3cobWF4aW11bUluZGV4SW5EaXJlY3Rpb24oRm9yUm93cykpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKaW5kZXggZDNjNmJiMTkwYWNlZmRiODM1MGQ1 MjA1Mjg5MWNiYzdjYjcyNmE4Ny4uYjZlMDRhOWU5NjgwZTJmODU5NTUxMWFmMjg4ZGQ3ODg3ZTY0 NDJhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCkBAIC00Niw2ICs0Niw3 IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgaXNSZW5kZXJHcmlkKCkg Y29uc3QgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgdm9pZCBjb21wdXRl SW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91 dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lk IGNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkgT1ZFUlJJREU7CiAKICAgICBMYXlvdXRV bml0IGNvbXB1dGVQcmVmZXJyZWRUcmFja1dpZHRoKGNvbnN0IExlbmd0aCYsIHNpemVfdCkgY29u c3Q7CkBAIC01Nyw3ICs1OCw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlVXNl ZEJyZWFkdGhPZk1heExlbmd0aChUcmFja1NpemluZ0RpcmVjdGlvbiwgY29uc3QgTGVuZ3RoJikg Y29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlVXNlZEJyZWFkdGhPZlNwZWNpZmllZExlbmd0 aChUcmFja1NpemluZ0RpcmVjdGlvbiwgY29uc3QgTGVuZ3RoJikgY29uc3Q7CiAgICAgdm9pZCBy ZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnMoVHJhY2tTaXppbmdEaXJlY3Rp b24sIFZlY3RvcjxHcmlkVHJhY2s+JiBjb2x1bW5UcmFja3MsIFZlY3RvcjxHcmlkVHJhY2s+JiBy b3dUcmFja3MsIExheW91dFVuaXQmIGF2YWlsYWJsZUxvZ2ljYWxTcGFjZSk7Ci0gICAgdm9pZCBw bGFjZUl0ZW1zT25HcmlkKCk7CisgICAgdm9pZCBwbGFjZUl0ZW1zT25HcmlkKCkgY29uc3Q7CiAg ICAgdm9pZCBsYXlvdXRHcmlkSXRlbXMoKTsKIAogICAgIHR5cGVkZWYgTGF5b3V0VW5pdCAoUmVu ZGVyR3JpZDo6KiBTaXppbmdGdW5jdGlvbikoUmVuZGVyQm94KiwgVHJhY2tTaXppbmdEaXJlY3Rp b24sIFZlY3RvcjxHcmlkVHJhY2s+Jik7CkBAIC04Myw3ICs4NCw3IEBAIHByaXZhdGU6CiAgICAg c2l6ZV90IGdyaWRDb2x1bW5Db3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fZ3JpZC5pc0VtcHR5KCkg PyAwIDogbV9ncmlkWzBdLnNpemUoKTsgfQogICAgIHNpemVfdCBncmlkUm93Q291bnQoKSBjb25z dCB7IHJldHVybiBtX2dyaWQuc2l6ZSgpOyB9CiAKLSAgICBWZWN0b3I8VmVjdG9yPFZlY3RvcjxS ZW5kZXJCb3gqLCAxPiA+ID4gbV9ncmlkOworICAgIG11dGFibGUgVmVjdG9yPFZlY3RvcjxWZWN0 b3I8UmVuZGVyQm94KiwgMT4gPiA+IG1fZ3JpZDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUK