52073 2011-01-07 12:21:22 -0800 [Chromium] Scrollbar code cleanup 2011-01-07 16:39:46 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mihaip mihaip dglazkov fishd tony webkit.review.bot oldest_to_newest 330918 0 mihaip 2011-01-07 12:21:22 -0800 [Chromium] Scrollbar code cleanup 330921 1 78257 mihaip 2011-01-07 12:23:56 -0800 Created attachment 78257 Patch 330923 2 mihaip 2011-01-07 12:25:11 -0800 Will wait until cr-linux EWS bot processes this patch before submitting, the Linux change was done blindly. 331001 3 webkit.review.bot 2011-01-07 14:06:53 -0800 Attachment 78257 did not build on chromium: Build output: http://queues.webkit.org/results/7377041 331029 4 78275 mihaip 2011-01-07 14:52:23 -0800 Created attachment 78275 Patch 331031 5 mihaip 2011-01-07 14:53:39 -0800 Now with (hopefully) correct #define. 331091 6 mihaip 2011-01-07 16:38:52 -0800 Committed r75292: <http://trac.webkit.org/changeset/75292> 331092 7 78275 mihaip 2011-01-07 16:39:46 -0800 Comment on attachment 78275 Patch This built correctly on the cr-linux EWS bot, landed it by hand. 78257 2011-01-07 12:23:56 -0800 2011-01-07 14:52:18 -0800 Patch bug-52073-20110107122355.patch text/plain 10340 mihaip ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmUyN2YyMWU2Y2U5OWIxYWZkZWQ5ZDU4NzNlYWZhMjViOTk5MzJmYy4uNjg5MTcyNTcxMjY5YWFj OGZiM2UzNzU4ZTcxY2RiZDM2MDM5MDJlMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMS0wMS0wNyAgTWlo YWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIFNjcm9sbGJhciBjb2RlIGNs ZWFudXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUy MDczCisKKyAgICAgICAgU2Nyb2xsYmFyIGNvZGUgY2xlYW51cDoKKyAgICAgICAgLSBSZW1vdmUg U2Nyb2xsYmFyVGhlbWVNYWMue21tfGh9IGZyb20gdGhlIG1hYyBzb3VyY2VzIGxpc3QsIHdlIHVz ZQorICAgICAgICAgIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMue21tfGh9CisgICAgICAgIC0g UmVtb3ZlIFVTRV9XRUJfVEhFTUVfRU5HSU5FX1RPX1BBSU5UX1RIVU1CICNkZWZpbmUgbm93IHRo YXQgc3dpdGNoIHRvCisgICAgICAgICAgV2ViVGhlbWVFbmdpbmUgaXMgcGVybWFuZW50CisgICAg ICAgIC0gRml4IHR5cG8gaW4gTGludXggc2Nyb2xsYmFyIGVudW0gbmFtZQorCisgICAgICAgIE5v IG5ldyB0ZXN0cyAoY29tcGlsZXMpLgorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAg ICAqIHBsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmg6CisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eDo6cGFpbnRUcmFja1BpZWNlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6c2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUpOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnQpOgorCiAyMDExLTAxLTA3 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUu Z3lwaSBiL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDE0ZjM5ZDY2OGRhY2RhNmFkM2I4ZTQ4 YzZjYjBkNDRhOTNlZDI2ZGQuLjQ1MTc3ZmIzOWUwMmQ2NWFlZmRjZGZiNWY4MzZiZGFjMjRkNjE3 MDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1dlYkNvcmUvV2ViQ29y ZS5neXBpCkBAIC0zMDgwLDggKzMwODAsNiBAQAogICAgICAgICAgICAgJ3BsYXRmb3JtL21hYy9T U0xLZXlHZW5lcmF0b3JNYWMubW0nLAogICAgICAgICAgICAgJ3BsYXRmb3JtL21hYy9TY2hlZHVs ZVBhaXJNYWMubW0nLAogICAgICAgICAgICAgJ3BsYXRmb3JtL21hYy9TY3JvbGxWaWV3TWFjLm1t JywKLSAgICAgICAgICAgICdwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMuaCcsCi0gICAg ICAgICAgICAncGxhdGZvcm0vbWFjL1Njcm9sbGJhclRoZW1lTWFjLm1tJywKICAgICAgICAgICAg ICdwbGF0Zm9ybS9tYWMvU2VhcmNoUG9wdXBNZW51TWFjLmgnLAogICAgICAgICAgICAgJ3BsYXRm b3JtL21hYy9TZWFyY2hQb3B1cE1lbnVNYWMubW0nLAogICAgICAgICAgICAgJ3BsYXRmb3JtL21h Yy9TaGFyZWRCdWZmZXJNYWMubW0nLApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9DaHJvbWl1bUJyaWRnZS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1 bUJyaWRnZS5oCmluZGV4IGViZTQ4YmQ4NmVjNTk5ZDkyNGUyZjNiMjYyMjMzZmM0N2M1YjI5MmUu LjU2OTY5ZWZmODZlOGJlOTFlYzM3NGI0ZmYyYmJjOTdlMmM2ODY5YWUgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaAorKysgYi9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgKQEAgLTI3Nyw3ICsyNzcsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICBQYXJ0U2Nyb2xsYmFyVXBBcnJvdywKICAgICAg ICAgICAgIFBhcnRTY3JvbGxiYXJIb3Jpem9udGFsVGh1bWIsCiAgICAgICAgICAgICBQYXJ0U2Ny b2xsYmFyVmVydGljYWxUaHVtYiwKLSAgICAgICAgICAgIFBhcnRTY3JvbGxiYXJIb3JpenRvbmFs VHJhY2ssCisgICAgICAgICAgICBQYXJ0U2Nyb2xsYmFySG9yaXpvbnRhbFRyYWNrLAogICAgICAg ICAgICAgUGFydFNjcm9sbGJhclZlcnRpY2FsVHJhY2ssCiAgICAgICAgIH07CiAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4 LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxp bnV4LmNwcAppbmRleCA0NmU2OTkzOGZkOTcwYTlmYzY0ZGRkNjgwMzQ4Nzc4MGRlYWY0MDQ0Li5i YTEwOTUzMDgwYjA0OGY1OTA2ZjJkZDNmNTU0MTcwNjlmNmI3NWM1IDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eC5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTGludXgu Y3BwCkBAIC02MSw3ICs2MSw3IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4Ojpw YWludFRyYWNrUGllY2UoR3JhcGhpY3NDb250ZXh0KiBnYywgU2Nyb2xsYmFyCiAgICAgZXh0cmFQ YXJhbXMuc2Nyb2xsYmFyVHJhY2sudHJhY2tIZWlnaHQgPSBhbGlnblJlY3QuaGVpZ2h0KCk7CiAg ICAgQ2hyb21pdW1CcmlkZ2U6OnBhaW50VGhlbWVQYXJ0KAogICAgICAgICBnYywKLSAgICAgICAg c2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIgPyBDaHJvbWl1 bUJyaWRnZTo6UGFydFNjcm9sbGJhckhvcml6dG9uYWxUcmFjayA6IENocm9taXVtQnJpZGdlOjpQ YXJ0U2Nyb2xsYmFyVmVydGljYWxUcmFjaywKKyAgICAgICAgc2Nyb2xsYmFyLT5vcmllbnRhdGlv bigpID09IEhvcml6b250YWxTY3JvbGxiYXIgPyBDaHJvbWl1bUJyaWRnZTo6UGFydFNjcm9sbGJh ckhvcml6b250YWxUcmFjayA6IENocm9taXVtQnJpZGdlOjpQYXJ0U2Nyb2xsYmFyVmVydGljYWxU cmFjaywKICAgICAgICAgc3RhdGUsCiAgICAgICAgIHJlY3QsCiAgICAgICAgICZleHRyYVBhcmFt cyk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1l Q2hyb21pdW1NYWMubW0gYi9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1l Q2hyb21pdW1NYWMubW0KaW5kZXggZDEzZDQxZWUxNDY3Y2VlYTY1MDViNTY1YmNhOGUwOTQwZTJl YzMxMC4uMGFhM2UxMGZhZDRhY2VjMTNiYTc3MzBmODkyMTAwZWU0ODlkODA0OCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1t CisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1h Yy5tbQpAQCAtMjcsMTMgKzI3LDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJT Y3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgiCiAKLS8vIEZJWE1FOiBSZW1vdmUgdGhpcyAoYWx3 YXlzIHVzZSBXZWJUaGVtZUVuZ2luZSkgb25jZSB3ZSByZWJhc2VsaW5lIHRlc3RzCi0jZGVmaW5l IFVTRV9XRUJfVEhFTUVfRU5HSU5FX1RPX1BBSU5UX1RIVU1CIDEKLQotI2lmIFVTRV9XRUJfVEhF TUVfRU5HSU5FX1RPX1BBSU5UX1RIVU1CCiAjaW5jbHVkZSAiQ2hyb21pdW1CcmlkZ2UuaCIKICNp bmNsdWRlICJGcmFtZVZpZXcuaCIKLSNlbmRpZgogI2luY2x1ZGUgIkltYWdlQnVmZmVyLmgiCiAj aW5jbHVkZSAiUGxhdGZvcm1Nb3VzZUV2ZW50LmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgpA QCAtNTQsNiArNDksNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIC8vIFRoZSBvbmx5IGNo YW5nZXMgZnJvbSBTY3JvbGxiYXJUaGVtZU1hYyBzaG91bGQgYmU6CiAvLyAtIFRoZSBjbGFzc25h bWUgY2hhbmdlIGZyb20gU2Nyb2xsYmFyVGhlbWVNYWMgdG8gU2Nyb2xsYmFyVGhlbWVDaHJvbWl1 bU1hYy4KIC8vIC0gSW4gcGFpbnQoKSB0aGUgY29kZSB0byBwYWludCB0aGUgdHJhY2ssIHRpY2tt YXJrcywgYW5kIHRodW1iIHNlcGFyYXRlbHkuCisvLyAtIEluIHBhaW50KCkgdGhlIHRodW1iIGlz IGRyYXduIHZpYSBDaHJvbWVCcmlkZ2UvV2ViVGhlbWVFbmdpbmUuCiAvLwogLy8gRm9yIGFsbCBv dGhlciBkaWZmZXJlbmNlcywgaWYgaXQgd2FzIGludHJvZHVjZWQgaW4gdGhpcyBmaWxlLCB0aGVu IHRoZQogLy8gbWFpbnRhaW5lciBmb3Jnb3QgdG8gaW5jbHVkZSBpdCBpbiB0aGUgbGlzdDsgb3Ro ZXJ3aXNlIGl0IGlzIGFuIHVwZGF0ZSB0aGF0CkBAIC0zNzQsNyArMzcwLDYgQEAgc3RhdGljIGlu dCBzY3JvbGxiYXJQYXJ0VG9ISVByZXNzZWRTdGF0ZShTY3JvbGxiYXJQYXJ0IHBhcnQpCiAgICAg fQogfQogCi0jaWYgVVNFX1dFQl9USEVNRV9FTkdJTkVfVE9fUEFJTlRfVEhVTUIKIHN0YXRpYyBD aHJvbWl1bUJyaWRnZTo6VGhlbWVQYWludFN0YXRlIHNjcm9sbGJhclN0YXRlVG9UaGVtZVN0YXRl KFNjcm9sbGJhciogc2Nyb2xsYmFyKSB7CiAgICAgaWYgKCFzY3JvbGxiYXItPmVuYWJsZWQoKSkK ICAgICAgICAgcmV0dXJuIENocm9taXVtQnJpZGdlOjpTdGF0ZURpc2FibGVkOwpAQCAtMzg1LDcg KzM4MCw2IEBAIHN0YXRpYyBDaHJvbWl1bUJyaWRnZTo6VGhlbWVQYWludFN0YXRlIHNjcm9sbGJh clN0YXRlVG9UaGVtZVN0YXRlKFNjcm9sbGJhciogc2NyCiAKICAgICByZXR1cm4gQ2hyb21pdW1C cmlkZ2U6OlN0YXRlQWN0aXZlOwogfQotI2VuZGlmIC8vIFVTRV9XRUJfVEhFTUVfRU5HSU5FX1RP X1BBSU5UX1RIVU1CCiAKIGJvb2wgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnQoU2Ny b2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVj dCYgZGFtYWdlUmVjdCkKIHsKQEAgLTQ2OSw3ICs0NjMsNiBAQCBib29sIFNjcm9sbGJhclRoZW1l Q2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQq IGNvbgogICAgIH0KIAogICAgIGlmIChoYXNUaHVtYihzY3JvbGxiYXIpKSB7Ci0jaWYgVVNFX1dF Ql9USEVNRV9FTkdJTkVfVE9fUEFJTlRfVEhVTUIKICAgICAgICAgQ2hyb21pdW1CcmlkZ2U6OlRo ZW1lUGFpbnRTY3JvbGxiYXJJbmZvIHNjcm9sbGJhckluZm87CiAgICAgICAgIHNjcm9sbGJhcklu Zm8ub3JpZW50YXRpb24gPSBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNj cm9sbGJhciA/IENocm9taXVtQnJpZGdlOjpTY3JvbGxiYXJPcmllbnRhdGlvbkhvcml6b250YWwg OiBDaHJvbWl1bUJyaWRnZTo6U2Nyb2xsYmFyT3JpZW50YXRpb25WZXJ0aWNhbDsKICAgICAgICAg c2Nyb2xsYmFySW5mby5wYXJlbnQgPSBzY3JvbGxiYXItPnBhcmVudCgpICYmIHNjcm9sbGJhci0+ cGFyZW50KCktPmlzRnJhbWVWaWV3KCkgJiYgc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4oc2Nyb2xs YmFyLT5wYXJlbnQoKSktPmlzU2Nyb2xsVmlld1Njcm9sbGJhcihzY3JvbGxiYXIpID8gQ2hyb21p dW1CcmlkZ2U6OlNjcm9sbGJhclBhcmVudFNjcm9sbFZpZXcgOiBDaHJvbWl1bUJyaWRnZTo6U2Ny b2xsYmFyUGFyZW50UmVuZGVyTGF5ZXI7CkBAIC00ODQsMTAgKzQ3Nyw2IEBAIGJvb2wgU2Nyb2xs YmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNz Q29udGV4dCogY29uCiAgICAgICAgICAgICBzY3JvbGxiYXItPmNvbnRyb2xTaXplKCkgPT0gUmVn dWxhclNjcm9sbGJhciA/IENocm9taXVtQnJpZGdlOjpTaXplUmVndWxhciA6IENocm9taXVtQnJp ZGdlOjpTaXplU21hbGwsCiAgICAgICAgICAgICBzY3JvbGxiYXItPmZyYW1lUmVjdCgpLAogICAg ICAgICAgICAgc2Nyb2xsYmFySW5mbyk7Ci0jZWxzZQotICAgICAgICB0cmFja0luZm8uYXR0cmli dXRlcyB8PSAoa1RoZW1lVHJhY2tTaG93VGh1bWIgfCBrVGhlbWVUcmFja0hpZGVUcmFjayk7Ci0g ICAgICAgIEhJVGhlbWVEcmF3VHJhY2soJnRyYWNrSW5mbywgMCwgZHJhd2luZ0NvbnRleHQtPnBs YXRmb3JtQ29udGV4dCgpLCBrSElUaGVtZU9yaWVudGF0aW9uTm9ybWFsKTsKLSNlbmRpZgogICAg IH0KIAogICAgIGlmICghY2FuRHJhd0RpcmVjdGx5KQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNWFlMTcxMjYy MDIzNThiN2RiNTA2MmJiNGQyY2FjYWZjZGU5MGVhMS4uM2I3ZjM2N2I2YmFmNTQ5ODQ1MjA4ZWY4 ZmJlMTg5MDA5YzMwMDg0OSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwor KysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDEt MDcgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBTY3JvbGxiYXIg Y29kZSBjbGVhbnVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01MjA3MworCisgICAgICAgIFNjcm9sbGJhciBjb2RlIGNsZWFudXA6CisgICAgICAgIC0g Rml4IHR5cG8gaW4gTGludXggc2Nyb2xsYmFyIGVudW0gbmFtZQorCisgICAgICAgICogcHVibGlj L2xpbnV4L1dlYlRoZW1lRW5naW5lLmg6CisgICAgICAgICogc3JjL0Nocm9taXVtQnJpZGdlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlRoZW1lUGFydCk6CisgICAgICAgIChXZWJDb3JlOjpH ZXRXZWJUaGVtZUV4dHJhUGFyYW1zKToKKwogMjAxMS0wMS0wNSAgWmhlbnlhbyBNbyAgPHptb0Bn b29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KZGlmZiAt LWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdpbmUuaCBiL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdpbmUuaAppbmRleCBmZDcyY2Y3 ZTliYzY3OWRkYzE1OGRjMDE2NGQ5OWZiNjk4OTJhMzkwLi40ZjZlOTZjZjQxZWJmNjA1NGNmNjYx OTY3NWJlZmM4MzI1OTIzYjI3IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL2xp bnV4L1dlYlRoZW1lRW5naW5lLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9X ZWJUaGVtZUVuZ2luZS5oCkBAIC0zOSw2ICszOSw5IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBz dHJ1Y3QgV2ViUmVjdDsKIAorLy8gRklYTUU6IFJlbW92ZSBvbmNlIHdlYmtpdC9nbHVlL3dlYnRo ZW1lZW5naW5lX2ltcGxfbGludXguYyBoYXMgYmVlbiB1cGRhdGVkIHRvIHVzZSB0aGUgY29ycmVj dCBzcGVsbGluZy4KKyNkZWZpbmUgV2ViS2l0OjpXZWJUaGVtZUVuZ2luZTo6UGFydFNjcm9sbGJh ckhvcml6dG9uYWxUcmFjayBXZWJLaXQ6OldlYlRoZW1lRW5naW5lOjpQYXJ0U2Nyb2xsYmFySG9y aXpvbnRhbFRyYWNrCisKIGNsYXNzIFdlYlRoZW1lRW5naW5lIHsKIHB1YmxpYzoKICAgICAvLyBU aGUgVUkgcGFydCB3aGljaCBpcyBiZWluZyBhY2Nlc3NlZC4KQEAgLTQ5LDcgKzUyLDcgQEAgcHVi bGljOgogICAgICAgICBQYXJ0U2Nyb2xsYmFyVXBBcnJvdywKICAgICAgICAgUGFydFNjcm9sbGJh ckhvcml6b250YWxUaHVtYiwKICAgICAgICAgUGFydFNjcm9sbGJhclZlcnRpY2FsVGh1bWIsCi0g ICAgICAgIFBhcnRTY3JvbGxiYXJIb3JpenRvbmFsVHJhY2ssCisgICAgICAgIFBhcnRTY3JvbGxi YXJIb3Jpem9udGFsVHJhY2ssCiAgICAgICAgIFBhcnRTY3JvbGxiYXJWZXJ0aWNhbFRyYWNrCiAg ICAgfTsKIApAQCAtNjEsNyArNjQsNyBAQCBwdWJsaWM6CiAgICAgICAgIFN0YXRlUHJlc3NlZCwK ICAgICB9OwogCi0gICAgLy8gRXh0cmEgcGFyYW1ldGVycyBmb3IgZHJhd2luZyB0aGUgUGFydFNj cm9sbGJhckhvcml6dG9uYWxUcmFjayBhbmQKKyAgICAvLyBFeHRyYSBwYXJhbWV0ZXJzIGZvciBk cmF3aW5nIHRoZSBQYXJ0U2Nyb2xsYmFySG9yaXpvbnRhbFRyYWNrIGFuZAogICAgIC8vIFBhcnRT Y3JvbGxiYXJWZXJ0aWNhbFRyYWNrLgogICAgIHN0cnVjdCBTY3JvbGxiYXJUcmFja0V4dHJhUGFy YW1zIHsKICAgICAgICAgLy8gVGhlIGJvdW5kcyBvZiB0aGUgZW50aXJlIHRyYWNrLCBhcyBvcHBv c2VkIHRvIHRoZSBwYXJ0IGJlaW5nIHBhaW50ZWQuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21p dW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1C cmlkZ2UuY3BwCmluZGV4IDRlMjcxNGYyYmEzNTIzMThkMDU5NmMxNDAwOWIwNGEyMTgwMTUyNDQu LjM4YTNmMWQ1N2E2MDhiZDkwMjgzNGMxYTc2MTRhYmJkOWY3NGZiOGYgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1 bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCkBAIC04MDMsNyArODAzLDcgQEAgc3RhdGljIFdlYlRo ZW1lRW5naW5lOjpQYXJ0IFdlYlRoZW1lUGFydChDaHJvbWl1bUJyaWRnZTo6VGhlbWVQYXJ0IHBh cnQpCiAgICAgY2FzZSBDaHJvbWl1bUJyaWRnZTo6UGFydFNjcm9sbGJhclVwQXJyb3c6IHJldHVy biBXZWJUaGVtZUVuZ2luZTo6UGFydFNjcm9sbGJhclVwQXJyb3c7CiAgICAgY2FzZSBDaHJvbWl1 bUJyaWRnZTo6UGFydFNjcm9sbGJhckhvcml6b250YWxUaHVtYjogcmV0dXJuIFdlYlRoZW1lRW5n aW5lOjpQYXJ0U2Nyb2xsYmFySG9yaXpvbnRhbFRodW1iOwogICAgIGNhc2UgQ2hyb21pdW1Ccmlk Z2U6OlBhcnRTY3JvbGxiYXJWZXJ0aWNhbFRodW1iOiByZXR1cm4gV2ViVGhlbWVFbmdpbmU6OlBh cnRTY3JvbGxiYXJWZXJ0aWNhbFRodW1iOwotICAgIGNhc2UgQ2hyb21pdW1CcmlkZ2U6OlBhcnRT Y3JvbGxiYXJIb3JpenRvbmFsVHJhY2s6IHJldHVybiBXZWJUaGVtZUVuZ2luZTo6UGFydFNjcm9s bGJhckhvcml6dG9uYWxUcmFjazsKKyAgICBjYXNlIENocm9taXVtQnJpZGdlOjpQYXJ0U2Nyb2xs YmFySG9yaXpvbnRhbFRyYWNrOiByZXR1cm4gV2ViVGhlbWVFbmdpbmU6OlBhcnRTY3JvbGxiYXJI b3Jpem9udGFsVHJhY2s7CiAgICAgY2FzZSBDaHJvbWl1bUJyaWRnZTo6UGFydFNjcm9sbGJhclZl cnRpY2FsVHJhY2s6IHJldHVybiBXZWJUaGVtZUVuZ2luZTo6UGFydFNjcm9sbGJhclZlcnRpY2Fs VHJhY2s7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtODI0LDcgKzgyNCw3 IEBAIHN0YXRpYyBXZWJUaGVtZUVuZ2luZTo6U3RhdGUgV2ViVGhlbWVTdGF0ZShDaHJvbWl1bUJy aWRnZTo6VGhlbWVQYWludFN0YXRlIHN0YXRlCiAKIHN0YXRpYyB2b2lkIEdldFdlYlRoZW1lRXh0 cmFQYXJhbXMoQ2hyb21pdW1CcmlkZ2U6OlRoZW1lUGFydCBwYXJ0LCBDaHJvbWl1bUJyaWRnZTo6 VGhlbWVQYWludFN0YXRlIHN0YXRlLCBjb25zdCBDaHJvbWl1bUJyaWRnZTo6VGhlbWVQYWludEV4 dHJhUGFyYW1zKiBleHRyYVBhcmFtcywgV2ViVGhlbWVFbmdpbmU6OkV4dHJhUGFyYW1zKiB3ZWJU aGVtZUV4dHJhUGFyYW1zKQogewotICAgIGlmIChwYXJ0ID09IENocm9taXVtQnJpZGdlOjpQYXJ0 U2Nyb2xsYmFySG9yaXp0b25hbFRyYWNrIHx8IHBhcnQgPT0gQ2hyb21pdW1CcmlkZ2U6OlBhcnRT Y3JvbGxiYXJWZXJ0aWNhbFRyYWNrKSB7CisgICAgaWYgKHBhcnQgPT0gQ2hyb21pdW1CcmlkZ2U6 OlBhcnRTY3JvbGxiYXJIb3Jpem9udGFsVHJhY2sgfHwgcGFydCA9PSBDaHJvbWl1bUJyaWRnZTo6 UGFydFNjcm9sbGJhclZlcnRpY2FsVHJhY2spIHsKICAgICAgICAgd2ViVGhlbWVFeHRyYVBhcmFt cy0+c2Nyb2xsYmFyVHJhY2sudHJhY2tYID0gZXh0cmFQYXJhbXMtPnNjcm9sbGJhclRyYWNrLnRy YWNrWDsKICAgICAgICAgd2ViVGhlbWVFeHRyYVBhcmFtcy0+c2Nyb2xsYmFyVHJhY2sudHJhY2tZ ID0gZXh0cmFQYXJhbXMtPnNjcm9sbGJhclRyYWNrLnRyYWNrWTsKICAgICAgICAgd2ViVGhlbWVF eHRyYVBhcmFtcy0+c2Nyb2xsYmFyVHJhY2sudHJhY2tXaWR0aCA9IGV4dHJhUGFyYW1zLT5zY3Jv bGxiYXJUcmFjay50cmFja1dpZHRoOwo= 78275 2011-01-07 14:52:23 -0800 2011-01-07 16:39:46 -0800 Patch bug-52073-20110107145221.patch text/plain 10283 mihaip ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmE0MjdhMDc1ODU3MzAxYTY2ZDc3YmVkNzA4MTg1OGMxZjc1NjAyZC4uNWRlNjY5NjZjYzY2OTEw NGFlNjlhMDZiMWViYjVjMTcyYmEzZGM1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMS0wMS0wNyAgTWlo YWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBGaXNoZXIuCisKKyAgICAgICAgW0Nocm9taXVtXSBTY3JvbGxiYXIgY29kZSBjbGVh bnVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjA3 MworCisgICAgICAgIFNjcm9sbGJhciBjb2RlIGNsZWFudXA6CisgICAgICAgIC0gUmVtb3ZlIFNj cm9sbGJhclRoZW1lTWFjLnttbXxofSBmcm9tIHRoZSBtYWMgc291cmNlcyBsaXN0LCB3ZSB1c2UK KyAgICAgICAgICBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLnttbXxofQorICAgICAgICAtIFJl bW92ZSBVU0VfV0VCX1RIRU1FX0VOR0lORV9UT19QQUlOVF9USFVNQiAjZGVmaW5lIG5vdyB0aGF0 IHN3aXRjaCB0bworICAgICAgICAgIFdlYlRoZW1lRW5naW5lIGlzIHBlcm1hbmVudAorICAgICAg ICAtIEZpeCB0eXBvIGluIExpbnV4IHNjcm9sbGJhciBlbnVtIG5hbWUKKworICAgICAgICBObyBu ZXcgdGVzdHMgKGNvbXBpbGVzKS4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwaToKKyAgICAgICAg KiBwbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oOgorICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxiYXJUaGVtZUNocm9taXVtTGludXg6OnBhaW50VHJhY2tQaWVjZSk6CisgICAg ICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OnNjcm9sbGJhclN0YXRlVG9UaGVtZVN0YXRlKToKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KToKKwogMjAxMS0wMS0wNyAg SmFuIEVyaWsgSGFuc3NlbiAgPGpoYW5zc2VuQHNlbmNoYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQW5kcmVhcyBLbGluZy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5neXBpIGIv V2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggYjVjMjRkYjY0OGVjOWFjMDYwOGE1OWM0NDE5ZDE0 ODliNjI4MDU1Yy4uN2M1MmU3M2ZjOGY0YjlmMDhmODM3YTJmZWJlNDUzZmFmNjdiZjhhZiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvV2ViQ29yZS9XZWJDb3JlLmd5cGkK QEAgLTMwODMsOCArMzA4Myw2IEBACiAgICAgICAgICAgICAncGxhdGZvcm0vbWFjL1NTTEtleUdl bmVyYXRvck1hYy5tbScsCiAgICAgICAgICAgICAncGxhdGZvcm0vbWFjL1NjaGVkdWxlUGFpck1h Yy5tbScsCiAgICAgICAgICAgICAncGxhdGZvcm0vbWFjL1Njcm9sbFZpZXdNYWMubW0nLAotICAg ICAgICAgICAgJ3BsYXRmb3JtL21hYy9TY3JvbGxiYXJUaGVtZU1hYy5oJywKLSAgICAgICAgICAg ICdwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMubW0nLAogICAgICAgICAgICAgJ3BsYXRm b3JtL21hYy9TZWFyY2hQb3B1cE1lbnVNYWMuaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vbWFj L1NlYXJjaFBvcHVwTWVudU1hYy5tbScsCiAgICAgICAgICAgICAncGxhdGZvcm0vbWFjL1NoYXJl ZEJ1ZmZlck1hYy5tbScsCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0No cm9taXVtQnJpZGdlLmggYi9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdl LmgKaW5kZXggZWJlNDhiZDg2ZWM1OTlkOTI0ZTJmM2IyNjIyMzNmYzQ3YzViMjkyZS4uNTY5Njll ZmY4NmU4YmU5MWVjMzc0YjRmZjJiYmM5N2UyYzY4NjlhZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaApAQCAtMjc3LDcgKzI3Nyw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgICAgIFBhcnRTY3JvbGxiYXJVcEFycm93LAogICAgICAgICAgICAg UGFydFNjcm9sbGJhckhvcml6b250YWxUaHVtYiwKICAgICAgICAgICAgIFBhcnRTY3JvbGxiYXJW ZXJ0aWNhbFRodW1iLAotICAgICAgICAgICAgUGFydFNjcm9sbGJhckhvcml6dG9uYWxUcmFjaywK KyAgICAgICAgICAgIFBhcnRTY3JvbGxiYXJIb3Jpem9udGFsVHJhY2ssCiAgICAgICAgICAgICBQ YXJ0U2Nyb2xsYmFyVmVydGljYWxUcmFjaywKICAgICAgICAgfTsKIApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTGludXguY3BwIGIv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTGludXguY3Bw CmluZGV4IDQ2ZTY5OTM4ZmQ5NzBhOWZjNjRkZGQ2ODAzNDg3NzgwZGVhZjQwNDQuLmJhMTA5NTMw ODBiMDQ4ZjU5MDZmMmRkM2Y1NTQxNzA2OWY2Yjc1YzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eC5jcHAKQEAg LTYxLDcgKzYxLDcgQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTGludXg6OnBhaW50VHJh Y2tQaWVjZShHcmFwaGljc0NvbnRleHQqIGdjLCBTY3JvbGxiYXIKICAgICBleHRyYVBhcmFtcy5z Y3JvbGxiYXJUcmFjay50cmFja0hlaWdodCA9IGFsaWduUmVjdC5oZWlnaHQoKTsKICAgICBDaHJv bWl1bUJyaWRnZTo6cGFpbnRUaGVtZVBhcnQoCiAgICAgICAgIGdjLAotICAgICAgICBzY3JvbGxi YXItPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhciA/IENocm9taXVtQnJpZGdl OjpQYXJ0U2Nyb2xsYmFySG9yaXp0b25hbFRyYWNrIDogQ2hyb21pdW1CcmlkZ2U6OlBhcnRTY3Jv bGxiYXJWZXJ0aWNhbFRyYWNrLAorICAgICAgICBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0g SG9yaXpvbnRhbFNjcm9sbGJhciA/IENocm9taXVtQnJpZGdlOjpQYXJ0U2Nyb2xsYmFySG9yaXpv bnRhbFRyYWNrIDogQ2hyb21pdW1CcmlkZ2U6OlBhcnRTY3JvbGxiYXJWZXJ0aWNhbFRyYWNrLAog ICAgICAgICBzdGF0ZSwKICAgICAgICAgcmVjdCwKICAgICAgICAgJmV4dHJhUGFyYW1zKTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1 bU1hYy5tbSBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1 bU1hYy5tbQppbmRleCBkMTNkNDFlZTE0NjdjZWVhNjUwNWI1NjViY2E4ZTA5NDBlMmVjMzEwLi4w YWEzZTEwZmFkNGFjZWMxM2JhNzczMGY4OTIxMDBlZTQ4OWQ4MDQ4IDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tCkBA IC0yNywxMyArMjcsOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNjcm9sbGJh clRoZW1lQ2hyb21pdW1NYWMuaCIKIAotLy8gRklYTUU6IFJlbW92ZSB0aGlzIChhbHdheXMgdXNl IFdlYlRoZW1lRW5naW5lKSBvbmNlIHdlIHJlYmFzZWxpbmUgdGVzdHMKLSNkZWZpbmUgVVNFX1dF Ql9USEVNRV9FTkdJTkVfVE9fUEFJTlRfVEhVTUIgMQotCi0jaWYgVVNFX1dFQl9USEVNRV9FTkdJ TkVfVE9fUEFJTlRfVEhVTUIKICNpbmNsdWRlICJDaHJvbWl1bUJyaWRnZS5oIgogI2luY2x1ZGUg IkZyYW1lVmlldy5oIgotI2VuZGlmCiAjaW5jbHVkZSAiSW1hZ2VCdWZmZXIuaCIKICNpbmNsdWRl ICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJTY3JvbGxWaWV3LmgiCkBAIC01NCw2 ICs0OSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogLy8gVGhlIG9ubHkgY2hhbmdlcyBm cm9tIFNjcm9sbGJhclRoZW1lTWFjIHNob3VsZCBiZToKIC8vIC0gVGhlIGNsYXNzbmFtZSBjaGFu Z2UgZnJvbSBTY3JvbGxiYXJUaGVtZU1hYyB0byBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLgog Ly8gLSBJbiBwYWludCgpIHRoZSBjb2RlIHRvIHBhaW50IHRoZSB0cmFjaywgdGlja21hcmtzLCBh bmQgdGh1bWIgc2VwYXJhdGVseS4KKy8vIC0gSW4gcGFpbnQoKSB0aGUgdGh1bWIgaXMgZHJhd24g dmlhIENocm9tZUJyaWRnZS9XZWJUaGVtZUVuZ2luZS4KIC8vCiAvLyBGb3IgYWxsIG90aGVyIGRp ZmZlcmVuY2VzLCBpZiBpdCB3YXMgaW50cm9kdWNlZCBpbiB0aGlzIGZpbGUsIHRoZW4gdGhlCiAv LyBtYWludGFpbmVyIGZvcmdvdCB0byBpbmNsdWRlIGl0IGluIHRoZSBsaXN0OyBvdGhlcndpc2Ug aXQgaXMgYW4gdXBkYXRlIHRoYXQKQEAgLTM3NCw3ICszNzAsNiBAQCBzdGF0aWMgaW50IHNjcm9s bGJhclBhcnRUb0hJUHJlc3NlZFN0YXRlKFNjcm9sbGJhclBhcnQgcGFydCkKICAgICB9CiB9CiAK LSNpZiBVU0VfV0VCX1RIRU1FX0VOR0lORV9UT19QQUlOVF9USFVNQgogc3RhdGljIENocm9taXVt QnJpZGdlOjpUaGVtZVBhaW50U3RhdGUgc2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoU2Nyb2xs YmFyKiBzY3JvbGxiYXIpIHsKICAgICBpZiAoIXNjcm9sbGJhci0+ZW5hYmxlZCgpKQogICAgICAg ICByZXR1cm4gQ2hyb21pdW1CcmlkZ2U6OlN0YXRlRGlzYWJsZWQ7CkBAIC0zODUsNyArMzgwLDYg QEAgc3RhdGljIENocm9taXVtQnJpZGdlOjpUaGVtZVBhaW50U3RhdGUgc2Nyb2xsYmFyU3RhdGVU b1RoZW1lU3RhdGUoU2Nyb2xsYmFyKiBzY3IKIAogICAgIHJldHVybiBDaHJvbWl1bUJyaWRnZTo6 U3RhdGVBY3RpdmU7CiB9Ci0jZW5kaWYgLy8gVVNFX1dFQl9USEVNRV9FTkdJTkVfVE9fUEFJTlRf VEhVTUIKIAogYm9vbCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpwYWludChTY3JvbGxiYXIq IHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkYW1h Z2VSZWN0KQogewpAQCAtNDY5LDcgKzQ2Myw2IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1 bU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCogY29uCiAg ICAgfQogCiAgICAgaWYgKGhhc1RodW1iKHNjcm9sbGJhcikpIHsKLSNpZiBVU0VfV0VCX1RIRU1F X0VOR0lORV9UT19QQUlOVF9USFVNQgogICAgICAgICBDaHJvbWl1bUJyaWRnZTo6VGhlbWVQYWlu dFNjcm9sbGJhckluZm8gc2Nyb2xsYmFySW5mbzsKICAgICAgICAgc2Nyb2xsYmFySW5mby5vcmll bnRhdGlvbiA9IHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFy ID8gQ2hyb21pdW1CcmlkZ2U6OlNjcm9sbGJhck9yaWVudGF0aW9uSG9yaXpvbnRhbCA6IENocm9t aXVtQnJpZGdlOjpTY3JvbGxiYXJPcmllbnRhdGlvblZlcnRpY2FsOwogICAgICAgICBzY3JvbGxi YXJJbmZvLnBhcmVudCA9IHNjcm9sbGJhci0+cGFyZW50KCkgJiYgc2Nyb2xsYmFyLT5wYXJlbnQo KS0+aXNGcmFtZVZpZXcoKSAmJiBzdGF0aWNfY2FzdDxGcmFtZVZpZXcqPihzY3JvbGxiYXItPnBh cmVudCgpKS0+aXNTY3JvbGxWaWV3U2Nyb2xsYmFyKHNjcm9sbGJhcikgPyBDaHJvbWl1bUJyaWRn ZTo6U2Nyb2xsYmFyUGFyZW50U2Nyb2xsVmlldyA6IENocm9taXVtQnJpZGdlOjpTY3JvbGxiYXJQ YXJlbnRSZW5kZXJMYXllcjsKQEAgLTQ4NCwxMCArNDc3LDYgQEAgYm9vbCBTY3JvbGxiYXJUaGVt ZUNocm9taXVtTWFjOjpwYWludChTY3JvbGxiYXIqIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0 KiBjb24KICAgICAgICAgICAgIHNjcm9sbGJhci0+Y29udHJvbFNpemUoKSA9PSBSZWd1bGFyU2Ny b2xsYmFyID8gQ2hyb21pdW1CcmlkZ2U6OlNpemVSZWd1bGFyIDogQ2hyb21pdW1CcmlkZ2U6OlNp emVTbWFsbCwKICAgICAgICAgICAgIHNjcm9sbGJhci0+ZnJhbWVSZWN0KCksCiAgICAgICAgICAg ICBzY3JvbGxiYXJJbmZvKTsKLSNlbHNlCi0gICAgICAgIHRyYWNrSW5mby5hdHRyaWJ1dGVzIHw9 IChrVGhlbWVUcmFja1Nob3dUaHVtYiB8IGtUaGVtZVRyYWNrSGlkZVRyYWNrKTsKLSAgICAgICAg SElUaGVtZURyYXdUcmFjaygmdHJhY2tJbmZvLCAwLCBkcmF3aW5nQ29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCksIGtISVRoZW1lT3JpZW50YXRpb25Ob3JtYWwpOwotI2VuZGlmCiAgICAgfQogCiAg ICAgaWYgKCFjYW5EcmF3RGlyZWN0bHkpCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1YWUxNzEyNjIwMjM1OGI3 ZGI1MDYyYmI0ZDJjYWNhZmNkZTkwZWExLi4zNjQyMDc0MjM1MzY3ODVmZDFmNzI3NjJmM2M0NzRm MzI2ZDhjNDIyIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMS0wMS0wNyAgTWlo YWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBGaXNoZXIuCisKKyAgICAgICAgW0Nocm9taXVtXSBTY3JvbGxiYXIgY29kZSBjbGVh bnVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjA3 MworCisgICAgICAgIFNjcm9sbGJhciBjb2RlIGNsZWFudXA6CisgICAgICAgIC0gRml4IHR5cG8g aW4gTGludXggc2Nyb2xsYmFyIGVudW0gbmFtZQorCisgICAgICAgICogcHVibGljL2xpbnV4L1dl YlRoZW1lRW5naW5lLmg6CisgICAgICAgICogc3JjL0Nocm9taXVtQnJpZGdlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OldlYlRoZW1lUGFydCk6CisgICAgICAgIChXZWJDb3JlOjpHZXRXZWJUaGVt ZUV4dHJhUGFyYW1zKToKKwogMjAxMS0wMS0wNSAgWmhlbnlhbyBNbyAgPHptb0Bnb29nbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdpbmUuaCBiL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdpbmUuaAppbmRleCBmZDcyY2Y3ZTliYzY3OWRk YzE1OGRjMDE2NGQ5OWZiNjk4OTJhMzkwLi42ZjhjZGM3YjFiMDk3ZDMwODg1MGE2YTdhZjVhY2My MDllNzllMzAxIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL2xpbnV4L1dlYlRo ZW1lRW5naW5lLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJUaGVtZUVu Z2luZS5oCkBAIC0zOSw2ICszOSw5IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBzdHJ1Y3QgV2Vi UmVjdDsKIAorLy8gRklYTUU6IFJlbW92ZSBvbmNlIHdlYmtpdC9nbHVlL3dlYnRoZW1lZW5naW5l X2ltcGxfbGludXguYyBoYXMgYmVlbiB1cGRhdGVkIHRvIHVzZSB0aGUgY29ycmVjdCBzcGVsbGlu Zy4KKyNkZWZpbmUgUGFydFNjcm9sbGJhckhvcml6dG9uYWxUcmFjayBQYXJ0U2Nyb2xsYmFySG9y aXpvbnRhbFRyYWNrCisKIGNsYXNzIFdlYlRoZW1lRW5naW5lIHsKIHB1YmxpYzoKICAgICAvLyBU aGUgVUkgcGFydCB3aGljaCBpcyBiZWluZyBhY2Nlc3NlZC4KQEAgLTQ5LDcgKzUyLDcgQEAgcHVi bGljOgogICAgICAgICBQYXJ0U2Nyb2xsYmFyVXBBcnJvdywKICAgICAgICAgUGFydFNjcm9sbGJh ckhvcml6b250YWxUaHVtYiwKICAgICAgICAgUGFydFNjcm9sbGJhclZlcnRpY2FsVGh1bWIsCi0g ICAgICAgIFBhcnRTY3JvbGxiYXJIb3JpenRvbmFsVHJhY2ssCisgICAgICAgIFBhcnRTY3JvbGxi YXJIb3Jpem9udGFsVHJhY2ssCiAgICAgICAgIFBhcnRTY3JvbGxiYXJWZXJ0aWNhbFRyYWNrCiAg ICAgfTsKIApAQCAtNjEsNyArNjQsNyBAQCBwdWJsaWM6CiAgICAgICAgIFN0YXRlUHJlc3NlZCwK ICAgICB9OwogCi0gICAgLy8gRXh0cmEgcGFyYW1ldGVycyBmb3IgZHJhd2luZyB0aGUgUGFydFNj cm9sbGJhckhvcml6dG9uYWxUcmFjayBhbmQKKyAgICAvLyBFeHRyYSBwYXJhbWV0ZXJzIGZvciBk cmF3aW5nIHRoZSBQYXJ0U2Nyb2xsYmFySG9yaXpvbnRhbFRyYWNrIGFuZAogICAgIC8vIFBhcnRT Y3JvbGxiYXJWZXJ0aWNhbFRyYWNrLgogICAgIHN0cnVjdCBTY3JvbGxiYXJUcmFja0V4dHJhUGFy YW1zIHsKICAgICAgICAgLy8gVGhlIGJvdW5kcyBvZiB0aGUgZW50aXJlIHRyYWNrLCBhcyBvcHBv c2VkIHRvIHRoZSBwYXJ0IGJlaW5nIHBhaW50ZWQuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21p dW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1C cmlkZ2UuY3BwCmluZGV4IDRlMjcxNGYyYmEzNTIzMThkMDU5NmMxNDAwOWIwNGEyMTgwMTUyNDQu LjM4YTNmMWQ1N2E2MDhiZDkwMjgzNGMxYTc2MTRhYmJkOWY3NGZiOGYgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1 bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCkBAIC04MDMsNyArODAzLDcgQEAgc3RhdGljIFdlYlRo ZW1lRW5naW5lOjpQYXJ0IFdlYlRoZW1lUGFydChDaHJvbWl1bUJyaWRnZTo6VGhlbWVQYXJ0IHBh cnQpCiAgICAgY2FzZSBDaHJvbWl1bUJyaWRnZTo6UGFydFNjcm9sbGJhclVwQXJyb3c6IHJldHVy biBXZWJUaGVtZUVuZ2luZTo6UGFydFNjcm9sbGJhclVwQXJyb3c7CiAgICAgY2FzZSBDaHJvbWl1 bUJyaWRnZTo6UGFydFNjcm9sbGJhckhvcml6b250YWxUaHVtYjogcmV0dXJuIFdlYlRoZW1lRW5n aW5lOjpQYXJ0U2Nyb2xsYmFySG9yaXpvbnRhbFRodW1iOwogICAgIGNhc2UgQ2hyb21pdW1Ccmlk Z2U6OlBhcnRTY3JvbGxiYXJWZXJ0aWNhbFRodW1iOiByZXR1cm4gV2ViVGhlbWVFbmdpbmU6OlBh cnRTY3JvbGxiYXJWZXJ0aWNhbFRodW1iOwotICAgIGNhc2UgQ2hyb21pdW1CcmlkZ2U6OlBhcnRT Y3JvbGxiYXJIb3JpenRvbmFsVHJhY2s6IHJldHVybiBXZWJUaGVtZUVuZ2luZTo6UGFydFNjcm9s bGJhckhvcml6dG9uYWxUcmFjazsKKyAgICBjYXNlIENocm9taXVtQnJpZGdlOjpQYXJ0U2Nyb2xs YmFySG9yaXpvbnRhbFRyYWNrOiByZXR1cm4gV2ViVGhlbWVFbmdpbmU6OlBhcnRTY3JvbGxiYXJI b3Jpem9udGFsVHJhY2s7CiAgICAgY2FzZSBDaHJvbWl1bUJyaWRnZTo6UGFydFNjcm9sbGJhclZl cnRpY2FsVHJhY2s6IHJldHVybiBXZWJUaGVtZUVuZ2luZTo6UGFydFNjcm9sbGJhclZlcnRpY2Fs VHJhY2s7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtODI0LDcgKzgyNCw3 IEBAIHN0YXRpYyBXZWJUaGVtZUVuZ2luZTo6U3RhdGUgV2ViVGhlbWVTdGF0ZShDaHJvbWl1bUJy aWRnZTo6VGhlbWVQYWludFN0YXRlIHN0YXRlCiAKIHN0YXRpYyB2b2lkIEdldFdlYlRoZW1lRXh0 cmFQYXJhbXMoQ2hyb21pdW1CcmlkZ2U6OlRoZW1lUGFydCBwYXJ0LCBDaHJvbWl1bUJyaWRnZTo6 VGhlbWVQYWludFN0YXRlIHN0YXRlLCBjb25zdCBDaHJvbWl1bUJyaWRnZTo6VGhlbWVQYWludEV4 dHJhUGFyYW1zKiBleHRyYVBhcmFtcywgV2ViVGhlbWVFbmdpbmU6OkV4dHJhUGFyYW1zKiB3ZWJU aGVtZUV4dHJhUGFyYW1zKQogewotICAgIGlmIChwYXJ0ID09IENocm9taXVtQnJpZGdlOjpQYXJ0 U2Nyb2xsYmFySG9yaXp0b25hbFRyYWNrIHx8IHBhcnQgPT0gQ2hyb21pdW1CcmlkZ2U6OlBhcnRT Y3JvbGxiYXJWZXJ0aWNhbFRyYWNrKSB7CisgICAgaWYgKHBhcnQgPT0gQ2hyb21pdW1CcmlkZ2U6 OlBhcnRTY3JvbGxiYXJIb3Jpem9udGFsVHJhY2sgfHwgcGFydCA9PSBDaHJvbWl1bUJyaWRnZTo6 UGFydFNjcm9sbGJhclZlcnRpY2FsVHJhY2spIHsKICAgICAgICAgd2ViVGhlbWVFeHRyYVBhcmFt cy0+c2Nyb2xsYmFyVHJhY2sudHJhY2tYID0gZXh0cmFQYXJhbXMtPnNjcm9sbGJhclRyYWNrLnRy YWNrWDsKICAgICAgICAgd2ViVGhlbWVFeHRyYVBhcmFtcy0+c2Nyb2xsYmFyVHJhY2sudHJhY2tZ ID0gZXh0cmFQYXJhbXMtPnNjcm9sbGJhclRyYWNrLnRyYWNrWTsKICAgICAgICAgd2ViVGhlbWVF eHRyYVBhcmFtcy0+c2Nyb2xsYmFyVHJhY2sudHJhY2tXaWR0aCA9IGV4dHJhUGFyYW1zLT5zY3Jv bGxiYXJUcmFjay50cmFja1dpZHRoOwo=