81552 2012-03-19 13:32:11 -0700 [chromium] Push culled tiles that are prepainted 2012-03-19 20:11:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 81529 1 danakj danakj backer cc-bugs enne jamesr piman reveman webkit.review.bot oldest_to_newest 582152 0 danakj 2012-03-19 13:32:11 -0700 [chromium] Push culled tiles that are prepainted 582156 1 132652 danakj 2012-03-19 13:34:08 -0700 Created attachment 132652 Patch 582184 2 danakj 2012-03-19 13:49:05 -0700 To be clear, during an idle paint, we still attempt to VisiblePaint, which would mark the tile culled. Then even though we would actually idle-paint the tile, we would not push it to the impl thread. 582288 3 132678 danakj 2012-03-19 14:55:01 -0700 Created attachment 132678 Patch 582289 4 132652 danakj 2012-03-19 14:56:13 -0700 Comment on attachment 132652 Patch Fix this up a bit. I want a tile to be marked as "updated" ie not culled if it was updated on any pass through prepareToUpdateTiles. Previous version depended on the fact that PaintVisible culled and PaintIdle did not, this one is more robust. 582498 5 132652 enne 2012-03-19 17:19:17 -0700 Comment on attachment 132652 Patch Looks good to me. 582505 6 132678 enne 2012-03-19 17:27:40 -0700 Comment on attachment 132678 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132678&action=review I like this one better too. One small nit: > Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp:-432 > - tile->m_updateCulled = true; Can you add an assert(!tile->m_updated) here, since this would cause issues if m_updateRect got touched but somehow m_updated was true? 582531 7 132678 danakj 2012-03-19 17:42:46 -0700 Comment on attachment 132678 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132678&action=review >> Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp:-432 >> - tile->m_updateCulled = true; > > Can you add an assert(!tile->m_updated) here, since this would cause issues if m_updateRect got touched but somehow m_updated was true? Yeh, great plan. Thanks. 582541 8 132737 danakj 2012-03-19 17:53:04 -0700 Created attachment 132737 Patch 582668 9 132737 webkit.review.bot 2012-03-19 20:11:01 -0700 Comment on attachment 132737 Patch Clearing flags on attachment: 132737 Committed r111335: <http://trac.webkit.org/changeset/111335> 582669 10 webkit.review.bot 2012-03-19 20:11:05 -0700 All reviewed patches have been landed. Closing bug. 132652 2012-03-19 13:34:08 -0700 2012-03-19 17:19:17 -0700 Patch bug-81552-20120319163407.patch text/plain 5813 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTE1YTBmMGRhMmU3MzZl NDI3YzYyZjRhYWJhMjAzYTVkYzg2YmIzMy4uZTNmMjRmNTNjNTI0NWZmZjA2NGJlYzdmYTlkOTlj ZTUzM2U5YzQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAzLTE5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUHVz aCBjdWxsZWQgdGlsZXMgdGhhdCBhcmUgcHJlcGFpbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiBhIHRpbGUgd2FzIGN1bGxlZCBkdXJpbmcgcGFp bnQsIGJ1dCB0aGVuIHByZXBhaW50ZWQgaW4gdGhlIGZvbGxvd2luZworICAgICAgICBpZGxlIHBh aW50IHBhc3MsIGl0IHdhcyBzdGlsbCBtYXJrZWQgYXMgY3VsbGVkIChhbmQgdGh1cyBkaXJ0eSkg YW5kIG5vdAorICAgICAgICBwdXNoZWQgdG8gdGhlIGltcGwgc2lkZS4KKworICAgICAgICBVbml0 IHRlc3Q6IFRpbGVkTGF5ZXJDaHJvbWl1bVRlc3QucHVzaElkbGVQYWludGVkT2NjbHVkZWRUaWxl cworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9t aXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkTGF5ZXJDaHJvbWl1bTo6cHJlcGFyZVRv VXBkYXRlVGlsZXMpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRMYXllckNocm9taXVtOjpyZXNl dFVwZGF0ZVN0YXRlKToKKwogMjAxMi0wMy0xOSAgTGVvIFlhbmcgIDxsZW8ueWFuZ0B0b3JjaG1v YmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEFkZCBQbGF0Zm9ybU1lZGlhRW5n aW5lQ2xhc3NOYW1lIGZvciBibGFja2JlcnJ5IGluIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxh eWVyLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCAzODUyOGE0ODdjOWI5ZWU0Yzcz YTc5ODU0M2M3OGY4NWUzNDY4ZmEzLi5kZDFhMTY3NTU3OGI3ZDFlZGYzZmVmMDRjOTZjOWY2Yjky NDY2ZTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEy LTAzLTE5ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFtj aHJvbWl1bV0gUHVzaCBjdWxsZWQgdGlsZXMgdGhhdCBhcmUgcHJlcGFpbnRlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE1NTIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL1RpbGVkTGF5ZXJD aHJvbWl1bVRlc3QuY3BwOgorICAgICAgICAoV1RGOjpURVNUKToKKyAgICAgICAgKFdURik6CisK KzIwMTItMDMtMTkgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKICAgICAg ICAgW2Nocm9taXVtXSBVbml0IHRlc3QgZml4LCBzYXZlIHRoZSBzaGFyZWRRdWFkU3RhdGUgd2hp bGUgdGhlIHF1YWRzIGhvbGQgYSBwb2ludGVyIHRvIGl0CiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTQ3NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9t aXVtLmNwcAppbmRleCBmN2E0MDA4NjIxYmE0NmY2ZTg0YTJkNzk4ZTFhMjg3NDhlNDFjOTNlLi4y ZTBmM2RiMzY2NzdlZWNjOGUzZjg0ZjdjZjg2Yjk2OTU4Y2E4Yzk4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVk TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTQxNyw2ICs0MTcsMTAgQEAgdm9pZCBUaWxlZExheWVyQ2hy b21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKGJvb2wgaWRsZSwgaW50IGxlZnQsIGludCB0b3As IGludAogICAgICAgICAgICAgLy8gU2F2ZSB0aGUgZGlydHkgcmVjdCBzaW5jZSBXZWJLaXQgY2Fu IGNoYW5nZSB0aGUgdGlsZSdzIGRpcnR5IHJlY3QgZHVyaW5nIHBhaW50aW5nLgogICAgICAgICAg ICAgdGlsZS0+bV91cGRhdGVSZWN0ID0gdGlsZS0+bV9kaXJ0eVJlY3Q7CiAKKyAgICAgICAgICAg IC8vIFdlIGNvbWUgdGhyb3VnaCB0aGlzIGZ1bmN0aW9uIG11bHRpcGxlIHRpbWVzIGR1cmluZyBh IGNvbW1pdCwgYW5kIHRoaXMgdmFsdWUgc2hvdWxkIGJlIHRydWUgb25seSBpZiB0aGUKKyAgICAg ICAgICAgIC8vIHRpbGUgaXMgY3VsbGVkIGV2ZXJ5IHRpbWUgdGhyb3VnaCB0aGUgZnVuY3Rpb24u CisgICAgICAgICAgICB0aWxlLT5tX3VwZGF0ZUN1bGxlZCA9IGZhbHNlOworCiAgICAgICAgICAg ICAvLyBXaGVuIG5vdCBpZGxlIHBhaW50aW5nLCBpZiB0aGUgdmlzaWJsZSByZWdpb24gb2YgdGhl IHRpbGUgaXMgb2NjbHVkZWQsIGRvbid0IHJlc2VydmUgYSB0ZXh0dXJlIG9yIHVwZGF0ZSB0aGUg dGlsZS4KICAgICAgICAgICAgIC8vIElmIGFueSBwYXJ0IG9mIHRoZSB0aWxlIGlzIHZpc2libGUs IHRoZW4gd2UgbmVlZCB0byB1cGRhdGUgaXQgc28gdGhlIHRpbGUgaXMgcHVzaGVkIHRvIHRoZSBp bXBsIHRocmVhZC4KICAgICAgICAgICAgIGlmICghaWRsZSAmJiBvY2NsdXNpb24pIHsKQEAgLTQ5 OCw4ICs1MDIsOSBAQCB2b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6cHJlcGFyZVRvVXBkYXRlVGls ZXMoYm9vbCBpZGxlLCBpbnQgbGVmdCwgaW50IHRvcCwgaW50CiAgICAgICAgICAgICAvLyBtYWtl IHN1cmUgdGhhdCBzb3VyY2VSZWN0IGRvZXNuJ3QgZXh0ZW5kIG91dHNpZGUgb2YgaXQuCiAgICAg ICAgICAgICBzb3VyY2VSZWN0LmludGVyc2VjdChtX3BhaW50UmVjdCk7CiAKLSAgICAgICAgICAg IGlmICh0aWxlLT5tX3VwZGF0ZUN1bGxlZCAmJiBvY2NsdXNpb24pIHsKLSAgICAgICAgICAgICAg ICBvY2NsdXNpb24tPm92ZXJkcmF3TWV0cmljcygpLmRpZEN1bGwoVHJhbnNmb3JtYXRpb25NYXRy aXgoKSwgc291cmNlUmVjdCwgSW50UmVjdCgpKTsKKyAgICAgICAgICAgIGlmICh0aWxlLT5tX3Vw ZGF0ZUN1bGxlZCkgeworICAgICAgICAgICAgICAgIGlmIChvY2NsdXNpb24pCisgICAgICAgICAg ICAgICAgICAgIG9jY2x1c2lvbi0+b3ZlcmRyYXdNZXRyaWNzKCkuZGlkQ3VsbChUcmFuc2Zvcm1h dGlvbk1hdHJpeCgpLCBzb3VyY2VSZWN0LCBJbnRSZWN0KCkpOwogICAgICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICAgICAgfQogCkBAIC01NzAsNyArNTc1LDYgQEAgdm9pZCBUaWxlZExh eWVyQ2hyb21pdW06OnJlc2V0VXBkYXRlU3RhdGUoKQogICAgICAgICBVcGRhdGFibGVUaWxlKiB0 aWxlID0gc3RhdGljX2Nhc3Q8VXBkYXRhYmxlVGlsZSo+KGl0ZXItPnNlY29uZC5nZXQoKSk7CiAg ICAgICAgIHRpbGUtPm1fdXBkYXRlUmVjdCA9IEludFJlY3QoKTsKICAgICAgICAgdGlsZS0+bV9w YXJ0aWFsVXBkYXRlID0gZmFsc2U7Ci0gICAgICAgIHRpbGUtPm1fdXBkYXRlQ3VsbGVkID0gZmFs c2U7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L1RpbGVkTGF5ZXJDaHJvbWl1bVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9UaWxlZExheWVyQ2hyb21pdW1UZXN0LmNwcAppbmRleCA3ZWViYjk3MTQ2ODZhZWUxMTNiZTAy ZmFhZTg1NmU1MjBhNjVjMThiLi5hMmMxMDMzZTE2YTA3YzcxN2RiMWI0MGJlZjM4OGMwN2M0Y2U2 YTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RpbGVkTGF5ZXJD aHJvbWl1bVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVGlsZWRM YXllckNocm9taXVtVGVzdC5jcHAKQEAgLTM5Miw2ICszOTIsMzMgQEAgVEVTVChUaWxlZExheWVy Q2hyb21pdW1UZXN0LCBwdXNoSWRsZVBhaW50VGlsZXMpCiAgICAgfQogfQogCitURVNUKFRpbGVk TGF5ZXJDaHJvbWl1bVRlc3QsIHB1c2hJZGxlUGFpbnRlZE9jY2x1ZGVkVGlsZXMpCit7CisgICAg T3duUHRyPFRleHR1cmVNYW5hZ2VyPiB0ZXh0dXJlTWFuYWdlciA9IFRleHR1cmVNYW5hZ2VyOjpj cmVhdGUoNCoxMDI0KjEwMjQsIDIqMTAyNCoxMDI0LCAxMDI0KTsKKyAgICBSZWZQdHI8RmFrZVRp bGVkTGF5ZXJDaHJvbWl1bT4gbGF5ZXIgPSBhZG9wdFJlZihuZXcgRmFrZVRpbGVkTGF5ZXJDaHJv bWl1bSh0ZXh0dXJlTWFuYWdlci5nZXQoKSkpOworICAgIERlYnVnU2NvcGVkU2V0SW1wbFRocmVh ZCBpbXBsVGhyZWFkOworICAgIE93blB0cjxGYWtlQ0NUaWxlZExheWVySW1wbD4gbGF5ZXJJbXBs KGFkb3B0UHRyKG5ldyBGYWtlQ0NUaWxlZExheWVySW1wbCgwKSkpOworICAgIFRlc3RDQ09jY2x1 c2lvblRyYWNrZXIgb2NjbHVkZWQ7CisKKyAgICBGYWtlVGV4dHVyZUFsbG9jYXRvciB0ZXh0dXJl QWxsb2NhdG9yOworICAgIENDVGV4dHVyZVVwZGF0ZXIgdXBkYXRlcigmdGV4dHVyZUFsbG9jYXRv cik7CisKKyAgICAvLyBUaGUgdGlsZSBzaXplIGlzIDEwMHgxMDAsIHNvIHRoaXMgaW52YWxpZGF0 ZXMgb25lIG9jY2x1ZGVkIHRpbGUsIGN1bGxzIGl0IGR1cmluZyBwYWludCwgYnV0IHByZXBhaW50 cyBpdC4KKyAgICBvY2NsdWRlZC5zZXRPY2NsdXNpb24oSW50UmVjdCgwLCAwLCAxMDAsIDEwMCkp OworCisgICAgbGF5ZXItPnNldEJvdW5kcyhJbnRTaXplKDEwMCwgMTAwKSk7CisgICAgbGF5ZXIt PnNldERyYXdUcmFuc2Zvcm0oVHJhbnNmb3JtYXRpb25NYXRyaXgoMSwgMCwgMCwgMSwgbGF5ZXIt PmJvdW5kcygpLndpZHRoKCkgLyAyLjAsIGxheWVyLT5ib3VuZHMoKS5oZWlnaHQoKSAvIDIuMCkp OworICAgIGxheWVyLT5zZXRWaXNpYmxlTGF5ZXJSZWN0KEludFJlY3QoMCwgMCwgMTAwLCAxMDAp KTsKKyAgICBsYXllci0+aW52YWxpZGF0ZVJlY3QoSW50UmVjdCgwLCAwLCAxMDAsIDEwMCkpOwor ICAgIGxheWVyLT5wcmVwYXJlVG9VcGRhdGUoSW50UmVjdCgwLCAwLCAxMDAsIDEwMCksICZvY2Ns dWRlZCk7CisgICAgbGF5ZXItPnByZXBhcmVUb1VwZGF0ZUlkbGUoSW50UmVjdCgwLCAwLCAxMDAs IDEwMCksICZvY2NsdWRlZCk7CisgICAgbGF5ZXItPnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMo MCwgdXBkYXRlcik7CisgICAgbGF5ZXItPnB1c2hQcm9wZXJ0aWVzVG8obGF5ZXJJbXBsLmdldCgp KTsKKworICAgIC8vIFdlIHNob3VsZCBoYXZlIHRoZSBwcmVwYWludGVkIHRpbGUgb24gdGhlIGlt cGwgc2lkZS4KKyAgICBFWFBFQ1RfVFJVRShsYXllckltcGwtPmhhc1RpbGVBdCgwLCAwKSk7Cit9 CisKIFRFU1QoVGlsZWRMYXllckNocm9taXVtVGVzdCwgcHVzaFRpbGVzTWFya2VkRGlydHlEdXJp bmdQYWludCkKIHsKICAgICBPd25QdHI8VGV4dHVyZU1hbmFnZXI+IHRleHR1cmVNYW5hZ2VyID0g VGV4dHVyZU1hbmFnZXI6OmNyZWF0ZSg0KjEwMjQqMTAyNCwgMioxMDI0KjEwMjQsIDEwMjQpOwo= 132678 2012-03-19 14:55:01 -0700 2012-03-19 17:53:00 -0700 Patch bug-81552-20120319175459.patch text/plain 7686 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQ5ZDM5N2M1ZGQyOTJk NThhNmEzZDYzOWIyNDM0ZjZmZGM3NDc5NC4uMjIzNWRlZmYxZjMwNTMzNzlmZjM3YjY1ZjczYWY4 MGVlNWRkMjUxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTAzLTE5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFtjaHJvbWl1bV0gUHVz aCBjdWxsZWQgdGlsZXMgdGhhdCBhcmUgcHJlcGFpbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiBhIHRpbGUgd2FzIGN1bGxlZCBkdXJpbmcgcGFp bnQsIGJ1dCB0aGVuIHByZXBhaW50ZWQgaW4gdGhlIGZvbGxvd2luZworICAgICAgICBpZGxlIHBh aW50IHBhc3MsIGl0IHdhcyBzdGlsbCBtYXJrZWQgYXMgY3VsbGVkIChhbmQgdGh1cyBkaXJ0eSkg YW5kIG5vdAorICAgICAgICBwdXNoZWQgdG8gdGhlIGltcGwgc2lkZS4KKworICAgICAgICBSZW5h bWVzIHRpbGUtPm1fdXBkYXRlQ3VsbGVkIHRvIHRpbGUtPm1fdXBkYXRlZC4gVGhpcyB2YWx1ZSBp cyB0cnVlIGlmCisgICAgICAgIHRoZSB0aWxlIGlzIHVwZGF0ZWQgYW55IHRpbWUgZHVyaW5nIGEg Y29tbWl0LCBhbmQgcmVtYWlucyBmYWxzZSBpZiBpdAorICAgICAgICBpcyBjdWxsZWQgZXZlcnkg dGltZSB0aGUgbGF5ZXIgaXMgcGFpbnRlZC4KKworICAgICAgICBVbml0IHRlc3Q6IFRpbGVkTGF5 ZXJDaHJvbWl1bVRlc3QucHVzaElkbGVQYWludGVkT2NjbHVkZWRUaWxlcworCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlVwZGF0YWJsZVRpbGU6OmlzRGlydHlGb3JDdXJyZW50RnJhbWUpOgorICAg ICAgICAoVXBkYXRhYmxlVGlsZSk6CisgICAgICAgIChXZWJDb3JlOjpVcGRhdGFibGVUaWxlOjpV cGRhdGFibGVUaWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkTGF5ZXJDaHJvbWl1bTo6dXBk YXRlQ29tcG9zaXRvclJlc291cmNlcyk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExheWVyQ2hy b21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkTGF5 ZXJDaHJvbWl1bTo6cmVzZXRVcGRhdGVTdGF0ZSk6CisKKzIwMTItMDMtMTkgIERhbmEgSmFuc2Vu cyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW2Nocm9taXVtXSBJbnZhbGlkYXRl L3VwZGF0ZSBldmljdGVkIHRpbGVzIGR1cmluZyBjb21taXQKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNTI5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKaW5kZXggMjJjNmI0MGQ1ZDA1MmJlZDYyNjNjZjhiYTAyYmZhZGNjYjdlN2UzZi4uZTEzZDk4 ZDA3ODNmY2M4ZWNiODU0ZTI2ZDk4YzJlZGU0Y2YwMzIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAxMi0wMy0xOSAgRGFuYSBKYW5zZW5zICA8ZGFuYWtq QGNocm9taXVtLm9yZz4KIAorICAgICAgICBbY2hyb21pdW1dIFB1c2ggY3VsbGVkIHRpbGVzIHRo YXQgYXJlIHByZXBhaW50ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTgxNTUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB0ZXN0cy9UaWxlZExheWVyQ2hyb21pdW1UZXN0LmNwcDoKKyAgICAgICAgKFdU Rjo6VEVTVCk6CisgICAgICAgIChXVEYpOgorCisyMDEyLTAzLTE5ICBEYW5hIEphbnNlbnMgIDxk YW5ha2pAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFtjaHJvbWl1bV0gSW52YWxpZGF0ZS91cGRh dGUgZXZpY3RlZCB0aWxlcyBkdXJpbmcgY29tbWl0CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTUyOQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9taXVt LmNwcAppbmRleCA3Yjg2NDQ0ZmI1NWY3OTIwYzMwNDQyMmQ1Y2NiZmEwZmVkZGIxYzE2Li5iZDFi MTVlMDhlNzZiNmYxNTEzZGZjZGQwMDA2ZThkODRhNzRmMzFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5 ZXJDaHJvbWl1bS5jcHAKQEAgLTcwLDE2ICs3MCwxNiBAQCBwdWJsaWM6CiAgICAgfQogICAgIC8v IFJldHVybnMgd2hldGhlciB0aGUgbGF5ZXIgd2FzIGRpcnR5IGFuZCBub3QgdXBkYXRlZCBpbiB0 aGUgY3VycmVudCBmcmFtZS4gRm9yIHRpbGVzIHRoYXQgd2VyZSBub3QgY3VsbGVkLCB0aGUKICAg ICAvLyB1cGRhdGVSZWN0IGhvbGRzIHRoZSBhcmVhIG9mIHRoZSB0aWxlIHRoYXQgd2FzIHVwZGF0 ZWQuIE90aGVyd2lzZSwgdGhlIGFyZWEgdGhhdCB3b3VsZCBoYXZlIGJlZW4gdXBkYXRlZC4KLSAg ICBib29sIGlzRGlydHlGb3JDdXJyZW50RnJhbWUoKSB7IHJldHVybiAhbV9kaXJ0eVJlY3QuaXNF bXB0eSgpICYmIChtX3VwZGF0ZVJlY3QuaXNFbXB0eSgpIHx8IG1fdXBkYXRlQ3VsbGVkKTsgfQor ICAgIGJvb2wgaXNEaXJ0eUZvckN1cnJlbnRGcmFtZSgpIHsgcmV0dXJuICFtX2RpcnR5UmVjdC5p c0VtcHR5KCkgJiYgKG1fdXBkYXRlUmVjdC5pc0VtcHR5KCkgfHwgIW1fdXBkYXRlZCk7IH0KIAog ICAgIEludFJlY3QgbV9kaXJ0eVJlY3Q7CiAgICAgSW50UmVjdCBtX3VwZGF0ZVJlY3Q7CiAgICAg Ym9vbCBtX3BhcnRpYWxVcGRhdGU7Ci0gICAgYm9vbCBtX3VwZGF0ZUN1bGxlZDsKKyAgICBib29s IG1fdXBkYXRlZDsKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgVXBkYXRhYmxlVGlsZShQYXNzT3du UHRyPExheWVyVGV4dHVyZVVwZGF0ZXI6OlRleHR1cmU+IHRleHR1cmUpCiAgICAgICAgIDogbV9w YXJ0aWFsVXBkYXRlKGZhbHNlKQotICAgICAgICAsIG1fdXBkYXRlQ3VsbGVkKGZhbHNlKQorICAg ICAgICAsIG1fdXBkYXRlZChmYWxzZSkKICAgICAgICAgLCBtX3RleHR1cmUodGV4dHVyZSkKICAg ICB7CiAgICAgfQpAQCAtMjAwLDcgKzIwMCw3IEBAIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjp1 cGRhdGVDb21wb3NpdG9yUmVzb3VyY2VzKEdyYXBoaWNzQ29udGV4dDNEKiwgQ0NUZXh0dXJlCiAg ICAgICAgICAgICBpZiAoIXRpbGUpCiAgICAgICAgICAgICAgICAgQ1JBU0goKTsKIAotICAgICAg ICAgICAgaWYgKHRpbGUtPm1fdXBkYXRlQ3VsbGVkKQorICAgICAgICAgICAgaWYgKCF0aWxlLT5t X3VwZGF0ZWQpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIEludFJl Y3Qgc291cmNlUmVjdCA9IHRpbGUtPm1fdXBkYXRlUmVjdDsKQEAgLTQyOSwxMyArNDI5LDE2IEBA IHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpwcmVwYXJlVG9VcGRhdGVUaWxlcyhib29sIGlkbGUs IGludCBsZWZ0LCBpbnQgdG9wLCBpbnQKICAgICAgICAgICAgIGlmICghaWRsZSAmJiBvY2NsdXNp b24pIHsKICAgICAgICAgICAgICAgICBJbnRSZWN0IHZpc2libGVUaWxlUmVjdCA9IGludGVyc2Vj dGlvbihtX3RpbGVyLT50aWxlQm91bmRzKGksIGopLCB2aXNpYmxlTGF5ZXJSZWN0KCkpOwogICAg ICAgICAgICAgICAgIGlmIChvY2NsdXNpb24tPm9jY2x1ZGVkKHRoaXMsIHZpc2libGVUaWxlUmVj dCkpIHsKLSAgICAgICAgICAgICAgICAgICAgdGlsZS0+bV91cGRhdGVDdWxsZWQgPSB0cnVlOwog ICAgICAgICAgICAgICAgICAgICAvLyBTYXZlIHRoZSBhcmVhIHdlIGN1bGxlZCBmb3IgcmVjb3Jk aW5nIG1ldHJpY3MuCiAgICAgICAgICAgICAgICAgICAgIHRpbGUtPm1fdXBkYXRlUmVjdCA9IHRp bGUtPm1fZGlydHlSZWN0OwogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIC8vIFdlIGNvbWUgdGhyb3Vn aCB0aGlzIGZ1bmN0aW9uIG11bHRpcGxlIHRpbWVzIGR1cmluZyBhIGNvbW1pdCwgYW5kIG1fdXBk YXRlZCBzaG91bGQgYmUgdHJ1ZSBpZiB0aGUgdGlsZSBpcyBub3QgY3VsbGVkCisgICAgICAgICAg ICAvLyBhbnkgc2luZ2xlIHRpbWUgdGhyb3VnaCB0aGUgZnVuY3Rpb24uCisgICAgICAgICAgICB0 aWxlLT5tX3VwZGF0ZWQgPSB0cnVlOworCiAgICAgICAgICAgICAvLyBGSVhNRTogRGVjaWRlIGlm IHBhcnRpYWwgdXBkYXRlIHNob3VsZCBiZSBhbGxvd2VkIGJhc2VkIG9uIGNvc3QKICAgICAgICAg ICAgIC8vIG9mIHVwZGF0ZS4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc3Mzc2CiAgICAgICAgICAgICBpZiAodGlsZU9ubHlOZWVkc1BhcnRpYWxVcGRhdGUodGlsZSkg JiYgbGF5ZXJUcmVlSG9zdCgpICYmIGxheWVyVHJlZUhvc3QoKS0+cmVxdWVzdFBhcnRpYWxUZXh0 dXJlVXBkYXRlKCkpCkBAIC01MDQsOCArNTA3LDkgQEAgdm9pZCBUaWxlZExheWVyQ2hyb21pdW06 OnByZXBhcmVUb1VwZGF0ZVRpbGVzKGJvb2wgaWRsZSwgaW50IGxlZnQsIGludCB0b3AsIGludAog ICAgICAgICAgICAgLy8gbWFrZSBzdXJlIHRoYXQgc291cmNlUmVjdCBkb2Vzbid0IGV4dGVuZCBv dXRzaWRlIG9mIGl0LgogICAgICAgICAgICAgc291cmNlUmVjdC5pbnRlcnNlY3QobV9wYWludFJl Y3QpOwogCi0gICAgICAgICAgICBpZiAodGlsZS0+bV91cGRhdGVDdWxsZWQgJiYgb2NjbHVzaW9u KSB7Ci0gICAgICAgICAgICAgICAgb2NjbHVzaW9uLT5vdmVyZHJhd01ldHJpY3MoKS5kaWRDdWxs KFRyYW5zZm9ybWF0aW9uTWF0cml4KCksIHNvdXJjZVJlY3QsIEludFJlY3QoKSk7CisgICAgICAg ICAgICBpZiAoIXRpbGUtPm1fdXBkYXRlZCkgeworICAgICAgICAgICAgICAgIGlmIChvY2NsdXNp b24pCisgICAgICAgICAgICAgICAgICAgIG9jY2x1c2lvbi0+b3ZlcmRyYXdNZXRyaWNzKCkuZGlk Q3VsbChUcmFuc2Zvcm1hdGlvbk1hdHJpeCgpLCBzb3VyY2VSZWN0LCBJbnRSZWN0KCkpOwogICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogCkBAIC01NzYsNyArNTgwLDcg QEAgdm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnJlc2V0VXBkYXRlU3RhdGUoKQogICAgICAgICBV cGRhdGFibGVUaWxlKiB0aWxlID0gc3RhdGljX2Nhc3Q8VXBkYXRhYmxlVGlsZSo+KGl0ZXItPnNl Y29uZC5nZXQoKSk7CiAgICAgICAgIHRpbGUtPm1fdXBkYXRlUmVjdCA9IEludFJlY3QoKTsKICAg ICAgICAgdGlsZS0+bV9wYXJ0aWFsVXBkYXRlID0gZmFsc2U7Ci0gICAgICAgIHRpbGUtPm1fdXBk YXRlQ3VsbGVkID0gZmFsc2U7CisgICAgICAgIHRpbGUtPm1fdXBkYXRlZCA9IGZhbHNlOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9UaWxlZExh eWVyQ2hyb21pdW1UZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVGlsZWRM YXllckNocm9taXVtVGVzdC5jcHAKaW5kZXggODM2M2MzMWYyZmVmODg0Y2ZkYWEzNzNhYTg4ZjBh MTIyNDU0NjA1MS4uNTM2OGMyOTM0N2ZkZTMzNzhhZmI1NzUyMzZmNDZlZDEyMGRhZWIxYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9UaWxlZExheWVyQ2hyb21pdW1U ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RpbGVkTGF5ZXJDaHJv bWl1bVRlc3QuY3BwCkBAIC00MzQsNiArNDM0LDMzIEBAIFRFU1QoVGlsZWRMYXllckNocm9taXVt VGVzdCwgcHVzaElkbGVQYWludFRpbGVzKQogICAgIH0KIH0KIAorVEVTVChUaWxlZExheWVyQ2hy b21pdW1UZXN0LCBwdXNoSWRsZVBhaW50ZWRPY2NsdWRlZFRpbGVzKQoreworICAgIE93blB0cjxU ZXh0dXJlTWFuYWdlcj4gdGV4dHVyZU1hbmFnZXIgPSBUZXh0dXJlTWFuYWdlcjo6Y3JlYXRlKDQq MTAyNCoxMDI0LCAyKjEwMjQqMTAyNCwgMTAyNCk7CisgICAgUmVmUHRyPEZha2VUaWxlZExheWVy Q2hyb21pdW0+IGxheWVyID0gYWRvcHRSZWYobmV3IEZha2VUaWxlZExheWVyQ2hyb21pdW0odGV4 dHVyZU1hbmFnZXIuZ2V0KCkpKTsKKyAgICBEZWJ1Z1Njb3BlZFNldEltcGxUaHJlYWQgaW1wbFRo cmVhZDsKKyAgICBPd25QdHI8RmFrZUNDVGlsZWRMYXllckltcGw+IGxheWVySW1wbChhZG9wdFB0 cihuZXcgRmFrZUNDVGlsZWRMYXllckltcGwoMCkpKTsKKyAgICBUZXN0Q0NPY2NsdXNpb25UcmFj a2VyIG9jY2x1ZGVkOworCisgICAgRmFrZVRleHR1cmVBbGxvY2F0b3IgdGV4dHVyZUFsbG9jYXRv cjsKKyAgICBDQ1RleHR1cmVVcGRhdGVyIHVwZGF0ZXIoJnRleHR1cmVBbGxvY2F0b3IpOworCisg ICAgLy8gVGhlIHRpbGUgc2l6ZSBpcyAxMDB4MTAwLCBzbyB0aGlzIGludmFsaWRhdGVzIG9uZSBv Y2NsdWRlZCB0aWxlLCBjdWxscyBpdCBkdXJpbmcgcGFpbnQsIGJ1dCBwcmVwYWludHMgaXQuCisg ICAgb2NjbHVkZWQuc2V0T2NjbHVzaW9uKEludFJlY3QoMCwgMCwgMTAwLCAxMDApKTsKKworICAg IGxheWVyLT5zZXRCb3VuZHMoSW50U2l6ZSgxMDAsIDEwMCkpOworICAgIGxheWVyLT5zZXREcmF3 VHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4KDEsIDAsIDAsIDEsIGxheWVyLT5ib3VuZHMo KS53aWR0aCgpIC8gMi4wLCBsYXllci0+Ym91bmRzKCkuaGVpZ2h0KCkgLyAyLjApKTsKKyAgICBs YXllci0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KDAsIDAsIDEwMCwgMTAwKSk7CisgICAg bGF5ZXItPmludmFsaWRhdGVSZWN0KEludFJlY3QoMCwgMCwgMTAwLCAxMDApKTsKKyAgICBsYXll ci0+cHJlcGFyZVRvVXBkYXRlKEludFJlY3QoMCwgMCwgMTAwLCAxMDApLCAmb2NjbHVkZWQpOwor ICAgIGxheWVyLT5wcmVwYXJlVG9VcGRhdGVJZGxlKEludFJlY3QoMCwgMCwgMTAwLCAxMDApLCAm b2NjbHVkZWQpOworICAgIGxheWVyLT51cGRhdGVDb21wb3NpdG9yUmVzb3VyY2VzKDAsIHVwZGF0 ZXIpOworICAgIGxheWVyLT5wdXNoUHJvcGVydGllc1RvKGxheWVySW1wbC5nZXQoKSk7CisKKyAg ICAvLyBXZSBzaG91bGQgaGF2ZSB0aGUgcHJlcGFpbnRlZCB0aWxlIG9uIHRoZSBpbXBsIHNpZGUu CisgICAgRVhQRUNUX1RSVUUobGF5ZXJJbXBsLT5oYXNUaWxlQXQoMCwgMCkpOworfQorCiBURVNU KFRpbGVkTGF5ZXJDaHJvbWl1bVRlc3QsIHB1c2hUaWxlc01hcmtlZERpcnR5RHVyaW5nUGFpbnQp CiB7CiAgICAgT3duUHRyPFRleHR1cmVNYW5hZ2VyPiB0ZXh0dXJlTWFuYWdlciA9IFRleHR1cmVN YW5hZ2VyOjpjcmVhdGUoNCoxMDI0KjEwMjQsIDIqMTAyNCoxMDI0LCAxMDI0KTsK 132737 2012-03-19 17:53:04 -0700 2012-03-19 20:11:01 -0700 Patch bug-81552-20120319205303.patch text/plain 7587 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWUzZjViNGE1ODU3ZWFk NDhhMWRiN2FlYzRhMGRjMjgzYzNiZmYzMS4uMTRmZWFjZGY2YzljZWJiMGYwYTEyYWNiZWQ1MTRm MDVmZjRlZTllZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAzLTE5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUHVz aCBjdWxsZWQgdGlsZXMgdGhhdCBhcmUgcHJlcGFpbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBB ZHJpZW5uZSBXYWxrZXIuCisKKyAgICAgICAgSWYgYSB0aWxlIHdhcyBjdWxsZWQgZHVyaW5nIHBh aW50LCBidXQgdGhlbiBwcmVwYWludGVkIGluIHRoZSBmb2xsb3dpbmcKKyAgICAgICAgaWRsZSBw YWludCBwYXNzLCBpdCB3YXMgc3RpbGwgbWFya2VkIGFzIGN1bGxlZCAoYW5kIHRodXMgZGlydHkp IGFuZCBub3QKKyAgICAgICAgcHVzaGVkIHRvIHRoZSBpbXBsIHNpZGUuCisKKyAgICAgICAgUmVu YW1lcyB0aWxlLT5tX3VwZGF0ZUN1bGxlZCB0byB0aWxlLT5tX3VwZGF0ZWQuIFRoaXMgdmFsdWUg aXMgdHJ1ZSBpZgorICAgICAgICB0aGUgdGlsZSBpcyB1cGRhdGVkIGFueSB0aW1lIGR1cmluZyBh IGNvbW1pdCwgYW5kIHJlbWFpbnMgZmFsc2UgaWYgaXQKKyAgICAgICAgaXMgY3VsbGVkIGV2ZXJ5 IHRpbWUgdGhlIGxheWVyIGlzIHBhaW50ZWQuCisKKyAgICAgICAgVW5pdCB0ZXN0OiBUaWxlZExh eWVyQ2hyb21pdW1UZXN0LnB1c2hJZGxlUGFpbnRlZE9jY2x1ZGVkVGlsZXMKKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpVcGRhdGFibGVUaWxlOjppc0RpcnR5Rm9yQ3VycmVudEZyYW1lKToKKyAg ICAgICAgKFVwZGF0YWJsZVRpbGUpOgorICAgICAgICAoV2ViQ29yZTo6VXBkYXRhYmxlVGlsZTo6 VXBkYXRhYmxlVGlsZSk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExheWVyQ2hyb21pdW06OnVw ZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRMYXllckNo cm9taXVtOjpwcmVwYXJlVG9VcGRhdGVUaWxlcyk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExh eWVyQ2hyb21pdW06OnJlc2V0VXBkYXRlU3RhdGUpOgorCiAyMDEyLTAzLTE5ICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IFdpbmRvd3MgYnVpbGQu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGMwYzNmZWRhZDcwZGVjYTcwM2QzYWU1NzQw OTJjMzU3ZTFlOTE1NDguLjJkODJhZmUzYzFmZjg5MmVhMGQzNGQ4YjdlMTdkMjk1M2JhMmY3YzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDMtMTkg IERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVt XSBQdXNoIGN1bGxlZCB0aWxlcyB0aGF0IGFyZSBwcmVwYWludGVkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTU1MgorCisgICAgICAgIFJldmlld2Vk IGJ5IEFkcmllbm5lIFdhbGtlci4KKworICAgICAgICAqIHRlc3RzL1RpbGVkTGF5ZXJDaHJvbWl1 bVRlc3QuY3BwOgorICAgICAgICAoV1RGOjpURVNUKToKKyAgICAgICAgKFdURik6CisKIDIwMTIt MDMtMTggIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb Y2hyb21pdW1dIEltcGxlbWVudCBmbGluZy1ieS13aGVlbCBvbiBjb21wb3NpdG9yIHRocmVhZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGls ZWRMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNzE1YjhiZDM0MmM1M2Y3YmMyNWVj MDg3N2VkYjEyZGYzZDAwZWY1My4uMDg5NDRkMTUwODBmMDE5OTVkMTNlNDdjMDk2MDI2ODY3OGQx MDRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vVGlsZWRMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwCkBAIC03MiwxNiArNzIsMTYg QEAgcHVibGljOgogICAgIH0KICAgICAvLyBSZXR1cm5zIHdoZXRoZXIgdGhlIGxheWVyIHdhcyBk aXJ0eSBhbmQgbm90IHVwZGF0ZWQgaW4gdGhlIGN1cnJlbnQgZnJhbWUuIEZvciB0aWxlcyB0aGF0 IHdlcmUgbm90IGN1bGxlZCwgdGhlCiAgICAgLy8gdXBkYXRlUmVjdCBob2xkcyB0aGUgYXJlYSBv ZiB0aGUgdGlsZSB0aGF0IHdhcyB1cGRhdGVkLiBPdGhlcndpc2UsIHRoZSBhcmVhIHRoYXQgd291 bGQgaGF2ZSBiZWVuIHVwZGF0ZWQuCi0gICAgYm9vbCBpc0RpcnR5Rm9yQ3VycmVudEZyYW1lKCkg eyByZXR1cm4gIW1fZGlydHlSZWN0LmlzRW1wdHkoKSAmJiAobV91cGRhdGVSZWN0LmlzRW1wdHko KSB8fCBtX3VwZGF0ZUN1bGxlZCk7IH0KKyAgICBib29sIGlzRGlydHlGb3JDdXJyZW50RnJhbWUo KSB7IHJldHVybiAhbV9kaXJ0eVJlY3QuaXNFbXB0eSgpICYmIChtX3VwZGF0ZVJlY3QuaXNFbXB0 eSgpIHx8ICFtX3VwZGF0ZWQpOyB9CiAKICAgICBJbnRSZWN0IG1fZGlydHlSZWN0OwogICAgIElu dFJlY3QgbV91cGRhdGVSZWN0OwogICAgIGJvb2wgbV9wYXJ0aWFsVXBkYXRlOwotICAgIGJvb2wg bV91cGRhdGVDdWxsZWQ7CisgICAgYm9vbCBtX3VwZGF0ZWQ7CiBwcml2YXRlOgogICAgIGV4cGxp Y2l0IFVwZGF0YWJsZVRpbGUoUGFzc093blB0cjxMYXllclRleHR1cmVVcGRhdGVyOjpUZXh0dXJl PiB0ZXh0dXJlKQogICAgICAgICA6IG1fcGFydGlhbFVwZGF0ZShmYWxzZSkKLSAgICAgICAgLCBt X3VwZGF0ZUN1bGxlZChmYWxzZSkKKyAgICAgICAgLCBtX3VwZGF0ZWQoZmFsc2UpCiAgICAgICAg ICwgbV90ZXh0dXJlKHRleHR1cmUpCiAgICAgewogICAgIH0KQEAgLTIwMiw3ICsyMDIsNyBAQCB2 b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhHcmFwaGlj c0NvbnRleHQzRCosIENDVGV4dHVyZQogICAgICAgICAgICAgaWYgKCF0aWxlKQogICAgICAgICAg ICAgICAgIENSQVNIKCk7CiAKLSAgICAgICAgICAgIGlmICh0aWxlLT5tX3VwZGF0ZUN1bGxlZCkK KyAgICAgICAgICAgIGlmICghdGlsZS0+bV91cGRhdGVkKQogICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogCiAgICAgICAgICAgICBJbnRSZWN0IHNvdXJjZVJlY3QgPSB0aWxlLT5tX3VwZGF0ZVJl Y3Q7CkBAIC00MzEsMTMgKzQzMSwxNyBAQCB2b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6cHJlcGFy ZVRvVXBkYXRlVGlsZXMoYm9vbCBpZGxlLCBpbnQgbGVmdCwgaW50IHRvcCwgaW50CiAgICAgICAg ICAgICBpZiAoIWlkbGUgJiYgb2NjbHVzaW9uKSB7CiAgICAgICAgICAgICAgICAgSW50UmVjdCB2 aXNpYmxlVGlsZVJlY3QgPSBpbnRlcnNlY3Rpb24obV90aWxlci0+dGlsZUJvdW5kcyhpLCBqKSwg dmlzaWJsZUxheWVyUmVjdCgpKTsKICAgICAgICAgICAgICAgICBpZiAob2NjbHVzaW9uLT5vY2Ns dWRlZCh0aGlzLCB2aXNpYmxlVGlsZVJlY3QpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHRpbGUt Pm1fdXBkYXRlQ3VsbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgQVNTRVJUKCF0aWxl LT5tX3VwZGF0ZWQpOwogICAgICAgICAgICAgICAgICAgICAvLyBTYXZlIHRoZSBhcmVhIHdlIGN1 bGxlZCBmb3IgcmVjb3JkaW5nIG1ldHJpY3MuCiAgICAgICAgICAgICAgICAgICAgIHRpbGUtPm1f dXBkYXRlUmVjdCA9IHRpbGUtPm1fZGlydHlSZWN0OwogICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIC8v IFdlIGNvbWUgdGhyb3VnaCB0aGlzIGZ1bmN0aW9uIG11bHRpcGxlIHRpbWVzIGR1cmluZyBhIGNv bW1pdCwgYW5kIG1fdXBkYXRlZCBzaG91bGQgYmUgdHJ1ZSBpZiB0aGUgdGlsZSBpcyBub3QgY3Vs bGVkCisgICAgICAgICAgICAvLyBhbnkgc2luZ2xlIHRpbWUgdGhyb3VnaCB0aGUgZnVuY3Rpb24u CisgICAgICAgICAgICB0aWxlLT5tX3VwZGF0ZWQgPSB0cnVlOworCiAgICAgICAgICAgICAvLyBG SVhNRTogRGVjaWRlIGlmIHBhcnRpYWwgdXBkYXRlIHNob3VsZCBiZSBhbGxvd2VkIGJhc2VkIG9u IGNvc3QKICAgICAgICAgICAgIC8vIG9mIHVwZGF0ZS4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc3Mzc2CiAgICAgICAgICAgICBpZiAodGlsZU9ubHlOZWVkc1BhcnRp YWxVcGRhdGUodGlsZSkgJiYgbGF5ZXJUcmVlSG9zdCgpICYmIGxheWVyVHJlZUhvc3QoKS0+cmVx dWVzdFBhcnRpYWxUZXh0dXJlVXBkYXRlKCkpCkBAIC01MDUsOCArNTA5LDkgQEAgdm9pZCBUaWxl ZExheWVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKGJvb2wgaWRsZSwgaW50IGxlZnQs IGludCB0b3AsIGludAogICAgICAgICAgICAgLy8gbWFrZSBzdXJlIHRoYXQgc291cmNlUmVjdCBk b2Vzbid0IGV4dGVuZCBvdXRzaWRlIG9mIGl0LgogICAgICAgICAgICAgc291cmNlUmVjdC5pbnRl cnNlY3QobV9wYWludFJlY3QpOwogCi0gICAgICAgICAgICBpZiAodGlsZS0+bV91cGRhdGVDdWxs ZWQgJiYgb2NjbHVzaW9uKSB7Ci0gICAgICAgICAgICAgICAgb2NjbHVzaW9uLT5vdmVyZHJhd01l dHJpY3MoKS5kaWRDdWxsKFRyYW5zZm9ybWF0aW9uTWF0cml4KCksIHNvdXJjZVJlY3QsIEludFJl Y3QoKSk7CisgICAgICAgICAgICBpZiAoIXRpbGUtPm1fdXBkYXRlZCkgeworICAgICAgICAgICAg ICAgIGlmIChvY2NsdXNpb24pCisgICAgICAgICAgICAgICAgICAgIG9jY2x1c2lvbi0+b3ZlcmRy YXdNZXRyaWNzKCkuZGlkQ3VsbChUcmFuc2Zvcm1hdGlvbk1hdHJpeCgpLCBzb3VyY2VSZWN0LCBJ bnRSZWN0KCkpOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogCkBA IC01NzcsNyArNTgyLDcgQEAgdm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnJlc2V0VXBkYXRlU3Rh dGUoKQogICAgICAgICBVcGRhdGFibGVUaWxlKiB0aWxlID0gc3RhdGljX2Nhc3Q8VXBkYXRhYmxl VGlsZSo+KGl0ZXItPnNlY29uZC5nZXQoKSk7CiAgICAgICAgIHRpbGUtPm1fdXBkYXRlUmVjdCA9 IEludFJlY3QoKTsKICAgICAgICAgdGlsZS0+bV9wYXJ0aWFsVXBkYXRlID0gZmFsc2U7Ci0gICAg ICAgIHRpbGUtPm1fdXBkYXRlQ3VsbGVkID0gZmFsc2U7CisgICAgICAgIHRpbGUtPm1fdXBkYXRl ZCA9IGZhbHNlOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9UaWxlZExheWVyQ2hyb21pdW1UZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvVGlsZWRMYXllckNocm9taXVtVGVzdC5jcHAKaW5kZXggODM2M2MzMWYyZmVmODg0 Y2ZkYWEzNzNhYTg4ZjBhMTIyNDU0NjA1MS4uNTM2OGMyOTM0N2ZkZTMzNzhhZmI1NzUyMzZmNDZl ZDEyMGRhZWIxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9UaWxl ZExheWVyQ2hyb21pdW1UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L1RpbGVkTGF5ZXJDaHJvbWl1bVRlc3QuY3BwCkBAIC00MzQsNiArNDM0LDMzIEBAIFRFU1QoVGls ZWRMYXllckNocm9taXVtVGVzdCwgcHVzaElkbGVQYWludFRpbGVzKQogICAgIH0KIH0KIAorVEVT VChUaWxlZExheWVyQ2hyb21pdW1UZXN0LCBwdXNoSWRsZVBhaW50ZWRPY2NsdWRlZFRpbGVzKQor eworICAgIE93blB0cjxUZXh0dXJlTWFuYWdlcj4gdGV4dHVyZU1hbmFnZXIgPSBUZXh0dXJlTWFu YWdlcjo6Y3JlYXRlKDQqMTAyNCoxMDI0LCAyKjEwMjQqMTAyNCwgMTAyNCk7CisgICAgUmVmUHRy PEZha2VUaWxlZExheWVyQ2hyb21pdW0+IGxheWVyID0gYWRvcHRSZWYobmV3IEZha2VUaWxlZExh eWVyQ2hyb21pdW0odGV4dHVyZU1hbmFnZXIuZ2V0KCkpKTsKKyAgICBEZWJ1Z1Njb3BlZFNldElt cGxUaHJlYWQgaW1wbFRocmVhZDsKKyAgICBPd25QdHI8RmFrZUNDVGlsZWRMYXllckltcGw+IGxh eWVySW1wbChhZG9wdFB0cihuZXcgRmFrZUNDVGlsZWRMYXllckltcGwoMCkpKTsKKyAgICBUZXN0 Q0NPY2NsdXNpb25UcmFja2VyIG9jY2x1ZGVkOworCisgICAgRmFrZVRleHR1cmVBbGxvY2F0b3Ig dGV4dHVyZUFsbG9jYXRvcjsKKyAgICBDQ1RleHR1cmVVcGRhdGVyIHVwZGF0ZXIoJnRleHR1cmVB bGxvY2F0b3IpOworCisgICAgLy8gVGhlIHRpbGUgc2l6ZSBpcyAxMDB4MTAwLCBzbyB0aGlzIGlu dmFsaWRhdGVzIG9uZSBvY2NsdWRlZCB0aWxlLCBjdWxscyBpdCBkdXJpbmcgcGFpbnQsIGJ1dCBw cmVwYWludHMgaXQuCisgICAgb2NjbHVkZWQuc2V0T2NjbHVzaW9uKEludFJlY3QoMCwgMCwgMTAw LCAxMDApKTsKKworICAgIGxheWVyLT5zZXRCb3VuZHMoSW50U2l6ZSgxMDAsIDEwMCkpOworICAg IGxheWVyLT5zZXREcmF3VHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4KDEsIDAsIDAsIDEs IGxheWVyLT5ib3VuZHMoKS53aWR0aCgpIC8gMi4wLCBsYXllci0+Ym91bmRzKCkuaGVpZ2h0KCkg LyAyLjApKTsKKyAgICBsYXllci0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KDAsIDAsIDEw MCwgMTAwKSk7CisgICAgbGF5ZXItPmludmFsaWRhdGVSZWN0KEludFJlY3QoMCwgMCwgMTAwLCAx MDApKTsKKyAgICBsYXllci0+cHJlcGFyZVRvVXBkYXRlKEludFJlY3QoMCwgMCwgMTAwLCAxMDAp LCAmb2NjbHVkZWQpOworICAgIGxheWVyLT5wcmVwYXJlVG9VcGRhdGVJZGxlKEludFJlY3QoMCwg MCwgMTAwLCAxMDApLCAmb2NjbHVkZWQpOworICAgIGxheWVyLT51cGRhdGVDb21wb3NpdG9yUmVz b3VyY2VzKDAsIHVwZGF0ZXIpOworICAgIGxheWVyLT5wdXNoUHJvcGVydGllc1RvKGxheWVySW1w bC5nZXQoKSk7CisKKyAgICAvLyBXZSBzaG91bGQgaGF2ZSB0aGUgcHJlcGFpbnRlZCB0aWxlIG9u IHRoZSBpbXBsIHNpZGUuCisgICAgRVhQRUNUX1RSVUUobGF5ZXJJbXBsLT5oYXNUaWxlQXQoMCwg MCkpOworfQorCiBURVNUKFRpbGVkTGF5ZXJDaHJvbWl1bVRlc3QsIHB1c2hUaWxlc01hcmtlZERp cnR5RHVyaW5nUGFpbnQpCiB7CiAgICAgT3duUHRyPFRleHR1cmVNYW5hZ2VyPiB0ZXh0dXJlTWFu YWdlciA9IFRleHR1cmVNYW5hZ2VyOjpjcmVhdGUoNCoxMDI0KjEwMjQsIDIqMTAyNCoxMDI0LCAx MDI0KTsK