81953 2012-03-22 13:05:22 -0700 ASSERT(!needsLayout) in RenderView.cpp when visiting http://www.panic.com/blog/ 2012-03-22 14:15:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 585612 0 andersca 2012-03-22 13:05:22 -0700 ASSERT(!needsLayout) in RenderView.cpp when visiting http://www.panic.com/blog/ 585622 1 133330 andersca 2012-03-22 13:16:07 -0700 Created attachment 133330 Patch 585633 2 133330 buildbot 2012-03-22 13:26:53 -0700 Comment on attachment 133330 Patch Attachment 133330 did not pass win-ews (win): Output: http://queues.webkit.org/results/12116204 585646 3 133335 andersca 2012-03-22 13:36:20 -0700 Created attachment 133335 Patch 585673 4 133335 sam 2012-03-22 14:06:47 -0700 Comment on attachment 133335 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133335&action=review > Source/WebCore/ChangeLog:42 > +2012-03-22 Anders Carlsson <andersca@apple.com> > + > + > + * platform/graphics/ca/GraphicsLayerCA.cpp: > + (WebCore::GraphicsLayerCA::platformCALayerDidCreateTiles): > + * platform/graphics/ca/GraphicsLayerCA.h: > + (GraphicsLayerCA): > + * platform/graphics/ca/PlatformCALayerClient.h: > + (PlatformCALayerClient): > + * platform/graphics/ca/mac/TileCache.mm: > + (WebCore::TileCache::setScale): > + (WebCore::TileCache::revalidateTiles): > + Double ChangeLog! 585684 5 andersca 2012-03-22 14:15:14 -0700 Committed r111762: <http://trac.webkit.org/changeset/111762> 133330 2012-03-22 13:16:07 -0700 2012-03-22 13:36:17 -0700 Patch bug-81953-20120322131704.patch text/plain 7811 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU3OGE5MmVhZGJkNWI0 MmNiNzJlOTdlNDY2YjA5MDk2OTdkNTI4Ni4uN2Q3ODFmYTk2NWI0NjNhZTdmZjRhNjAxMGEzYWRj Y2VmZDY2YTZhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAzLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQVNTRVJUKCFuZWVk c0xheW91dCkgaW4gUmVuZGVyVmlldy5jcHAgd2hlbiB2aXNpdGluZyBodHRwOi8vd3d3LnBhbmlj LmNvbS9ibG9nLworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODE5NTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExMDg2OTk4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIGEgcGFnZSBlbmRzIHVwIGNy ZWF0aW5nIENBVGlsZWRMYXllcnMsIENBIHRyYW5zYWN0aW9ucyBjYW4gYmUgY29tbWl0dGVkIG91 dHNpZGUgb2YgdGhlIG5vcm1hbAorICAgICAgICBDQSBydW4gbG9vcCBvYnNlcnZlciwgc28gd2Ug Y2FuJ3QgY2FsbCBzZXROZWVkc0Rpc3BsYXkgb24gdGlsZSBjYWNoZSBsYXllcnMgZGlyZWN0bHkg YmVjYXVzZSB0aGVuCisgICAgICAgIHdlJ2xsIGVuZCB1cCBjYWxsaW5nIGludG8gcGFpbnRpbmcg Y29kZSBiZWZvcmUgYWxsIHRoZSBsYXllcnMgaGF2ZSBiZWVuIGZsdXNoZWQuCisKKyAgICAgICAg Rml4IHRoaXMgYnkgYWRkaW5nIGEgbGlzdCBvZiBkaXJ0eSByZWN0cyB0byBwbGF0Zm9ybUNBTGF5 ZXJEaWRDcmVhdGVUaWxlcyBhbmQgY2hhbmdlIEdyYXBoaWNzTGF5ZXJDQSB0bworICAgICAgICBt YXJrIHRoZW0gYXMgZGlydHkuIFRoaXMgZW5zdXJlcyB0aGF0IGFueSBDQSB0cmFuc2FjdGlvbiBj b21taXRzIHdvbid0IGNhdXNlIG5ld2x5IGFkZGVkIGxheWVycyB0byBiZSBwYWludGVkLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6cGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGls ZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oOgor ICAgICAgICAoR3JhcGhpY3NMYXllckNBKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j YS9QbGF0Zm9ybUNBTGF5ZXJDbGllbnQuaDoKKyAgICAgICAgKFBsYXRmb3JtQ0FMYXllckNsaWVu dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlRpbGVDYWNoZTo6c2V0U2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6 VGlsZUNhY2hlOjpyZXZhbGlkYXRlVGlsZXMpOgorCiAyMDEyLTAzLTIyICBBbGV4aXMgTWVuYXJk ICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIEluY3JlYXNlIGNvZGUg c2hhcmluZyBiZXR3ZWVuIENTU1BhcnNlciBhbmQgQ1NTUHJvcGVydHlMb25naGFuZC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJD QS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVy Q0EuY3BwCmluZGV4IGYzNmI4M2ZkZWI5MjRiY2M5ZjIzNzJmOGNlNzU3YWYwYjlkMzg3M2QuLmY2 Y2NiOTVkN2U3MTBhM2MxM2Y2MWYyMjAzNjc4MGViZWI2Nzc1YjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcApA QCAtOTYzLDEwICs5NjMsMTMgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnBsYXRmb3JtQ0FMYXll clBhaW50Q29udGVudHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb24KICAgICBwYWludEdy YXBoaWNzTGF5ZXJDb250ZW50cyhjb250ZXh0LCBjbGlwKTsKIH0KIAotdm9pZCBHcmFwaGljc0xh eWVyQ0E6OnBsYXRmb3JtQ0FMYXllckRpZENyZWF0ZVRpbGVzKCkKK3ZvaWQgR3JhcGhpY3NMYXll ckNBOjpwbGF0Zm9ybUNBTGF5ZXJEaWRDcmVhdGVUaWxlcyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0 PiYgZGlydHlSZWN0cykKIHsKICAgICBBU1NFUlQobV9sYXllci0+bGF5ZXJUeXBlKCkgPT0gUGxh dGZvcm1DQUxheWVyOjpMYXllclR5cGVUaWxlQ2FjaGVMYXllcik7CiAKKyAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IGRpcnR5UmVjdHMuc2l6ZSgpOyArK2kpCisgICAgICAgIHNldE5lZWRzRGlz cGxheUluUmVjdChkaXJ0eVJlY3RzW2ldKTsKKwogICAgIC8vIEVuc3VyZSB0aGF0IHRoZSBsYXlv dXQgaXMgdXAgdG8gZGF0ZSBiZWZvcmUgYW55IGluZGl2aWR1YWwgdGlsZXMgYXJlIHBhaW50ZWQg YnkgdGVsbGluZyB0aGUgY2xpZW50CiAgICAgLy8gdGhhdCBpdCBuZWVkcyB0byBzeW5jIGl0cyBs YXllciBzdGF0ZSwgd2hpY2ggd2lsbCBlbmQgdXAgc2NoZWR1bGluZyB0aGUgbGF5ZXIgZmx1c2hl ci4KICAgICBjbGllbnQoKS0+bm90aWZ5U3luY1JlcXVpcmVkKHRoaXMpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaAppbmRl eCBhMjkzZWY5OWE4M2RmODEzYjQ1Mzk3YmFkNGRjY2FlOTYwZDg1MWVkLi4wNzZkOGZmOTYyMmE4 M2JiNTgzNDJmMmZiMzJiNWRjN2Q5ZmZkNzQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaApAQCAtMTU3LDcgKzE1Nyw3 IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIHBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3Bh cXVlKCkgY29uc3QgeyByZXR1cm4gY29udGVudHNPcGFxdWUoKTsgfQogICAgIHZpcnR1YWwgYm9v bCBwbGF0Zm9ybUNBTGF5ZXJEcmF3c0NvbnRlbnQoKSBjb25zdCB7IHJldHVybiBkcmF3c0NvbnRl bnQoKTsgfQogICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNBTGF5ZXJMYXllckRpZERpc3BsYXko UGxhdGZvcm1MYXllciogbGF5ZXIpIHsgcmV0dXJuIGxheWVyRGlkRGlzcGxheShsYXllcik7IH0K LSAgICB2aXJ0dWFsIHZvaWQgcGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMoKSBPVkVSUklE RTsKKyAgICB2aXJ0dWFsIHZvaWQgcGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMoY29uc3Qg VmVjdG9yPEZsb2F0UmVjdD4mIGRpcnR5UmVjdHMpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgZmxv YXQgcGxhdGZvcm1DQUxheWVyRGV2aWNlU2NhbGVGYWN0b3IoKSBPVkVSUklERTsKIAogICAgIHZv aWQgdXBkYXRlT3BhY2l0eU9uTGF5ZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllckNsaWVudC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50LmgKaW5kZXggMDVk MzVlYmM0NWY2ZjMxODMxYjFjNWI2OTlhNmRlYTM2Nzc2YjcwMC4uOTM4OTc2YzUyZTJmODJmMjk3 NTA0NWI2NzY1YzZkZjFlZjMyZmUxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50LmgKQEAgLTU5LDcg KzU5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBwbGF0Zm9ybUNBTGF5ZXJEcmF3c0Nv bnRlbnQoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHBsYXRmb3JtQ0FMYXllckxheWVy RGlkRGlzcGxheShQbGF0Zm9ybUxheWVyKikgPSAwOwogCi0gICAgdmlydHVhbCB2b2lkIHBsYXRm b3JtQ0FMYXllckRpZENyZWF0ZVRpbGVzKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9y bUNBTGF5ZXJEaWRDcmVhdGVUaWxlcyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgZGlydHlSZWN0 cykgPSAwOwogICAgIHZpcnR1YWwgZmxvYXQgcGxhdGZvcm1DQUxheWVyRGV2aWNlU2NhbGVGYWN0 b3IoKSA9IDA7CiAKIHByb3RlY3RlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLm1tCmluZGV4IDI3NGExOTk0YTk2YjBlM2YzYThk MjRiNGI5MzIxYTdkNDBkN2YwOTQuLmQ5MzJjMWY3MjMxMmUwZThjODg5NzQ3Y2ZiYTE5YmY3ZTJh NWQ1MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21h Yy9UaWxlQ2FjaGUubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev bWFjL1RpbGVDYWNoZS5tbQpAQCAtMTgyLDYgKzE4Miw4IEBAIHZvaWQgVGlsZUNhY2hlOjpzZXRT Y2FsZShDR0Zsb2F0IHNjYWxlKQogICAgICAgICByZXR1cm47CiAKICNpZiAhZGVmaW5lZChCVUlM RElOR19PTl9MRU9QQVJEKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQpCisg ICAgVmVjdG9yPEZsb2F0UmVjdD4gZGlydHlSZWN0czsKKwogICAgIG1fZGV2aWNlU2NhbGVGYWN0 b3IgPSBkZXZpY2VTY2FsZUZhY3RvcjsKICAgICBtX3NjYWxlID0gc2NhbGU7CiAgICAgW21fdGls ZUNvbnRhaW5lckxheWVyLmdldCgpIHNldFRyYW5zZm9ybTpDQVRyYW5zZm9ybTNETWFrZVNjYWxl KDEgLyBtX3NjYWxlLCAxIC8gbV9zY2FsZSwgMSldOwpAQCAtMTkwLDEwICsxOTIsMTUgQEAgdm9p ZCBUaWxlQ2FjaGU6OnNldFNjYWxlKENHRmxvYXQgc2NhbGUpCiAKICAgICBmb3IgKFRpbGVNYXA6 OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV90aWxlcy5iZWdpbigpLCBlbmQgPSBtX3RpbGVzLmVuZCgp OyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgW2l0LT5zZWNvbmQuZ2V0KCkgc2V0Q29udGVu dHNTY2FsZTpkZXZpY2VTY2FsZUZhY3Rvcl07Ci0gICAgICAgIFtpdC0+c2Vjb25kLmdldCgpIHNl dE5lZWRzRGlzcGxheV07CisKKyAgICAgICAgSW50UmVjdCB0aWxlUmVjdCA9IHJlY3RGb3JUaWxl SW5kZXgoaXQtPmZpcnN0KTsKKyAgICAgICAgRmxvYXRSZWN0IHNjYWxlZFRpbGVSZWN0ID0gdGls ZVJlY3Q7CisKKyAgICAgICAgc2NhbGVkVGlsZVJlY3Quc2NhbGUoMSAvIG1fc2NhbGUpOworICAg ICAgICBkaXJ0eVJlY3RzLmFwcGVuZChzY2FsZWRUaWxlUmVjdCk7CiAgICAgfQogCi0gICAgcGxh dGZvcm1MYXllci0+b3duZXIoKS0+cGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMoKTsKKyAg ICBwbGF0Zm9ybUxheWVyLT5vd25lcigpLT5wbGF0Zm9ybUNBTGF5ZXJEaWRDcmVhdGVUaWxlcyhk aXJ0eVJlY3RzKTsKICNlbmRpZgogfQogCkBAIC0zNTAsNyArMzU3LDcgQEAgdm9pZCBUaWxlQ2Fj aGU6OnJldmFsaWRhdGVUaWxlcygpCiAgICAgVGlsZUluZGV4IGJvdHRvbVJpZ2h0OwogICAgIGdl dFRpbGVJbmRleFJhbmdlRm9yUmVjdCh0aWxlQ292ZXJhZ2VSZWN0LCB0b3BMZWZ0LCBib3R0b21S aWdodCk7CiAKLSAgICBib29sIGRpZENyZWF0ZU9yUmVzaXplVGlsZXMgPSBmYWxzZTsKKyAgICBW ZWN0b3I8RmxvYXRSZWN0PiBkaXJ0eVJlY3RzOwogCiAgICAgZm9yIChpbnQgeSA9IHRvcExlZnQu eSgpOyB5IDw9IGJvdHRvbVJpZ2h0LnkoKTsgKyt5KSB7CiAgICAgICAgIGZvciAoaW50IHggPSB0 b3BMZWZ0LngoKTsgeCA8PSBib3R0b21SaWdodC54KCk7ICsreCkgewpAQCAtMzU4LDIyICszNjUs MTkgQEAgdm9pZCBUaWxlQ2FjaGU6OnJldmFsaWRhdGVUaWxlcygpCiAKICAgICAgICAgICAgIElu dFJlY3QgdGlsZVJlY3QgPSByZWN0Rm9yVGlsZUluZGV4KHRpbGVJbmRleCk7CiAgICAgICAgICAg ICBSZXRhaW5QdHI8V2ViVGlsZUxheWVyPiYgdGlsZUxheWVyID0gbV90aWxlcy5hZGQodGlsZUlu ZGV4LCAwKS5maXJzdC0+c2Vjb25kOwotICAgICAgICAgICAgaWYgKHRpbGVMYXllcikgeworICAg ICAgICAgICAgaWYgKCF0aWxlTGF5ZXIpIHsKKyAgICAgICAgICAgICAgICB0aWxlTGF5ZXIgPSBj cmVhdGVUaWxlTGF5ZXIodGlsZVJlY3QpOworICAgICAgICAgICAgICAgIFttX3RpbGVDb250YWlu ZXJMYXllci5nZXQoKSBhZGRTdWJsYXllcjp0aWxlTGF5ZXIuZ2V0KCldOworICAgICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICAgICAvLyBXZSBhbHJlYWR5IGhhdmUgYSBsYXllciBmb3Ig dGhpcyB0aWxlLiBFbnN1cmUgdGhhdCBpdHMgc2l6ZSBpcyBjb3JyZWN0LgotICAgICAgICAgICAg ICAgIGlmICghQ0dTaXplRXF1YWxUb1NpemUoW3RpbGVMYXllci5nZXQoKSBmcmFtZV0uc2l6ZSwg dGlsZVJlY3Quc2l6ZSgpKSkgewotICAgICAgICAgICAgICAgICAgICBbdGlsZUxheWVyLmdldCgp IHNldEZyYW1lOnRpbGVSZWN0XTsKLSAgICAgICAgICAgICAgICAgICAgW3RpbGVMYXllci5nZXQo KSBzZXROZWVkc0Rpc3BsYXldOwotICAgICAgICAgICAgICAgICAgICBkaWRDcmVhdGVPclJlc2l6 ZVRpbGVzID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgICAgICAgICAgaWYgKENHU2l6ZUVxdWFsVG9TaXplKFt0aWxlTGF5ZXIuZ2V0 KCkgZnJhbWVdLnNpemUsIHRpbGVSZWN0LnNpemUoKSkpCisgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgICAgIFt0aWxlTGF5ZXIuZ2V0KCkgc2V0RnJhbWU6dGlsZVJl Y3RdOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBkaWRDcmVhdGVPclJlc2l6ZVRpbGVz ID0gdHJ1ZTsKLQotICAgICAgICAgICAgdGlsZUxheWVyID0gY3JlYXRlVGlsZUxheWVyKHRpbGVS ZWN0KTsKLQotICAgICAgICAgICAgW3RpbGVMYXllci5nZXQoKSBzZXROZWVkc0Rpc3BsYXldOwot ICAgICAgICAgICAgW21fdGlsZUNvbnRhaW5lckxheWVyLmdldCgpIGFkZFN1YmxheWVyOnRpbGVM YXllci5nZXQoKV07CisgICAgICAgICAgICBGbG9hdFJlY3Qgc2NhbGVkVGlsZVJlY3QgPSB0aWxl UmVjdDsKKyAgICAgICAgICAgIHNjYWxlZFRpbGVSZWN0LnNjYWxlKDEgLyBtX3NjYWxlKTsKKyAg ICAgICAgICAgIGRpcnR5UmVjdHMuYXBwZW5kKHNjYWxlZFRpbGVSZWN0KTsKICAgICAgICAgfQog ICAgIH0KIApAQCAtMzg0LDEwICszODgsNyBAQCB2b2lkIFRpbGVDYWNoZTo6cmV2YWxpZGF0ZVRp bGVzKCkKICAgICAgICAgbV90aWxlQ292ZXJhZ2VSZWN0LnVuaXRlKHJlY3RGb3JUaWxlSW5kZXgo dGlsZUluZGV4KSk7CiAgICAgfQogCi0gICAgaWYgKCFkaWRDcmVhdGVPclJlc2l6ZVRpbGVzKQot ICAgICAgICByZXR1cm47Ci0KLSAgICBwbGF0Zm9ybUxheWVyLT5vd25lcigpLT5wbGF0Zm9ybUNB TGF5ZXJEaWRDcmVhdGVUaWxlcygpOworICAgIHBsYXRmb3JtTGF5ZXItPm93bmVyKCktPnBsYXRm b3JtQ0FMYXllckRpZENyZWF0ZVRpbGVzKGRpcnR5UmVjdHMpOwogfQogCiBXZWJUaWxlTGF5ZXIq IFRpbGVDYWNoZTo6dGlsZUxheWVyQXRJbmRleChjb25zdCBUaWxlSW5kZXgmIGluZGV4KSBjb25z dAo= 133335 2012-03-22 13:36:20 -0700 2012-03-22 14:06:47 -0700 Patch bug-81953-20120322133717.patch text/plain 12143 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU3OGE5MmVhZGJkNWI0 MmNiNzJlOTdlNDY2YjA5MDk2OTdkNTI4Ni4uZTZmOTFmOGU2ZGIwYTcwOWRlN2U2MjA3Yjk4M2Y0 Mzk1YjMxZjMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDEyLTAzLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQVNTRVJUKCFuZWVk c0xheW91dCkgaW4gUmVuZGVyVmlldy5jcHAgd2hlbiB2aXNpdGluZyBodHRwOi8vd3d3LnBhbmlj LmNvbS9ibG9nLworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODE5NTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExMDg2OTk4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIGEgcGFnZSBlbmRzIHVwIGNy ZWF0aW5nIENBVGlsZWRMYXllcnMsIENBIHRyYW5zYWN0aW9ucyBjYW4gYmUgY29tbWl0dGVkIG91 dHNpZGUgb2YgdGhlIG5vcm1hbAorICAgICAgICBDQSBydW4gbG9vcCBvYnNlcnZlciwgc28gd2Ug Y2FuJ3QgY2FsbCBzZXROZWVkc0Rpc3BsYXkgb24gdGlsZSBjYWNoZSBsYXllcnMgZGlyZWN0bHkg YmVjYXVzZSB0aGVuCisgICAgICAgIHdlJ2xsIGVuZCB1cCBjYWxsaW5nIGludG8gcGFpbnRpbmcg Y29kZSBiZWZvcmUgYWxsIHRoZSBsYXllcnMgaGF2ZSBiZWVuIGZsdXNoZWQuCisKKyAgICAgICAg Rml4IHRoaXMgYnkgYWRkaW5nIGEgbGlzdCBvZiBkaXJ0eSByZWN0cyB0byBwbGF0Zm9ybUNBTGF5 ZXJEaWRDcmVhdGVUaWxlcyBhbmQgY2hhbmdlIEdyYXBoaWNzTGF5ZXJDQSB0bworICAgICAgICBt YXJrIHRoZW0gYXMgZGlydHkuIFRoaXMgZW5zdXJlcyB0aGF0IGFueSBDQSB0cmFuc2FjdGlvbiBj b21taXRzIHdvbid0IGNhdXNlIG5ld2x5IGFkZGVkIGxheWVycyB0byBiZSBwYWludGVkLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbkNGLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2xpZW50Ojpw bGF0Zm9ybUNBTGF5ZXJEaWRDcmVhdGVUaWxlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXJDQTo6cGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oOgorICAgICAgICAoR3JhcGhpY3NMYXllckNB KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXJDbGllbnQu aDoKKyAgICAgICAgKFBsYXRmb3JtQ0FMYXllckNsaWVudCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVDYWNo ZTo6c2V0U2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZUNhY2hlOjpyZXZhbGlkYXRlVGls ZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVR dWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQ6OkxheWVyQ2xpZW50OjpwbGF0Zm9ybUNBTGF5 ZXJEaWRDcmVhdGVUaWxlcyk6CisKKzIwMTItMDMtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KKworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhp Y3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6cGxhdGZv cm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nh L0dyYXBoaWNzTGF5ZXJDQS5oOgorICAgICAgICAoR3JhcGhpY3NMYXllckNBKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXJDbGllbnQuaDoKKyAgICAgICAg KFBsYXRmb3JtQ0FMYXllckNsaWVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev bWFjL1RpbGVDYWNoZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVDYWNoZTo6c2V0U2NhbGUp OgorICAgICAgICAoV2ViQ29yZTo6VGlsZUNhY2hlOjpyZXZhbGlkYXRlVGlsZXMpOgorCiAyMDEy LTAzLTIyICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgogCiAg ICAgICAgIEluY3JlYXNlIGNvZGUgc2hhcmluZyBiZXR3ZWVuIENTU1BhcnNlciBhbmQgQ1NTUHJv cGVydHlMb25naGFuZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCBlNDI1ZjU3ZmJhZWUyMmUzOTljMzg4 MjA0ZTBhZmUxZjljMjk2ODMxLi5iZTNkNWI4YmEwNDMyY2NhZTM5MDg0NzExOTg5NjRmOWFkOWEz NTc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDMtMjIgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBBU1NFUlQoIW5lZWRz TGF5b3V0KSBpbiBSZW5kZXJWaWV3LmNwcCB3aGVuIHZpc2l0aW5nIGh0dHA6Ly93d3cucGFuaWMu Y29tL2Jsb2cvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MTk1MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTEwODY5OTg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIGZvciBjaGFuZ2VzIHRv IFdlYkNvcmUuCisKKyAgICAgICAgKiBGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcDoKKyAg ICAgICAgKEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OkxheWVyQ2xpZW50OjpwbGF0Zm9ybUNB TGF5ZXJEaWRDcmVhdGVUaWxlcyk6CisKIDIwMTItMDMtMjAgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxz ZmFsa2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIFdURi1yZWxhdGVkIFdpbmRvd3MgcHJv amVjdCBmaWxlcyBvdXQgb2YgSmF2YVNjcmlwdENvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25DRi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCmluZGV4IDNm OWM4NWQ2OTIyNTI2NDc3ZmM0NWE2MGY1MTc4MTY5NzkxYjkzZDYuLjg3NWQxMmRmYmU3YmI0MjIx YmU3NTUyNGY4MWFjZDIwN2NhM2E3ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25DRi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcApAQCAtMTYwLDcgKzE2 MCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIHBsYXRmb3JtQ0FMYXllckNvbnRlbnRz T3BhcXVlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgcGxhdGZv cm1DQUxheWVyRHJhd3NDb250ZW50KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0 dWFsIHZvaWQgcGxhdGZvcm1DQUxheWVyTGF5ZXJEaWREaXNwbGF5KFBsYXRmb3JtTGF5ZXIqKSB7 IH0KLSAgICB2aXJ0dWFsIHZvaWQgcGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMoKSB7IH0K KyAgICB2aXJ0dWFsIHZvaWQgcGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMoY29uc3QgVmVj dG9yPEZsb2F0UmVjdD4mKSB7IH0KICAgICB2aXJ0dWFsIGZsb2F0IHBsYXRmb3JtQ0FMYXllckRl dmljZVNjYWxlRmFjdG9yKCkgeyByZXR1cm4gMTsgfQogCiAgICAgQVZGV3JhcHBlciogbV9wYXJl bnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFw aGljc0xheWVyQ0EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3Jh cGhpY3NMYXllckNBLmNwcAppbmRleCBmMzZiODNmZGViOTI0YmNjOWYyMzcyZjhjZTc1N2FmMGI5 ZDM4NzNkLi5mNmNjYjk1ZDdlNzEwYTNjMTNmNjFmMjIwMzY3ODBlYmViNjc3NWIzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0Eu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5 ZXJDQS5jcHAKQEAgLTk2MywxMCArOTYzLDEzIEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpwbGF0 Zm9ybUNBTGF5ZXJQYWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uCiAg ICAgcGFpbnRHcmFwaGljc0xheWVyQ29udGVudHMoY29udGV4dCwgY2xpcCk7CiB9CiAKLXZvaWQg R3JhcGhpY3NMYXllckNBOjpwbGF0Zm9ybUNBTGF5ZXJEaWRDcmVhdGVUaWxlcygpCit2b2lkIEdy YXBoaWNzTGF5ZXJDQTo6cGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMoY29uc3QgVmVjdG9y PEZsb2F0UmVjdD4mIGRpcnR5UmVjdHMpCiB7CiAgICAgQVNTRVJUKG1fbGF5ZXItPmxheWVyVHlw ZSgpID09IFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlVGlsZUNhY2hlTGF5ZXIpOwogCisgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBkaXJ0eVJlY3RzLnNpemUoKTsgKytpKQorICAgICAgICBz ZXROZWVkc0Rpc3BsYXlJblJlY3QoZGlydHlSZWN0c1tpXSk7CisKICAgICAvLyBFbnN1cmUgdGhh dCB0aGUgbGF5b3V0IGlzIHVwIHRvIGRhdGUgYmVmb3JlIGFueSBpbmRpdmlkdWFsIHRpbGVzIGFy ZSBwYWludGVkIGJ5IHRlbGxpbmcgdGhlIGNsaWVudAogICAgIC8vIHRoYXQgaXQgbmVlZHMgdG8g c3luYyBpdHMgbGF5ZXIgc3RhdGUsIHdoaWNoIHdpbGwgZW5kIHVwIHNjaGVkdWxpbmcgdGhlIGxh eWVyIGZsdXNoZXIuCiAgICAgY2xpZW50KCktPm5vdGlmeVN5bmNSZXF1aXJlZCh0aGlzKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5 ZXJDQS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXll ckNBLmgKaW5kZXggYTI5M2VmOTlhODNkZjgxM2I0NTM5N2JhZDRkY2NhZTk2MGQ4NTFlZC4uMDc2 ZDhmZjk2MjJhODNiYjU4MzQyZjJmYjMyYjVkYzdkOWZmZDc0MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKQEAgLTE1 Nyw3ICsxNTcsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBwbGF0Zm9ybUNBTGF5ZXJD b250ZW50c09wYXF1ZSgpIGNvbnN0IHsgcmV0dXJuIGNvbnRlbnRzT3BhcXVlKCk7IH0KICAgICB2 aXJ0dWFsIGJvb2wgcGxhdGZvcm1DQUxheWVyRHJhd3NDb250ZW50KCkgY29uc3QgeyByZXR1cm4g ZHJhd3NDb250ZW50KCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgcGxhdGZvcm1DQUxheWVyTGF5ZXJE aWREaXNwbGF5KFBsYXRmb3JtTGF5ZXIqIGxheWVyKSB7IHJldHVybiBsYXllckRpZERpc3BsYXko bGF5ZXIpOyB9Ci0gICAgdmlydHVhbCB2b2lkIHBsYXRmb3JtQ0FMYXllckRpZENyZWF0ZVRpbGVz KCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHBsYXRmb3JtQ0FMYXllckRpZENyZWF0ZVRp bGVzKGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiBkaXJ0eVJlY3RzKSBPVkVSUklERTsKICAgICB2 aXJ0dWFsIGZsb2F0IHBsYXRmb3JtQ0FMYXllckRldmljZVNjYWxlRmFjdG9yKCkgT1ZFUlJJREU7 CiAKICAgICB2b2lkIHVwZGF0ZU9wYWNpdHlPbkxheWVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXJDbGllbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllckNsaWVudC5o CmluZGV4IDA1ZDM1ZWJjNDVmNmYzMTgzMWIxYzViNjk5YTZkZWEzNjc3NmI3MDAuLjkzODk3NmM1 MmUyZjgyZjI5NzUwNDViNjc2NWM2ZGYxZWYzMmZlMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllckNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllckNsaWVudC5o CkBAIC01OSw3ICs1OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgcGxhdGZvcm1DQUxh eWVyRHJhd3NDb250ZW50KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNB TGF5ZXJMYXllckRpZERpc3BsYXkoUGxhdGZvcm1MYXllciopID0gMDsKIAotICAgIHZpcnR1YWwg dm9pZCBwbGF0Zm9ybUNBTGF5ZXJEaWRDcmVhdGVUaWxlcygpID0gMDsKKyAgICB2aXJ0dWFsIHZv aWQgcGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMoY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4m IGRpcnR5UmVjdHMpID0gMDsKICAgICB2aXJ0dWFsIGZsb2F0IHBsYXRmb3JtQ0FMYXllckRldmlj ZVNjYWxlRmFjdG9yKCkgPSAwOwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5tbQppbmRleCAyNzRhMTk5NGE5 NmIwZTNmM2E4ZDI0YjRiOTMyMWE3ZDQwZDdmMDk0Li5kOTMyYzFmNzIzMTJlMGU4Yzg4OTc0N2Nm YmExOWJmN2UyYTVkNTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYS9tYWMvVGlsZUNhY2hlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUubW0KQEAgLTE4Miw2ICsxODIsOCBAQCB2b2lkIFRpbGVD YWNoZTo6c2V0U2NhbGUoQ0dGbG9hdCBzY2FsZSkKICAgICAgICAgcmV0dXJuOwogCiAjaWYgIWRl ZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19M RU9QQVJEKQorICAgIFZlY3RvcjxGbG9hdFJlY3Q+IGRpcnR5UmVjdHM7CisKICAgICBtX2Rldmlj ZVNjYWxlRmFjdG9yID0gZGV2aWNlU2NhbGVGYWN0b3I7CiAgICAgbV9zY2FsZSA9IHNjYWxlOwog ICAgIFttX3RpbGVDb250YWluZXJMYXllci5nZXQoKSBzZXRUcmFuc2Zvcm06Q0FUcmFuc2Zvcm0z RE1ha2VTY2FsZSgxIC8gbV9zY2FsZSwgMSAvIG1fc2NhbGUsIDEpXTsKQEAgLTE5MCwxMCArMTky LDE1IEBAIHZvaWQgVGlsZUNhY2hlOjpzZXRTY2FsZShDR0Zsb2F0IHNjYWxlKQogCiAgICAgZm9y IChUaWxlTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fdGlsZXMuYmVnaW4oKSwgZW5kID0gbV90 aWxlcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAgIFtpdC0+c2Vjb25kLmdldCgp IHNldENvbnRlbnRzU2NhbGU6ZGV2aWNlU2NhbGVGYWN0b3JdOwotICAgICAgICBbaXQtPnNlY29u ZC5nZXQoKSBzZXROZWVkc0Rpc3BsYXldOworCisgICAgICAgIEludFJlY3QgdGlsZVJlY3QgPSBy ZWN0Rm9yVGlsZUluZGV4KGl0LT5maXJzdCk7CisgICAgICAgIEZsb2F0UmVjdCBzY2FsZWRUaWxl UmVjdCA9IHRpbGVSZWN0OworCisgICAgICAgIHNjYWxlZFRpbGVSZWN0LnNjYWxlKDEgLyBtX3Nj YWxlKTsKKyAgICAgICAgZGlydHlSZWN0cy5hcHBlbmQoc2NhbGVkVGlsZVJlY3QpOwogICAgIH0K IAotICAgIHBsYXRmb3JtTGF5ZXItPm93bmVyKCktPnBsYXRmb3JtQ0FMYXllckRpZENyZWF0ZVRp bGVzKCk7CisgICAgcGxhdGZvcm1MYXllci0+b3duZXIoKS0+cGxhdGZvcm1DQUxheWVyRGlkQ3Jl YXRlVGlsZXMoZGlydHlSZWN0cyk7CiAjZW5kaWYKIH0KIApAQCAtMzUwLDcgKzM1Nyw3IEBAIHZv aWQgVGlsZUNhY2hlOjpyZXZhbGlkYXRlVGlsZXMoKQogICAgIFRpbGVJbmRleCBib3R0b21SaWdo dDsKICAgICBnZXRUaWxlSW5kZXhSYW5nZUZvclJlY3QodGlsZUNvdmVyYWdlUmVjdCwgdG9wTGVm dCwgYm90dG9tUmlnaHQpOwogCi0gICAgYm9vbCBkaWRDcmVhdGVPclJlc2l6ZVRpbGVzID0gZmFs c2U7CisgICAgVmVjdG9yPEZsb2F0UmVjdD4gZGlydHlSZWN0czsKIAogICAgIGZvciAoaW50IHkg PSB0b3BMZWZ0LnkoKTsgeSA8PSBib3R0b21SaWdodC55KCk7ICsreSkgewogICAgICAgICBmb3Ig KGludCB4ID0gdG9wTGVmdC54KCk7IHggPD0gYm90dG9tUmlnaHQueCgpOyArK3gpIHsKQEAgLTM1 OCwyMiArMzY1LDE5IEBAIHZvaWQgVGlsZUNhY2hlOjpyZXZhbGlkYXRlVGlsZXMoKQogCiAgICAg ICAgICAgICBJbnRSZWN0IHRpbGVSZWN0ID0gcmVjdEZvclRpbGVJbmRleCh0aWxlSW5kZXgpOwog ICAgICAgICAgICAgUmV0YWluUHRyPFdlYlRpbGVMYXllcj4mIHRpbGVMYXllciA9IG1fdGlsZXMu YWRkKHRpbGVJbmRleCwgMCkuZmlyc3QtPnNlY29uZDsKLSAgICAgICAgICAgIGlmICh0aWxlTGF5 ZXIpIHsKKyAgICAgICAgICAgIGlmICghdGlsZUxheWVyKSB7CisgICAgICAgICAgICAgICAgdGls ZUxheWVyID0gY3JlYXRlVGlsZUxheWVyKHRpbGVSZWN0KTsKKyAgICAgICAgICAgICAgICBbbV90 aWxlQ29udGFpbmVyTGF5ZXIuZ2V0KCkgYWRkU3VibGF5ZXI6dGlsZUxheWVyLmdldCgpXTsKKyAg ICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLy8gV2UgYWxyZWFkeSBoYXZlIGEg bGF5ZXIgZm9yIHRoaXMgdGlsZS4gRW5zdXJlIHRoYXQgaXRzIHNpemUgaXMgY29ycmVjdC4KLSAg ICAgICAgICAgICAgICBpZiAoIUNHU2l6ZUVxdWFsVG9TaXplKFt0aWxlTGF5ZXIuZ2V0KCkgZnJh bWVdLnNpemUsIHRpbGVSZWN0LnNpemUoKSkpIHsKLSAgICAgICAgICAgICAgICAgICAgW3RpbGVM YXllci5nZXQoKSBzZXRGcmFtZTp0aWxlUmVjdF07Ci0gICAgICAgICAgICAgICAgICAgIFt0aWxl TGF5ZXIuZ2V0KCkgc2V0TmVlZHNEaXNwbGF5XTsKLSAgICAgICAgICAgICAgICAgICAgZGlkQ3Jl YXRlT3JSZXNpemVUaWxlcyA9IHRydWU7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg ICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIGlmIChDR1NpemVFcXVhbFRvU2l6ZShbdGls ZUxheWVyLmdldCgpIGZyYW1lXS5zaXplLCB0aWxlUmVjdC5zaXplKCkpKQorICAgICAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICBbdGlsZUxheWVyLmdldCgpIHNldEZy YW1lOnRpbGVSZWN0XTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgZGlkQ3JlYXRlT3JS ZXNpemVUaWxlcyA9IHRydWU7Ci0KLSAgICAgICAgICAgIHRpbGVMYXllciA9IGNyZWF0ZVRpbGVM YXllcih0aWxlUmVjdCk7Ci0KLSAgICAgICAgICAgIFt0aWxlTGF5ZXIuZ2V0KCkgc2V0TmVlZHNE aXNwbGF5XTsKLSAgICAgICAgICAgIFttX3RpbGVDb250YWluZXJMYXllci5nZXQoKSBhZGRTdWJs YXllcjp0aWxlTGF5ZXIuZ2V0KCldOworICAgICAgICAgICAgRmxvYXRSZWN0IHNjYWxlZFRpbGVS ZWN0ID0gdGlsZVJlY3Q7CisgICAgICAgICAgICBzY2FsZWRUaWxlUmVjdC5zY2FsZSgxIC8gbV9z Y2FsZSk7CisgICAgICAgICAgICBkaXJ0eVJlY3RzLmFwcGVuZChzY2FsZWRUaWxlUmVjdCk7CiAg ICAgICAgIH0KICAgICB9CiAKQEAgLTM4NCwxMCArMzg4LDcgQEAgdm9pZCBUaWxlQ2FjaGU6OnJl dmFsaWRhdGVUaWxlcygpCiAgICAgICAgIG1fdGlsZUNvdmVyYWdlUmVjdC51bml0ZShyZWN0Rm9y VGlsZUluZGV4KHRpbGVJbmRleCkpOwogICAgIH0KIAotICAgIGlmICghZGlkQ3JlYXRlT3JSZXNp emVUaWxlcykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcGxhdGZvcm1MYXllci0+b3duZXIoKS0+ cGxhdGZvcm1DQUxheWVyRGlkQ3JlYXRlVGlsZXMoKTsKKyAgICBwbGF0Zm9ybUxheWVyLT5vd25l cigpLT5wbGF0Zm9ybUNBTGF5ZXJEaWRDcmVhdGVUaWxlcyhkaXJ0eVJlY3RzKTsKIH0KIAogV2Vi VGlsZUxheWVyKiBUaWxlQ2FjaGU6OnRpbGVMYXllckF0SW5kZXgoY29uc3QgVGlsZUluZGV4JiBp bmRleCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1Rp bWVWaXN1YWxDb250ZXh0LmNwcAppbmRleCA2NzBhZTFmMDg3NDUyODlhMzJlNTc2M2Q0YjViNjgy MzJkMGJlODZjLi5iMDAzN2MzYWI3ZWYxNjk1NzIzN2Y4NjM5MzQ4ZWRkYjA4MGFiMzQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQ cml2YXRlUXVpY2tUaW1lVmlzdWFsQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRl eHQuY3BwCkBAIC0xMDcsNyArMTA3LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgcGxh dGZvcm1DQUxheWVyQ29udGVudHNPcGFxdWUoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAg IHZpcnR1YWwgYm9vbCBwbGF0Zm9ybUNBTGF5ZXJEcmF3c0NvbnRlbnQoKSBjb25zdCB7IHJldHVy biBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNBTGF5ZXJMYXllckRpZERpc3Bs YXkoUGxhdGZvcm1MYXllciopIHsgfQotICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNBTGF5ZXJE aWRDcmVhdGVUaWxlcygpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNBTGF5ZXJEaWRD cmVhdGVUaWxlcyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYpIHsgfQogICAgIHZpcnR1YWwgZmxv YXQgcGxhdGZvcm1DQUxheWVyRGV2aWNlU2NhbGVGYWN0b3IoKSB7IHJldHVybiAxOyB9CiAKICAg ICBNZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVWaXN1YWxDb250ZXh0KiBtX3BhcmVudDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0Z1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXIuY3Bw IGIvU291cmNlL1dlYktpdC93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKaW5kZXgg OTg3ZWFiNDUyOTk5N2Q0ODIzODE2NjdkMTM2ODA1YTAxNDE1ZTljZS4uMjAzZTIyOWUzNjIyNDg4 NTdhYjc1ZjJkNmI0MDJkYzg2ZjYxZmEwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4v RnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vRnVs bHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKQEAgLTE5NSw3ICsxOTUsNyBAQCBwcml2YXRlOgog ICAgIHZpcnR1YWwgYm9vbCBwbGF0Zm9ybUNBTGF5ZXJDb250ZW50c09wYXF1ZSgpIGNvbnN0IHsg cmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIHBsYXRmb3JtQ0FMYXllckRyYXdzQ29u dGVudCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCB2b2lkIHBsYXRmb3Jt Q0FMYXllckxheWVyRGlkRGlzcGxheShQbGF0Zm9ybUxheWVyKikgeyB9Ci0gICAgdmlydHVhbCB2 b2lkIHBsYXRmb3JtQ0FMYXllckRpZENyZWF0ZVRpbGVzKCkgeyB9CisgICAgdmlydHVhbCB2b2lk IHBsYXRmb3JtQ0FMYXllckRpZENyZWF0ZVRpbGVzKGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+Jikg eyB9CiAgICAgdmlydHVhbCBmbG9hdCBwbGF0Zm9ybUNBTGF5ZXJEZXZpY2VTY2FsZUZhY3Rvcigp IHsgcmV0dXJuIDE7IH0KIAogICAgIEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXIqIG1fcGFyZW50 Owo=