82522 2012-03-28 13:55:24 -0700 [Qt][WK2] Don't synchronize WebGraphicsLayers to the UI process if the actual layer information wasn't changed 2012-04-09 13:57:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75780 1 noam noam hausmann jturcotte kenneth webkit.review.bot oldest_to_newest 590387 0 noam 2012-03-28 13:55:24 -0700 [Qt][WK2] Don't synchronize WebGraphicsLayers to the UI process if the actual layer information wasn't changed 590500 1 134417 noam 2012-03-28 15:11:45 -0700 Created attachment 134417 Patch 591063 2 134417 jturcotte 2012-03-29 05:07:09 -0700 Comment on attachment 134417 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134417&action=review LGTM beside one nitpick. > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:73 > + if (!transform().isAffine()) I guess this relates to shouldUseTiledBackingStore? Could you add a comment why it helps? 594455 3 134417 kenneth 2012-04-03 07:11:02 -0700 Comment on attachment 134417 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134417&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:78 > + toWebGraphicsLayer(children()[i])->setShouldUpdateVisibleRect(); hasPendingVisibleRectChange? > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:439 > + if (!m_modified) > + return; I would add a newline after each return statement 598384 4 136257 noam 2012-04-09 10:15:57 -0700 Created attachment 136257 Patch for landing 598595 5 136257 webkit.review.bot 2012-04-09 13:57:27 -0700 Comment on attachment 136257 Patch for landing Clearing flags on attachment: 136257 Committed r113615: <http://trac.webkit.org/changeset/113615> 598596 6 webkit.review.bot 2012-04-09 13:57:33 -0700 All reviewed patches have been landed. Closing bug. 134417 2012-03-28 15:11:45 -0700 2012-04-09 10:15:49 -0700 Patch bug-82522-20120328151137.patch text/plain 11794 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTk2NzEyZDE1M2RmNGMw YTgxYzMyODM4NGQwYTRlMWE2ODNkYmVmZS4uMGQ1MzU2MmU4ODllZWMwNTJkNzM4NzMwZGJkNjFh M2FiNDQxZTgxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDEyLTAzLTI4ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAKKyAgICAgICAgW1F0XVtX SzJdIERvbid0IHN5bmNocm9uaXplIFdlYkdyYXBoaWNzTGF5ZXJzIHRvIHRoZSBVSSBwcm9jZXNz IGlmIHRoZSBhY3R1YWwgbGF5ZXIgaW5mb3JtYXRpb24gd2Fzbid0IGNoYW5nZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNTIyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5IHdlIHNldCB0 aGUgbV9tb2RpZmllZCBmbGFncyBmb3IgYWxsIG9mIHRoZSBkZXNjZW5kYW50cyBvZiBhIGxheWVy CisgICAgICAgIHRoYXQgaGFzIGNoYW5nZWQgaXRzIGdlb21ldHJ5LiBUaGlzIGNhdXNlcyB1bm5l Y2Vzc2FyeSBsYXllciBzeW5jIG1lc3NhZ2VzLgorICAgICAgICBJbnN0ZWFkLCB3ZSBvbmx5IHN5 bmMgd2hlbiB0aGUgYWN0dWFsIGxheWVyIGhhcyBjaGFuZ2VkLCBhbmQgYWRkIGEgZmxhZworICAg ICAgICBjYWxsZWQgbV9zaG91bGRVcGRhdGVWaXNpYmxlUmVjdCB0aGF0IGFwcGxpZXMgdG8gZGVz Y2VuZGFudHMgb2YgYSBsYXllcgorICAgICAgICB0aGF0IGhhcyBhIG1vZGlmaWVkIGdlb21ldHJ5 LgorCisgICAgICAgICogU2hhcmVkL1dlYkxheWVyVHJlZUluZm8uaDoKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6V2ViR3JhcGhpY3NMYXllcjo6ZGlkQ2hhbmdlQ2hpbGRyZW4pOgorICAgICAgICAoV2Vi Q29yZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpzZXRTaG91bGRVcGRh dGVWaXNpYmxlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpkaWRD aGFuZ2VHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpXZWJH cmFwaGljc0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldFBv c2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldEFuY2hvclBv aW50KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldFNpemUpOgorICAg ICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6c2V0VHJhbnNmb3JtKToKKyAgICAgICAg KFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldENoaWxkcmVuVHJhbnNmb3JtKToKKyAgICAg ICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldFByZXNlcnZlczNEKToKKyAgICAgICAg KFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldENvbnRlbnRzVG9JbWFnZSk6CisgICAgICAg IChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpzZXROZWVkc0Rpc3BsYXlJblJlY3QpOgorICAg ICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6c3luY0ltYWdlQmFja2luZ1N0b3JlKToK KyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnN5bmNDb21wb3NpdGluZ1N0YXRl Rm9yVGhpc0xheWVyT25seSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjp0 aWxlZEJhY2tpbmdTdG9yZVBhaW50QmVnaW4pOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhp Y3NMYXllcjo6c2V0Um9vdExheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5 ZXI6OnNldFZpc2libGVDb250ZW50UmVjdFRyYWplY3RvcnlWZWN0b3IpOgorICAgICAgICAoV2Vi Q29yZTo6V2ViR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNTY2FsZSk6CisgICAgICAgIChXZWJD b3JlOjpXZWJHcmFwaGljc0xheWVyOjplZmZlY3RpdmVDb250ZW50c1NjYWxlKToKKyAgICAgICAg KFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OmFkanVzdENvbnRlbnRzU2NhbGUpOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5oOgorICAgICAg ICAoV2ViR3JhcGhpY3NMYXllcik6CisKKzIwMTItMDMtMjggIE5vJ2FtIFJvc2VudGhhbCAgPG5v YW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKwogICAgICAgICBbUXRdW1dLMl0gRGlyZWN0IGNvbXBv c2l0ZWQgaW1hZ2UgYXNzaWdubWVudCBkb2Vzbid0IHdvcmsKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNTI1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9XZWJMYXllclRyZWVJbmZvLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViTGF5ZXJUcmVlSW5mby5oCmluZGV4IDcyM2NhZmQ0ZWMzMGMwMDhmMmE5NmYwOGU2ZmVlNWM0 ZTAxMzU4MzMuLjczNWJlYzUxNDkwZDEwNGQ4NTY3NDdmNDc3MTk5ODIzZDc5YTIyYTkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJMYXllclRyZWVJbmZvLmgKKysrIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL1dlYkxheWVyVHJlZUluZm8uaApAQCAtMTA2LDggKzEwNiw2IEBA IHN0cnVjdCBXZWJMYXllckluZm8gewogICAgICAgICAgICAgYm9vbCBiYWNrZmFjZVZpc2libGUg OiAxOwogICAgICAgICAgICAgYm9vbCBtYXNrc1RvQm91bmRzIDogMTsKICAgICAgICAgICAgIGJv b2wgcHJlc2VydmVzM0QgOiAxOwotICAgICAgICAgICAgYm9vbCBjb250ZW50TmVlZHNEaXNwbGF5 IDogMTsKLSAgICAgICAgICAgIGJvb2wgaW1hZ2VJc1VwZGF0ZWQ6IDE7CiAgICAgICAgICAgICBi b29sIGlzUm9vdExheWVyOiAxOwogICAgICAgICB9OwogICAgICAgICB1bnNpZ25lZCBpbnQgZmxh Z3M7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkdyYXBoaWNzTGF5ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAppbmRleCA0MDQwM2MzNzRiMTg3NzM5MWFmMzAw YzU0ZTkyZDlkNTYxMDA2MzMwLi4xNzJmMmE0MGE1ZGE1Njk5MjlkN2E2OTRkMTE2ZThjYzllYzUx YmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkdyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5jcHAKQEAgLTY4LDIzICs2OCwzMSBAQCB2b2lk IFdlYkdyYXBoaWNzTGF5ZXI6Om5vdGlmeUNoYW5nZSgpCiAgICAgICAgIGNsaWVudCgpLT5ub3Rp ZnlTeW5jUmVxdWlyZWQodGhpcyk7CiB9CiAKLXZvaWQgV2ViR3JhcGhpY3NMYXllcjo6bm90aWZ5 Q2hhbmdlUmVjdXJzaXZlbHkoKQordm9pZCBXZWJHcmFwaGljc0xheWVyOjpzZXRTaG91bGRVcGRh dGVWaXNpYmxlUmVjdCgpCiB7Ci0gICAgbm90aWZ5Q2hhbmdlKCk7CisgICAgaWYgKCF0cmFuc2Zv cm0oKS5pc0FmZmluZSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Nob3VsZFVwZGF0ZVZp c2libGVSZWN0ID0gdHJ1ZTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNoaWxkcmVuKCku c2l6ZSgpOyArK2kpCi0gICAgICAgIHRvV2ViR3JhcGhpY3NMYXllcihjaGlsZHJlbigpW2ldKS0+ bm90aWZ5Q2hhbmdlUmVjdXJzaXZlbHkoKTsKKyAgICAgICAgdG9XZWJHcmFwaGljc0xheWVyKGNo aWxkcmVuKClbaV0pLT5zZXRTaG91bGRVcGRhdGVWaXNpYmxlUmVjdCgpOwogICAgIGlmIChyZXBs aWNhTGF5ZXIoKSkKLSAgICAgICAgdG9XZWJHcmFwaGljc0xheWVyKHJlcGxpY2FMYXllcigpKS0+ bm90aWZ5Q2hhbmdlKCk7CisgICAgICAgIHRvV2ViR3JhcGhpY3NMYXllcihyZXBsaWNhTGF5ZXIo KSktPnNldFNob3VsZFVwZGF0ZVZpc2libGVSZWN0KCk7Cit9CisKK3ZvaWQgV2ViR3JhcGhpY3NM YXllcjo6ZGlkQ2hhbmdlR2VvbWV0cnkoKQoreworICAgIG5vdGlmeUNoYW5nZSgpOworICAgIHNl dFNob3VsZFVwZGF0ZVZpc2libGVSZWN0KCk7CiB9CiAKIFdlYkdyYXBoaWNzTGF5ZXI6OldlYkdy YXBoaWNzTGF5ZXIoR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQogICAgIDogR3JhcGhpY3NM YXllcihjbGllbnQpCiAgICAgLCBtX21hc2tUYXJnZXQoMCkKLSAgICAsIG1fbmVlZHNEaXNwbGF5 KGZhbHNlKQogICAgICwgbV9tb2RpZmllZCh0cnVlKQotICAgICwgbV9jb250ZW50TmVlZHNEaXNw bGF5KGZhbHNlKQogICAgICwgbV9oYXNQZW5kaW5nQW5pbWF0aW9ucyhmYWxzZSkKICAgICAsIG1f aW5VcGRhdGVNb2RlKGZhbHNlKQorICAgICwgbV9zaG91bGRVcGRhdGVWaXNpYmxlUmVjdCh0cnVl KQogICAgICwgbV93ZWJHcmFwaGljc0xheWVyQ2xpZW50KDApCiAgICAgLCBtX2NvbnRlbnRzU2Nh bGUoMS5mKQogewpAQCAtMTc2LDcgKzE4NCw3IEBAIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6c2V0 UG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCYgcCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgR3Jh cGhpY3NMYXllcjo6c2V0UG9zaXRpb24ocCk7Ci0gICAgbm90aWZ5Q2hhbmdlUmVjdXJzaXZlbHko KTsKKyAgICBkaWRDaGFuZ2VHZW9tZXRyeSgpOwogfQogCiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6 OnNldEFuY2hvclBvaW50KGNvbnN0IEZsb2F0UG9pbnQzRCYgcCkKQEAgLTE4NSw3ICsxOTMsNyBA QCB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldEFuY2hvclBvaW50KGNvbnN0IEZsb2F0UG9pbnQz RCYgcCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0QW5jaG9yUG9p bnQocCk7Ci0gICAgbm90aWZ5Q2hhbmdlUmVjdXJzaXZlbHkoKTsKKyAgICBkaWRDaGFuZ2VHZW9t ZXRyeSgpOwogfQogCiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldFNpemUoY29uc3QgRmxvYXRT aXplJiBzaXplKQpAQCAtMTk3LDcgKzIwNSw3IEBAIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6c2V0 U2l6ZShjb25zdCBGbG9hdFNpemUmIHNpemUpCiAgICAgc2V0TmVlZHNEaXNwbGF5KCk7CiAgICAg aWYgKG1hc2tMYXllcigpKQogICAgICAgICBtYXNrTGF5ZXIoKS0+c2V0U2l6ZShzaXplKTsKLSAg ICBub3RpZnlDaGFuZ2VSZWN1cnNpdmVseSgpOworICAgIGRpZENoYW5nZUdlb21ldHJ5KCk7CiB9 CiAKIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6c2V0VHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybWF0 aW9uTWF0cml4JiB0KQpAQCAtMjA2LDcgKzIxNCw3IEBAIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6 c2V0VHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0KQogICAgICAgICByZXR1 cm47CiAKICAgICBHcmFwaGljc0xheWVyOjpzZXRUcmFuc2Zvcm0odCk7Ci0gICAgbm90aWZ5Q2hh bmdlUmVjdXJzaXZlbHkoKTsKKyAgICBkaWRDaGFuZ2VHZW9tZXRyeSgpOwogfQogCiB2b2lkIFdl YkdyYXBoaWNzTGF5ZXI6OnNldENoaWxkcmVuVHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybWF0aW9u TWF0cml4JiB0KQpAQCAtMjE1LDcgKzIyMyw3IEBAIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6c2V0 Q2hpbGRyZW5UcmFuc2Zvcm0oY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHQpCiAgICAgICAg IHJldHVybjsKIAogICAgIEdyYXBoaWNzTGF5ZXI6OnNldENoaWxkcmVuVHJhbnNmb3JtKHQpOwot ICAgIG5vdGlmeUNoYW5nZVJlY3Vyc2l2ZWx5KCk7CisgICAgZGlkQ2hhbmdlR2VvbWV0cnkoKTsK IH0KIAogdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzZXRQcmVzZXJ2ZXMzRChib29sIGIpCkBAIC0y MjQsNyArMjMyLDcgQEAgdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzZXRQcmVzZXJ2ZXMzRChib29s IGIpCiAgICAgICAgIHJldHVybjsKIAogICAgIEdyYXBoaWNzTGF5ZXI6OnNldFByZXNlcnZlczNE KGIpOwotICAgIG5vdGlmeUNoYW5nZVJlY3Vyc2l2ZWx5KCk7CisgICAgZGlkQ2hhbmdlR2VvbWV0 cnkoKTsKIH0KIAogdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzZXRNYXNrc1RvQm91bmRzKGJvb2wg YikKQEAgLTIzMiw3ICsyNDAsNyBAQCB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldE1hc2tzVG9C b3VuZHMoYm9vbCBiKQogICAgIGlmIChtYXNrc1RvQm91bmRzKCkgPT0gYikKICAgICAgICAgcmV0 dXJuOwogICAgIEdyYXBoaWNzTGF5ZXI6OnNldE1hc2tzVG9Cb3VuZHMoYik7Ci0gICAgbm90aWZ5 Q2hhbmdlUmVjdXJzaXZlbHkoKTsKKyAgICBkaWRDaGFuZ2VHZW9tZXRyeSgpOwogfQogCiB2b2lk IFdlYkdyYXBoaWNzTGF5ZXI6OnNldERyYXdzQ29udGVudChib29sIGIpCkBAIC0zMDMsNyArMzEx LDcgQEAgYm9vbCBXZWJHcmFwaGljc0xheWVyOjphZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVW YWx1ZUxpc3QmIHZhbHVlTGlzdCwgY29uc3QgSW4KICAgICAgICAgbV90cmFuc2Zvcm1BbmltYXRp b25zLmFkZChrZXlmcmFtZXNOYW1lKTsKIAogICAgIG1faGFzUGVuZGluZ0FuaW1hdGlvbnMgPSB0 cnVlOwotICAgIG5vdGlmeUNoYW5nZVJlY3Vyc2l2ZWx5KCk7CisgICAgZGlkQ2hhbmdlR2VvbWV0 cnkoKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMzU1LDcgKzM2Myw2IEBAIHZvaWQgV2Vi R3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNUb0ltYWdlKEltYWdlKiBpbWFnZSkKIAogICAgIG1f bGF5ZXJJbmZvLmltYWdlQmFja2luZ1N0b3JlSUQgPSBuZXdJRDsKICAgICBtX2ltYWdlID0gaW1h Z2U7Ci0gICAgbV9sYXllckluZm8uaW1hZ2VJc1VwZGF0ZWQgPSB0cnVlOwogICAgIEdyYXBoaWNz TGF5ZXI6OnNldENvbnRlbnRzVG9JbWFnZShpbWFnZSk7CiB9CiAKQEAgLTQyNiw0OCArNDMzLDQ3 IEBAIFdlYkdyYXBoaWNzTGF5ZXIqIHRvV2ViR3JhcGhpY3NMYXllcihHcmFwaGljc0xheWVyKiBs YXllcikKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViR3JhcGhpY3NMYXllcio+KGxheWVyKTsK IH0KIAordm9pZCBXZWJHcmFwaGljc0xheWVyOjpzeW5jTGF5ZXJQYXJhbWV0ZXJzKCkKKyB7Cisg ICAgaWYgKCFtX21vZGlmaWVkKQorICAgICAgICByZXR1cm47CisgICAgbV9tb2RpZmllZCA9IGZh bHNlOworICAgIG1fbGF5ZXJJbmZvLm5hbWUgPSBuYW1lKCk7CisgICAgbV9sYXllckluZm8uYW5j aG9yUG9pbnQgPSBhbmNob3JQb2ludCgpOworICAgIG1fbGF5ZXJJbmZvLmJhY2tmYWNlVmlzaWJs ZSA9IGJhY2tmYWNlVmlzaWJpbGl0eSgpOworICAgIG1fbGF5ZXJJbmZvLmNoaWxkcmVuVHJhbnNm b3JtID0gY2hpbGRyZW5UcmFuc2Zvcm0oKTsKKyAgICBtX2xheWVySW5mby5jb250ZW50c09wYXF1 ZSA9IGNvbnRlbnRzT3BhcXVlKCk7CisgICAgbV9sYXllckluZm8uY29udGVudHNSZWN0ID0gY29u dGVudHNSZWN0KCk7CisgICAgbV9sYXllckluZm8uZHJhd3NDb250ZW50ID0gZHJhd3NDb250ZW50 KCk7CisgICAgbV9sYXllckluZm8ubWFzayA9IHRvV2ViTGF5ZXJJRChtYXNrTGF5ZXIoKSk7Cisg ICAgbV9sYXllckluZm8ubWFza3NUb0JvdW5kcyA9IG1hc2tzVG9Cb3VuZHMoKTsKKyAgICBtX2xh eWVySW5mby5vcGFjaXR5ID0gb3BhY2l0eSgpOworICAgIG1fbGF5ZXJJbmZvLnBhcmVudCA9IHRv V2ViTGF5ZXJJRChwYXJlbnQoKSk7CisgICAgbV9sYXllckluZm8ucG9zID0gcG9zaXRpb24oKTsK KyAgICBtX2xheWVySW5mby5wcmVzZXJ2ZXMzRCA9IHByZXNlcnZlczNEKCk7CisgICAgbV9sYXll ckluZm8ucmVwbGljYSA9IHRvV2ViTGF5ZXJJRChyZXBsaWNhTGF5ZXIoKSk7CisgICAgbV9sYXll ckluZm8uc2l6ZSA9IHNpemUoKTsKKyAgICBtX2xheWVySW5mby50cmFuc2Zvcm0gPSB0cmFuc2Zv cm0oKTsKKyAgICBtX2xheWVySW5mby5jaGlsZHJlbi5jbGVhcigpOworCisgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBjaGlsZHJlbigpLnNpemUoKTsgKytpKQorICAgICAgICBtX2xheWVySW5m by5jaGlsZHJlbi5hcHBlbmQodG9XZWJMYXllcklEKGNoaWxkcmVuKClbaV0pKTsKKworICAgIG1f d2ViR3JhcGhpY3NMYXllckNsaWVudC0+ZGlkU3luY0NvbXBvc2l0aW5nU3RhdGVGb3JMYXllciht X2xheWVySW5mbyk7Cit9CiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnN5bmNDb21wb3NpdGluZ1N0 YXRlRm9yVGhpc0xheWVyT25seSgpCiB7CiAgICAgLy8gVGhlIHJlbW90ZSBpbWFnZSBtaWdodCBo YXZlIGJlZW4gcmVsZWFzZWQgYnkgcHVyZ2VCYWNraW5nU3RvcmVzLgogICAgIGlmIChtX2ltYWdl KSB7Ci0gICAgICAgIGlmICghbV9sYXllckluZm8uaW1hZ2VCYWNraW5nU3RvcmVJRCkgeworICAg ICAgICBpZiAoIW1fbGF5ZXJJbmZvLmltYWdlQmFja2luZ1N0b3JlSUQpCiAgICAgICAgICAgICBt X2xheWVySW5mby5pbWFnZUJhY2tpbmdTdG9yZUlEID0gbV93ZWJHcmFwaGljc0xheWVyQ2xpZW50 LT5hZG9wdEltYWdlQmFja2luZ1N0b3JlKG1faW1hZ2UuZ2V0KCkpOwotICAgICAgICAgICAgbV9s YXllckluZm8uaW1hZ2VJc1VwZGF0ZWQgPSB0cnVlOwotICAgICAgICB9Ci0gICAgfQotCi0gICAg aWYgKG1fbW9kaWZpZWQpIHsKLSAgICAgICAgY29tcHV0ZVRyYW5zZm9ybWVkVmlzaWJsZVJlY3Qo KTsKLQotICAgICAgICBtX2xheWVySW5mby5uYW1lID0gbmFtZSgpOwotICAgICAgICBtX2xheWVy SW5mby5hbmNob3JQb2ludCA9IGFuY2hvclBvaW50KCk7Ci0gICAgICAgIG1fbGF5ZXJJbmZvLmJh Y2tmYWNlVmlzaWJsZSA9IGJhY2tmYWNlVmlzaWJpbGl0eSgpOwotICAgICAgICBtX2xheWVySW5m by5jaGlsZHJlblRyYW5zZm9ybSA9IGNoaWxkcmVuVHJhbnNmb3JtKCk7Ci0gICAgICAgIG1fbGF5 ZXJJbmZvLmNvbnRlbnRzT3BhcXVlID0gY29udGVudHNPcGFxdWUoKTsKLSAgICAgICAgbV9sYXll ckluZm8uY29udGVudHNSZWN0ID0gY29udGVudHNSZWN0KCk7Ci0gICAgICAgIG1fbGF5ZXJJbmZv LmRyYXdzQ29udGVudCA9IGRyYXdzQ29udGVudCgpOwotICAgICAgICBtX2xheWVySW5mby5tYXNr ID0gdG9XZWJMYXllcklEKG1hc2tMYXllcigpKTsKLSAgICAgICAgbV9sYXllckluZm8ubWFza3NU b0JvdW5kcyA9IG1hc2tzVG9Cb3VuZHMoKTsKLSAgICAgICAgbV9sYXllckluZm8ub3BhY2l0eSA9 IG9wYWNpdHkoKTsKLSAgICAgICAgbV9sYXllckluZm8ucGFyZW50ID0gdG9XZWJMYXllcklEKHBh cmVudCgpKTsKLSAgICAgICAgbV9sYXllckluZm8ucG9zID0gcG9zaXRpb24oKTsKLSAgICAgICAg bV9sYXllckluZm8ucHJlc2VydmVzM0QgPSBwcmVzZXJ2ZXMzRCgpOwotICAgICAgICBtX2xheWVy SW5mby5yZXBsaWNhID0gdG9XZWJMYXllcklEKHJlcGxpY2FMYXllcigpKTsKLSAgICAgICAgbV9s YXllckluZm8uc2l6ZSA9IHNpemUoKTsKLSAgICAgICAgbV9sYXllckluZm8udHJhbnNmb3JtID0g dHJhbnNmb3JtKCk7Ci0gICAgICAgIG1fY29udGVudE5lZWRzRGlzcGxheSA9IGZhbHNlOwotICAg ICAgICBtX2xheWVySW5mby5jaGlsZHJlbi5jbGVhcigpOwotCi0gICAgICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgY2hpbGRyZW4oKS5zaXplKCk7ICsraSkKLSAgICAgICAgICAgIG1fbGF5ZXJJ bmZvLmNoaWxkcmVuLmFwcGVuZCh0b1dlYkxheWVySUQoY2hpbGRyZW4oKVtpXSkpOwotCi0gICAg ICAgIG1fd2ViR3JhcGhpY3NMYXllckNsaWVudC0+ZGlkU3luY0NvbXBvc2l0aW5nU3RhdGVGb3JM YXllcihtX2xheWVySW5mbyk7CiAgICAgfQogCisgICAgY29tcHV0ZVRyYW5zZm9ybWVkVmlzaWJs ZVJlY3QoKTsKKyAgICBzeW5jTGF5ZXJQYXJhbWV0ZXJzKCk7CiAgICAgdXBkYXRlQ29udGVudEJ1 ZmZlcnMoKTsKIAogICAgIG1fbW9kaWZpZWQgPSBmYWxzZTsKLSAgICBtX2xheWVySW5mby5pbWFn ZUlzVXBkYXRlZCA9IGZhbHNlOwogICAgIGlmIChtX2hhc1BlbmRpbmdBbmltYXRpb25zKQogICAg ICAgICBub3RpZnlBbmltYXRpb25TdGFydGVkKFdURjo6Y3VycmVudFRpbWUoKSk7CiAgICAgbV9s YXllckluZm8uYW5pbWF0aW9ucy5jbGVhcigpOwpAQCAtNjU5LDcgKzY2NSw5IEBAIHZvaWQgV2Vi R3JhcGhpY3NMYXllcjo6YWRqdXN0VmlzaWJsZVJlY3QoKQogCiB2b2lkIFdlYkdyYXBoaWNzTGF5 ZXI6OmNvbXB1dGVUcmFuc2Zvcm1lZFZpc2libGVSZWN0KCkKIHsKLSAgICAvLyBGSVhNRTogQ29u c2lkZXIgdHJhbnNmb3JtIGFuaW1hdGlvbnMgaW4gdGhlIHZpc2libGUgcmVjdCBjYWxjdWxhdGlv bi4KKyAgICBpZiAoIW1fc2hvdWxkVXBkYXRlVmlzaWJsZVJlY3QpCisgICAgICAgIHJldHVybjsK KyAgICBtX3Nob3VsZFVwZGF0ZVZpc2libGVSZWN0ID0gZmFsc2U7CiAgICAgbV9sYXllclRyYW5z Zm9ybS5zZXRMb2NhbFRyYW5zZm9ybSh0cmFuc2Zvcm0oKSk7CiAgICAgbV9sYXllclRyYW5zZm9y bS5zZXRQb3NpdGlvbihwb3NpdGlvbigpKTsKICAgICBtX2xheWVyVHJhbnNmb3JtLnNldEFuY2hv clBvaW50KGFuY2hvclBvaW50KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaAppbmRleCBmZWIxY2Yw NjM4ZTEzMWM5NjIzMzQ5ZWZlZGJjNmFlMjRjZDNhYjEzLi4xZmUwZTFhYTUxOTc4ZjA5MjBiMjZh NTU3MzNkYzBiZjUzZDllMWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaApAQCAtMTQ1LDE0ICsx NDUsMTMgQEAgcHJpdmF0ZToKICAgICBHcmFwaGljc0xheWVyKiBtX21hc2tUYXJnZXQ7CiAgICAg RmxvYXRSZWN0IG1fbmVlZHNEaXNwbGF5UmVjdDsKICAgICBMYXllclRyYW5zZm9ybSBtX2xheWVy VHJhbnNmb3JtOwotICAgIGJvb2wgbV9uZWVkc0Rpc3BsYXkgOiAxOwogICAgIGJvb2wgbV9tb2Rp ZmllZCA6IDE7Ci0gICAgYm9vbCBtX2NvbnRlbnROZWVkc0Rpc3BsYXkgOiAxOwogICAgIGJvb2wg bV9oYXNQZW5kaW5nQW5pbWF0aW9ucyA6IDE7Ci0gICAgYm9vbCBtX2luVXBkYXRlTW9kZSA6IDI7 CisgICAgYm9vbCBtX2luVXBkYXRlTW9kZSA6IDE7CisgICAgYm9vbCBtX3Nob3VsZFVwZGF0ZVZp c2libGVSZWN0OiAxOwogCiAgICAgdm9pZCBub3RpZnlDaGFuZ2UoKTsKLSAgICB2b2lkIG5vdGlm eUNoYW5nZVJlY3Vyc2l2ZWx5KCk7CisgICAgdm9pZCBkaWRDaGFuZ2VHZW9tZXRyeSgpOwogICAg IHZvaWQgY3JlYXRlQmFja2luZ1N0b3JlKCk7CiAgICAgSGFzaFNldDxTdHJpbmc+IG1fdHJhbnNm b3JtQW5pbWF0aW9uczsKIApAQCAtMTYwLDYgKzE1OSw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBz aG91bGRVc2VUaWxlZEJhY2tpbmdTdG9yZSgpOwogICAgIHZvaWQgYWRqdXN0Q29udGVudHNTY2Fs ZSgpOwogICAgIHZvaWQgY29tcHV0ZVRyYW5zZm9ybWVkVmlzaWJsZVJlY3QoKTsKKyAgICB2b2lk IHN5bmNMYXllclBhcmFtZXRlcnMoKTsKKyAgICB2b2lkIHNldFNob3VsZFVwZGF0ZVZpc2libGVS ZWN0KCk7CiAgICAgZmxvYXQgZWZmZWN0aXZlQ29udGVudHNTY2FsZSgpOwogCiAgICAgV2ViS2l0 OjpXZWJHcmFwaGljc0xheWVyQ2xpZW50KiBtX3dlYkdyYXBoaWNzTGF5ZXJDbGllbnQ7Cg== 136257 2012-04-09 10:15:57 -0700 2012-04-09 13:57:27 -0700 Patch for landing bug-82522-20120409101555.patch text/plain 11277 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTIzOTU1MmIwM2U0YzQ4 ZTdjNTJiMGQ5ZmZhZmIwNTA3ZWU0M2RlNy4uYzg5YjNkYThiOGU5OTkzYjA5NzczMzIzM2EyNmI0 MDI1ODViMzcwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDEyLTAzLTI4ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAKKyAgICAgICAgW1F0XVtX SzJdIERvbid0IHN5bmNocm9uaXplIFdlYkdyYXBoaWNzTGF5ZXJzIHRvIHRoZSBVSSBwcm9jZXNz IGlmIHRoZSBhY3R1YWwgbGF5ZXIgaW5mb3JtYXRpb24gd2Fzbid0IGNoYW5nZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNTIyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCisKKyAgICAgICAgQ3VycmVu dGx5IHdlIHNldCB0aGUgbV9tb2RpZmllZCBmbGFncyBmb3IgYWxsIG9mIHRoZSBkZXNjZW5kYW50 cyBvZiBhIGxheWVyCisgICAgICAgIHRoYXQgaGFzIGNoYW5nZWQgaXRzIGdlb21ldHJ5LiBUaGlz IGNhdXNlcyB1bm5lY2Vzc2FyeSBsYXllciBzeW5jIG1lc3NhZ2VzLgorICAgICAgICBJbnN0ZWFk LCB3ZSBvbmx5IHN5bmMgd2hlbiB0aGUgYWN0dWFsIGxheWVyIGhhcyBjaGFuZ2VkLCBhbmQgYWRk IGEgZmxhZworICAgICAgICBjYWxsZWQgbV9zaG91bGRVcGRhdGVWaXNpYmxlUmVjdCB0aGF0IGFw cGxpZXMgdG8gZGVzY2VuZGFudHMgb2YgYSBsYXllcgorICAgICAgICB0aGF0IGhhcyBhIG1vZGlm aWVkIGdlb21ldHJ5LgorCisgICAgICAgICogU2hhcmVkL1dlYkxheWVyVHJlZUluZm8uaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6ZGlkQ2hhbmdlQ2hpbGRyZW4pOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpz ZXRTaG91bGRVcGRhdGVWaXNpYmxlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGlj c0xheWVyOjpkaWRDaGFuZ2VHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGlj c0xheWVyOjpXZWJHcmFwaGljc0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNz TGF5ZXI6OnNldFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6 OnNldEFuY2hvclBvaW50KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNl dFNpemUpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6c2V0VHJhbnNmb3Jt KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldENoaWxkcmVuVHJhbnNm b3JtKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldFByZXNlcnZlczNE KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnNldENvbnRlbnRzVG9JbWFn ZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpzZXROZWVkc0Rpc3BsYXlJ blJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6c3luY0ltYWdlQmFj a2luZ1N0b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnN5bmNDb21w b3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFw aGljc0xheWVyOjp0aWxlZEJhY2tpbmdTdG9yZVBhaW50QmVnaW4pOgorICAgICAgICAoV2ViQ29y ZTo6V2ViR3JhcGhpY3NMYXllcjo6c2V0Um9vdExheWVyKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YkdyYXBoaWNzTGF5ZXI6OnNldFZpc2libGVDb250ZW50UmVjdFRyYWplY3RvcnlWZWN0b3IpOgor ICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNTY2FsZSk6Cisg ICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjplZmZlY3RpdmVDb250ZW50c1NjYWxl KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OmFkanVzdENvbnRlbnRzU2Nh bGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXll ci5oOgorICAgICAgICAoV2ViR3JhcGhpY3NMYXllcik6CisKKzIwMTItMDMtMjggIE5vJ2FtIFJv c2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKwogICAgICAgICBbUXRdW1dLMl0g UmVtb3ZlIGFsbCBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkgZGVmaW5lcyBmcm9tIGNvZGUgdGhh dCBjb250YWlucyBVSV9TSURFX0NPTVBPU0lUSU5HCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjUzMwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViTGF5ZXJUcmVlSW5mby5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkxh eWVyVHJlZUluZm8uaAppbmRleCA0ZTAzNWEzM2FmMDllNTFkMjZiNWEyNWZmNmJkMTFhMjRhMjJk MTFkLi43MzViZWM1MTQ5MGQxMDRkODU2NzQ3ZjQ3NzE5OTgyM2Q3OWEyMmE5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViTGF5ZXJUcmVlSW5mby5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9XZWJMYXllclRyZWVJbmZvLmgKQEAgLTEwNiw3ICsxMDYsNiBAQCBzdHJ1 Y3QgV2ViTGF5ZXJJbmZvIHsKICAgICAgICAgICAgIGJvb2wgYmFja2ZhY2VWaXNpYmxlIDogMTsK ICAgICAgICAgICAgIGJvb2wgbWFza3NUb0JvdW5kcyA6IDE7CiAgICAgICAgICAgICBib29sIHBy ZXNlcnZlczNEIDogMTsKLSAgICAgICAgICAgIGJvb2wgY29udGVudE5lZWRzRGlzcGxheSA6IDE7 CiAgICAgICAgICAgICBib29sIGlzUm9vdExheWVyOiAxOwogICAgICAgICB9OwogICAgICAgICB1 bnNpZ25lZCBpbnQgZmxhZ3M7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAppbmRleCA0ODFmNDcx NWRjNjM1ZjY2NWEwMjFkMzZhMDFhNzc1YjdkMmZmNjEwLi44OTI1MGVhYzllNzkxMWNiNzFiYzNm MmU2OGNkMTFkYjEwYWEzMGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5jcHAKQEAgLTY4LDIz ICs2OCwzMSBAQCB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6Om5vdGlmeUNoYW5nZSgpCiAgICAgICAg IGNsaWVudCgpLT5ub3RpZnlTeW5jUmVxdWlyZWQodGhpcyk7CiB9CiAKLXZvaWQgV2ViR3JhcGhp Y3NMYXllcjo6bm90aWZ5Q2hhbmdlUmVjdXJzaXZlbHkoKQordm9pZCBXZWJHcmFwaGljc0xheWVy OjpzZXRTaG91bGRVcGRhdGVWaXNpYmxlUmVjdCgpCiB7Ci0gICAgbm90aWZ5Q2hhbmdlKCk7Cisg ICAgaWYgKCF0cmFuc2Zvcm0oKS5pc0FmZmluZSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBt X3Nob3VsZFVwZGF0ZVZpc2libGVSZWN0ID0gdHJ1ZTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IGNoaWxkcmVuKCkuc2l6ZSgpOyArK2kpCi0gICAgICAgIHRvV2ViR3JhcGhpY3NMYXllcihj aGlsZHJlbigpW2ldKS0+bm90aWZ5Q2hhbmdlUmVjdXJzaXZlbHkoKTsKKyAgICAgICAgdG9XZWJH cmFwaGljc0xheWVyKGNoaWxkcmVuKClbaV0pLT5zZXRTaG91bGRVcGRhdGVWaXNpYmxlUmVjdCgp OwogICAgIGlmIChyZXBsaWNhTGF5ZXIoKSkKLSAgICAgICAgdG9XZWJHcmFwaGljc0xheWVyKHJl cGxpY2FMYXllcigpKS0+bm90aWZ5Q2hhbmdlKCk7CisgICAgICAgIHRvV2ViR3JhcGhpY3NMYXll cihyZXBsaWNhTGF5ZXIoKSktPnNldFNob3VsZFVwZGF0ZVZpc2libGVSZWN0KCk7Cit9CisKK3Zv aWQgV2ViR3JhcGhpY3NMYXllcjo6ZGlkQ2hhbmdlR2VvbWV0cnkoKQoreworICAgIG5vdGlmeUNo YW5nZSgpOworICAgIHNldFNob3VsZFVwZGF0ZVZpc2libGVSZWN0KCk7CiB9CiAKIFdlYkdyYXBo aWNzTGF5ZXI6OldlYkdyYXBoaWNzTGF5ZXIoR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQog ICAgIDogR3JhcGhpY3NMYXllcihjbGllbnQpCiAgICAgLCBtX21hc2tUYXJnZXQoMCkKLSAgICAs IG1fbmVlZHNEaXNwbGF5KGZhbHNlKQogICAgICwgbV9tb2RpZmllZCh0cnVlKQotICAgICwgbV9j b250ZW50TmVlZHNEaXNwbGF5KGZhbHNlKQogICAgICwgbV9oYXNQZW5kaW5nQW5pbWF0aW9ucyhm YWxzZSkKICAgICAsIG1faW5VcGRhdGVNb2RlKGZhbHNlKQorICAgICwgbV9zaG91bGRVcGRhdGVW aXNpYmxlUmVjdCh0cnVlKQogICAgICwgbV93ZWJHcmFwaGljc0xheWVyQ2xpZW50KDApCiAgICAg LCBtX2NvbnRlbnRzU2NhbGUoMS5mKQogewpAQCAtMTgyLDcgKzE5MCw3IEBAIHZvaWQgV2ViR3Jh cGhpY3NMYXllcjo6c2V0UG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCYgcCkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0UG9zaXRpb24ocCk7Ci0gICAgbm90aWZ5Q2hh bmdlUmVjdXJzaXZlbHkoKTsKKyAgICBkaWRDaGFuZ2VHZW9tZXRyeSgpOwogfQogCiB2b2lkIFdl YkdyYXBoaWNzTGF5ZXI6OnNldEFuY2hvclBvaW50KGNvbnN0IEZsb2F0UG9pbnQzRCYgcCkKQEAg LTE5MSw3ICsxOTksNyBAQCB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldEFuY2hvclBvaW50KGNv bnN0IEZsb2F0UG9pbnQzRCYgcCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgR3JhcGhpY3NMYXll cjo6c2V0QW5jaG9yUG9pbnQocCk7Ci0gICAgbm90aWZ5Q2hhbmdlUmVjdXJzaXZlbHkoKTsKKyAg ICBkaWRDaGFuZ2VHZW9tZXRyeSgpOwogfQogCiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldFNp emUoY29uc3QgRmxvYXRTaXplJiBzaXplKQpAQCAtMjAzLDcgKzIxMSw3IEBAIHZvaWQgV2ViR3Jh cGhpY3NMYXllcjo6c2V0U2l6ZShjb25zdCBGbG9hdFNpemUmIHNpemUpCiAgICAgc2V0TmVlZHNE aXNwbGF5KCk7CiAgICAgaWYgKG1hc2tMYXllcigpKQogICAgICAgICBtYXNrTGF5ZXIoKS0+c2V0 U2l6ZShzaXplKTsKLSAgICBub3RpZnlDaGFuZ2VSZWN1cnNpdmVseSgpOworICAgIGRpZENoYW5n ZUdlb21ldHJ5KCk7CiB9CiAKIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6c2V0VHJhbnNmb3JtKGNv bnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0KQpAQCAtMjEyLDcgKzIyMCw3IEBAIHZvaWQgV2Vi R3JhcGhpY3NMYXllcjo6c2V0VHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0 KQogICAgICAgICByZXR1cm47CiAKICAgICBHcmFwaGljc0xheWVyOjpzZXRUcmFuc2Zvcm0odCk7 Ci0gICAgbm90aWZ5Q2hhbmdlUmVjdXJzaXZlbHkoKTsKKyAgICBkaWRDaGFuZ2VHZW9tZXRyeSgp OwogfQogCiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldENoaWxkcmVuVHJhbnNmb3JtKGNvbnN0 IFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0KQpAQCAtMjIxLDcgKzIyOSw3IEBAIHZvaWQgV2ViR3Jh cGhpY3NMYXllcjo6c2V0Q2hpbGRyZW5UcmFuc2Zvcm0oY29uc3QgVHJhbnNmb3JtYXRpb25NYXRy aXgmIHQpCiAgICAgICAgIHJldHVybjsKIAogICAgIEdyYXBoaWNzTGF5ZXI6OnNldENoaWxkcmVu VHJhbnNmb3JtKHQpOwotICAgIG5vdGlmeUNoYW5nZVJlY3Vyc2l2ZWx5KCk7CisgICAgZGlkQ2hh bmdlR2VvbWV0cnkoKTsKIH0KIAogdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzZXRQcmVzZXJ2ZXMz RChib29sIGIpCkBAIC0yMzAsNyArMjM4LDcgQEAgdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzZXRQ cmVzZXJ2ZXMzRChib29sIGIpCiAgICAgICAgIHJldHVybjsKIAogICAgIEdyYXBoaWNzTGF5ZXI6 OnNldFByZXNlcnZlczNEKGIpOwotICAgIG5vdGlmeUNoYW5nZVJlY3Vyc2l2ZWx5KCk7CisgICAg ZGlkQ2hhbmdlR2VvbWV0cnkoKTsKIH0KIAogdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzZXRNYXNr c1RvQm91bmRzKGJvb2wgYikKQEAgLTIzOCw3ICsyNDYsNyBAQCB2b2lkIFdlYkdyYXBoaWNzTGF5 ZXI6OnNldE1hc2tzVG9Cb3VuZHMoYm9vbCBiKQogICAgIGlmIChtYXNrc1RvQm91bmRzKCkgPT0g YikKICAgICAgICAgcmV0dXJuOwogICAgIEdyYXBoaWNzTGF5ZXI6OnNldE1hc2tzVG9Cb3VuZHMo Yik7Ci0gICAgbm90aWZ5Q2hhbmdlUmVjdXJzaXZlbHkoKTsKKyAgICBkaWRDaGFuZ2VHZW9tZXRy eSgpOwogfQogCiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldERyYXdzQ29udGVudChib29sIGIp CkBAIC0zMDksNyArMzE3LDcgQEAgYm9vbCBXZWJHcmFwaGljc0xheWVyOjphZGRBbmltYXRpb24o Y29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIHZhbHVlTGlzdCwgY29uc3QgSW4KICAgICAgICAgbV90 cmFuc2Zvcm1BbmltYXRpb25zLmFkZChrZXlmcmFtZXNOYW1lKTsKIAogICAgIG1faGFzUGVuZGlu Z0FuaW1hdGlvbnMgPSB0cnVlOwotICAgIG5vdGlmeUNoYW5nZVJlY3Vyc2l2ZWx5KCk7CisgICAg ZGlkQ2hhbmdlR2VvbWV0cnkoKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtNDMxLDQwICs0 MzksNDMgQEAgV2ViR3JhcGhpY3NMYXllciogdG9XZWJHcmFwaGljc0xheWVyKEdyYXBoaWNzTGF5 ZXIqIGxheWVyKQogICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJHcmFwaGljc0xheWVyKj4obGF5 ZXIpOwogfQogCit2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnN5bmNMYXllclBhcmFtZXRlcnMoKQor IHsKKyAgICBpZiAoIW1fbW9kaWZpZWQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fbW9kaWZp ZWQgPSBmYWxzZTsKKyAgICBtX2xheWVySW5mby5uYW1lID0gbmFtZSgpOworICAgIG1fbGF5ZXJJ bmZvLmFuY2hvclBvaW50ID0gYW5jaG9yUG9pbnQoKTsKKyAgICBtX2xheWVySW5mby5iYWNrZmFj ZVZpc2libGUgPSBiYWNrZmFjZVZpc2liaWxpdHkoKTsKKyAgICBtX2xheWVySW5mby5jaGlsZHJl blRyYW5zZm9ybSA9IGNoaWxkcmVuVHJhbnNmb3JtKCk7CisgICAgbV9sYXllckluZm8uY29udGVu dHNPcGFxdWUgPSBjb250ZW50c09wYXF1ZSgpOworICAgIG1fbGF5ZXJJbmZvLmNvbnRlbnRzUmVj dCA9IGNvbnRlbnRzUmVjdCgpOworICAgIG1fbGF5ZXJJbmZvLmRyYXdzQ29udGVudCA9IGRyYXdz Q29udGVudCgpOworICAgIG1fbGF5ZXJJbmZvLm1hc2sgPSB0b1dlYkxheWVySUQobWFza0xheWVy KCkpOworICAgIG1fbGF5ZXJJbmZvLm1hc2tzVG9Cb3VuZHMgPSBtYXNrc1RvQm91bmRzKCk7Cisg ICAgbV9sYXllckluZm8ub3BhY2l0eSA9IG9wYWNpdHkoKTsKKyAgICBtX2xheWVySW5mby5wYXJl bnQgPSB0b1dlYkxheWVySUQocGFyZW50KCkpOworICAgIG1fbGF5ZXJJbmZvLnBvcyA9IHBvc2l0 aW9uKCk7CisgICAgbV9sYXllckluZm8ucHJlc2VydmVzM0QgPSBwcmVzZXJ2ZXMzRCgpOworICAg IG1fbGF5ZXJJbmZvLnJlcGxpY2EgPSB0b1dlYkxheWVySUQocmVwbGljYUxheWVyKCkpOworICAg IG1fbGF5ZXJJbmZvLnNpemUgPSBzaXplKCk7CisgICAgbV9sYXllckluZm8udHJhbnNmb3JtID0g dHJhbnNmb3JtKCk7CisgICAgbV9sYXllckluZm8uY2hpbGRyZW4uY2xlYXIoKTsKKworICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgY2hpbGRyZW4oKS5zaXplKCk7ICsraSkKKyAgICAgICAgbV9s YXllckluZm8uY2hpbGRyZW4uYXBwZW5kKHRvV2ViTGF5ZXJJRChjaGlsZHJlbigpW2ldKSk7CisK KyAgICBtX3dlYkdyYXBoaWNzTGF5ZXJDbGllbnQtPmRpZFN5bmNDb21wb3NpdGluZ1N0YXRlRm9y TGF5ZXIobV9sYXllckluZm8pOworfQogdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzeW5jQ29tcG9z aXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQogewogICAgIC8vIFRoZSByZW1vdGUgaW1hZ2Ug bWlnaHQgaGF2ZSBiZWVuIHJlbGVhc2VkIGJ5IHB1cmdlQmFja2luZ1N0b3Jlcy4KICAgICBpZiAo bV9pbWFnZSAmJiAhbV9sYXllckluZm8uaW1hZ2VCYWNraW5nU3RvcmVJRCkKICAgICAgICAgbV9s YXllckluZm8uaW1hZ2VCYWNraW5nU3RvcmVJRCA9IG1fd2ViR3JhcGhpY3NMYXllckNsaWVudC0+ YWRvcHRJbWFnZUJhY2tpbmdTdG9yZShtX2ltYWdlLmdldCgpKTsKIAotICAgIGlmIChtX21vZGlm aWVkKSB7Ci0gICAgICAgIGNvbXB1dGVUcmFuc2Zvcm1lZFZpc2libGVSZWN0KCk7Ci0KLSAgICAg ICAgbV9sYXllckluZm8ubmFtZSA9IG5hbWUoKTsKLSAgICAgICAgbV9sYXllckluZm8uYW5jaG9y UG9pbnQgPSBhbmNob3JQb2ludCgpOwotICAgICAgICBtX2xheWVySW5mby5iYWNrZmFjZVZpc2li bGUgPSBiYWNrZmFjZVZpc2liaWxpdHkoKTsKLSAgICAgICAgbV9sYXllckluZm8uY2hpbGRyZW5U cmFuc2Zvcm0gPSBjaGlsZHJlblRyYW5zZm9ybSgpOwotICAgICAgICBtX2xheWVySW5mby5jb250 ZW50c09wYXF1ZSA9IGNvbnRlbnRzT3BhcXVlKCk7Ci0gICAgICAgIG1fbGF5ZXJJbmZvLmNvbnRl bnRzUmVjdCA9IGNvbnRlbnRzUmVjdCgpOwotICAgICAgICBtX2xheWVySW5mby5kcmF3c0NvbnRl bnQgPSBkcmF3c0NvbnRlbnQoKTsKLSAgICAgICAgbV9sYXllckluZm8ubWFzayA9IHRvV2ViTGF5 ZXJJRChtYXNrTGF5ZXIoKSk7Ci0gICAgICAgIG1fbGF5ZXJJbmZvLm1hc2tzVG9Cb3VuZHMgPSBt YXNrc1RvQm91bmRzKCk7Ci0gICAgICAgIG1fbGF5ZXJJbmZvLm9wYWNpdHkgPSBvcGFjaXR5KCk7 Ci0gICAgICAgIG1fbGF5ZXJJbmZvLnBhcmVudCA9IHRvV2ViTGF5ZXJJRChwYXJlbnQoKSk7Ci0g ICAgICAgIG1fbGF5ZXJJbmZvLnBvcyA9IHBvc2l0aW9uKCk7Ci0gICAgICAgIG1fbGF5ZXJJbmZv LnByZXNlcnZlczNEID0gcHJlc2VydmVzM0QoKTsKLSAgICAgICAgbV9sYXllckluZm8ucmVwbGlj YSA9IHRvV2ViTGF5ZXJJRChyZXBsaWNhTGF5ZXIoKSk7Ci0gICAgICAgIG1fbGF5ZXJJbmZvLnNp emUgPSBzaXplKCk7Ci0gICAgICAgIG1fbGF5ZXJJbmZvLnRyYW5zZm9ybSA9IHRyYW5zZm9ybSgp OwotICAgICAgICBtX2NvbnRlbnROZWVkc0Rpc3BsYXkgPSBmYWxzZTsKLSAgICAgICAgbV9sYXll ckluZm8uY2hpbGRyZW4uY2xlYXIoKTsKLQotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IGNoaWxkcmVuKCkuc2l6ZSgpOyArK2kpCi0gICAgICAgICAgICBtX2xheWVySW5mby5jaGlsZHJl bi5hcHBlbmQodG9XZWJMYXllcklEKGNoaWxkcmVuKClbaV0pKTsKLQotICAgICAgICBtX3dlYkdy YXBoaWNzTGF5ZXJDbGllbnQtPmRpZFN5bmNDb21wb3NpdGluZ1N0YXRlRm9yTGF5ZXIobV9sYXll ckluZm8pOwotICAgIH0KLQorICAgIGNvbXB1dGVUcmFuc2Zvcm1lZFZpc2libGVSZWN0KCk7Cisg ICAgc3luY0xheWVyUGFyYW1ldGVycygpOwogICAgIHVwZGF0ZUNvbnRlbnRCdWZmZXJzKCk7CiAK ICAgICBtX21vZGlmaWVkID0gZmFsc2U7CkBAIC02NTksNyArNjcwLDkgQEAgdm9pZCBXZWJHcmFw aGljc0xheWVyOjphZGp1c3RWaXNpYmxlUmVjdCgpCiAKIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6 Y29tcHV0ZVRyYW5zZm9ybWVkVmlzaWJsZVJlY3QoKQogewotICAgIC8vIEZJWE1FOiBDb25zaWRl ciB0cmFuc2Zvcm0gYW5pbWF0aW9ucyBpbiB0aGUgdmlzaWJsZSByZWN0IGNhbGN1bGF0aW9uLgor ICAgIGlmICghbV9zaG91bGRVcGRhdGVWaXNpYmxlUmVjdCkKKyAgICAgICAgcmV0dXJuOworICAg IG1fc2hvdWxkVXBkYXRlVmlzaWJsZVJlY3QgPSBmYWxzZTsKICAgICBtX2xheWVyVHJhbnNmb3Jt LnNldExvY2FsVHJhbnNmb3JtKHRyYW5zZm9ybSgpKTsKICAgICBtX2xheWVyVHJhbnNmb3JtLnNl dFBvc2l0aW9uKHBvc2l0aW9uKCkpOwogICAgIG1fbGF5ZXJUcmFuc2Zvcm0uc2V0QW5jaG9yUG9p bnQoYW5jaG9yUG9pbnQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5oCmluZGV4IDJmOTA2ZWEzZDE1 NmZmZDBmN2M4ZDgzMWFmMDAxMmM1NmNjMzQxZjIuLjgyZTc1NzgyNzBhODg1YWNjZDczNzU2YWRl YmNhYmIzN2JiZDYwM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5oCkBAIC0xNDYsMTQgKzE0Niwx MyBAQCBwcml2YXRlOgogICAgIEdyYXBoaWNzTGF5ZXIqIG1fbWFza1RhcmdldDsKICAgICBGbG9h dFJlY3QgbV9uZWVkc0Rpc3BsYXlSZWN0OwogICAgIExheWVyVHJhbnNmb3JtIG1fbGF5ZXJUcmFu c2Zvcm07Ci0gICAgYm9vbCBtX25lZWRzRGlzcGxheSA6IDE7CiAgICAgYm9vbCBtX21vZGlmaWVk IDogMTsKLSAgICBib29sIG1fY29udGVudE5lZWRzRGlzcGxheSA6IDE7CiAgICAgYm9vbCBtX2hh c1BlbmRpbmdBbmltYXRpb25zIDogMTsKLSAgICBib29sIG1faW5VcGRhdGVNb2RlIDogMjsKKyAg ICBib29sIG1faW5VcGRhdGVNb2RlIDogMTsKKyAgICBib29sIG1fc2hvdWxkVXBkYXRlVmlzaWJs ZVJlY3Q6IDE7CiAKICAgICB2b2lkIG5vdGlmeUNoYW5nZSgpOwotICAgIHZvaWQgbm90aWZ5Q2hh bmdlUmVjdXJzaXZlbHkoKTsKKyAgICB2b2lkIGRpZENoYW5nZUdlb21ldHJ5KCk7CiAgICAgdm9p ZCBjcmVhdGVCYWNraW5nU3RvcmUoKTsKICAgICBIYXNoU2V0PFN0cmluZz4gbV90cmFuc2Zvcm1B bmltYXRpb25zOwogCkBAIC0xNjEsNiArMTYwLDggQEAgcHJpdmF0ZToKICAgICBib29sIHNob3Vs ZFVzZVRpbGVkQmFja2luZ1N0b3JlKCk7CiAgICAgdm9pZCBhZGp1c3RDb250ZW50c1NjYWxlKCk7 CiAgICAgdm9pZCBjb21wdXRlVHJhbnNmb3JtZWRWaXNpYmxlUmVjdCgpOworICAgIHZvaWQgc3lu Y0xheWVyUGFyYW1ldGVycygpOworICAgIHZvaWQgc2V0U2hvdWxkVXBkYXRlVmlzaWJsZVJlY3Qo KTsKICAgICBmbG9hdCBlZmZlY3RpdmVDb250ZW50c1NjYWxlKCk7CiAKICAgICBXZWJLaXQ6Oldl YkdyYXBoaWNzTGF5ZXJDbGllbnQqIG1fd2ViR3JhcGhpY3NMYXllckNsaWVudDsK