131400 2014-04-08 15:19:34 -0700 HTMLConverter::aggregatedAttributesForAncestors should cache intermediate results 2014-04-08 17:06:40 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 130227 1 rniwa rniwa andersca commit-queue darin enrica kling koivisto oldest_to_newest 998817 0 rniwa 2014-04-08 15:19:34 -0700 Right now, aggregatedAttributesForAncestors merges attributes from each ancestor all the way up for each text node. We should cache the intermediate results on each ancestor along the way. 998820 1 228900 rniwa 2014-04-08 15:21:58 -0700 Created attachment 228900 Fixes the bug 998873 2 228908 rniwa 2014-04-08 16:27:45 -0700 Created attachment 228908 Patch for landing 998874 3 228909 rniwa 2014-04-08 16:28:18 -0700 Created attachment 228909 Patch for landing 2 998895 4 228909 commit-queue 2014-04-08 17:06:36 -0700 Comment on attachment 228909 Patch for landing 2 Clearing flags on attachment: 228909 Committed r166981: <http://trac.webkit.org/changeset/166981> 998896 5 commit-queue 2014-04-08 17:06:40 -0700 All reviewed patches have been landed. Closing bug. 228900 2014-04-08 15:21:58 -0700 2014-04-08 16:27:42 -0700 Fixes the bug fix131400 text/plain 4304 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Njk2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA0LTA4ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEhUTUxDb252ZXJ0ZXI6OmFnZ3Jl Z2F0ZWRBdHRyaWJ1dGVzRm9yQW5jZXN0b3JzIHNob3VsZCBjYWNoZSBpbnRlcm1lZGlhdGUgcmVz dWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMx NDAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5z dGVhZCBvZiBhY2N1bXVsYXRpbmcgYXR0cmlidXRlcyBmcm9tIGEgY2hhcmFjdGVyIG5vZGUgdG8g dGhlIGhpZ2hlc3QgYW5jZXN0b3IsCisgICAgICAgIHJlY3Vyc2l2ZWx5IGNhbGwgYWdncmVnYXRl ZEF0dHJpYnV0ZXNGb3JFbGVtZW50QW5kSXRzQW5jZXN0b3JzIHNvIHRoYXQgYWdncmVnYXRlZAor ICAgICAgICBhdHRyaWJ1dGVzIGFyZSBjYWNoZWQgb24gZWFjaCBhbmNlc3RvciB0byBlbGltaW5h dGUgdGhlIG9sZCBPKG5eMikgYmVoYXZpb3IuCisKKyAgICAgICAgKiBlZGl0aW5nL2NvY29hL0hU TUxDb252ZXJ0ZXIubW06CisgICAgICAgIChIVE1MQ29udmVydGVyOjphZ2dyZWdhdGVkQXR0cmli dXRlc0ZvckFuY2VzdG9ycyk6CisgICAgICAgIChIVE1MQ29udmVydGVyOjphZ2dyZWdhdGVkQXR0 cmlidXRlc0ZvckVsZW1lbnRBbmRJdHNBbmNlc3RvcnMpOiBFeHRyYWN0ZWQgZnJvbSBhZ2dyZWdh dGVkQXR0cmlidXRlc0ZvckFuY2VzdG9ycy4KKwogMjAxNC0wNC0wOCAgQWxleGV5IFByb3NrdXJ5 YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgQ2xpcGJvYXJkIHRvIERhdGFU cmFuc2ZlcgpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVy Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvSFRNTENvbnZl cnRlci5tbQkocmV2aXNpb24gMTY2MzcxKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2Nv YS9IVE1MQ29udmVydGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00NTQsNyArNDU0LDcgQEAKICAg ICAKIHByaXZhdGU6CiAgICAgSGFzaE1hcDxSZWZQdHI8RWxlbWVudD4sIFJldGFpblB0cjxOU0Rp Y3Rpb25hcnk+PiBtX2F0dHJpYnV0ZXNGb3JFbGVtZW50czsKLSAgICBIYXNoTWFwPFJlZlB0cjxF bGVtZW50PiwgUmV0YWluUHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+PiBtX2FnZ3JlZ2F0ZWRBdHRy aWJ1dGVzRm9yRWxlbWVudHM7CisgICAgSGFzaE1hcDxSZWZQdHI8RWxlbWVudD4sIFJldGFpblB0 cjxOU0RpY3Rpb25hcnk+PiBtX2FnZ3JlZ2F0ZWRBdHRyaWJ1dGVzRm9yRWxlbWVudHM7CiAKICAg ICBOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nICpfYXR0clN0cjsKICAgICBOU011dGFibGVEaWN0 aW9uYXJ5ICpfZG9jdW1lbnRBdHRyczsKQEAgLTUwMCw3ICs1MDAsOCBAQAogICAgIE5TRGljdGlv bmFyeSAqX2F0dHJpYnV0ZXNGb3JFbGVtZW50KERPTUVsZW1lbnQgKik7CiAgICAgTlNEaWN0aW9u YXJ5KiBhdHRyaWJ1dGVzRm9yRWxlbWVudChFbGVtZW50JiBlbGVtZW50KTsKICAgICBOU0RpY3Rp b25hcnkqIGFnZ3JlZ2F0ZWRBdHRyaWJ1dGVzRm9yQW5jZXN0b3JzKENoYXJhY3RlckRhdGEmKTsK LSAgICAKKyAgICBOU0RpY3Rpb25hcnkqIGFnZ3JlZ2F0ZWRBdHRyaWJ1dGVzRm9yRWxlbWVudEFu ZEl0c0FuY2VzdG9ycyhFbGVtZW50Jik7CisKICAgICBFbGVtZW50KiBfYmxvY2tMZXZlbEVsZW1l bnRGb3JOb2RlKE5vZGUqKTsKICAgICAKICAgICB2b2lkIF9uZXdQYXJhZ3JhcGhGb3JFbGVtZW50 KERPTUVsZW1lbnQgKmVsZW1lbnQsIE5TU3RyaW5nICp0YWcsIEJPT0wgZmxhZywgQk9PTCBzdXBw cmVzc1RyYWlsaW5nU3BhY2UpOwpAQCAtMTM3MywyNSArMTM3NCwzMiBAQAogICAgICAgICBhbmNl c3RvciA9IGFuY2VzdG9yLT5wYXJlbnROb2RlKCk7CiAgICAgaWYgKCFhbmNlc3RvcikKICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIGFnZ3JlZ2F0ZWRBdHRyaWJ1dGVzRm9yRWxl bWVudEFuZEl0c0FuY2VzdG9ycygqdG9FbGVtZW50KGFuY2VzdG9yKSk7Cit9CiAKLSAgICBhdXRv JiBhdHRyaWJ1dGVzID0gbV9hZ2dyZWdhdGVkQXR0cmlidXRlc0ZvckVsZW1lbnRzLmFkZCh0b0Vs ZW1lbnQoYW5jZXN0b3IpLCBudWxscHRyKS5pdGVyYXRvci0+dmFsdWU7Ci0gICAgaWYgKCFhdHRy aWJ1dGVzKSB7Ci0gICAgICAgIFZlY3RvcjxFbGVtZW50KiwgMTY+IGFuY2VzdG9yRWxlbWVudHM7 Ci0gICAgICAgIGFuY2VzdG9yRWxlbWVudHMuYXBwZW5kKHRvRWxlbWVudChhbmNlc3RvcikpOwot ICAgICAgICBmb3IgKDsgYW5jZXN0b3I7IGFuY2VzdG9yID0gYW5jZXN0b3ItPnBhcmVudE5vZGUo KSkgewotICAgICAgICAgICAgaWYgKGFuY2VzdG9yLT5pc0VsZW1lbnROb2RlKCkpCi0gICAgICAg ICAgICAgICAgYW5jZXN0b3JFbGVtZW50cy5hcHBlbmQodG9FbGVtZW50KGFuY2VzdG9yKSk7Ci0g ICAgICAgIH0KK05TRGljdGlvbmFyeSogSFRNTENvbnZlcnRlcjo6YWdncmVnYXRlZEF0dHJpYnV0 ZXNGb3JFbGVtZW50QW5kSXRzQW5jZXN0b3JzKEVsZW1lbnQmIGVsZW1lbnQpCit7CisgICAgYXV0 byYgY2FjaGVkQXR0cmlidXRlcyA9IG1fYWdncmVnYXRlZEF0dHJpYnV0ZXNGb3JFbGVtZW50cy5h ZGQoJmVsZW1lbnQsIG51bGxwdHIpLml0ZXJhdG9yLT52YWx1ZTsKKyAgICBpZiAoY2FjaGVkQXR0 cmlidXRlcykKKyAgICAgICAgcmV0dXJuIGNhY2hlZEF0dHJpYnV0ZXMuZ2V0KCk7CiAKLSAgICAg ICAgYXR0cmlidXRlcyA9IFtOU011dGFibGVEaWN0aW9uYXJ5IGRpY3Rpb25hcnldOwotICAgICAg ICAvLyBGaWxsIGF0dHJzIGRpY3Rpb25hcnkgd2l0aCBhdHRyaWJ1dGVzIGZyb20gdGhlIGhpZ2hl c3QgdG8gdGhlIGxvd2VzdCwgbm90IG92ZXJ3cml0aW5nIG9uZXMgZGVlcGVyIGluIHRoZSB0cmVl Ci0gICAgICAgIGZvciAodW5zaWduZWQgaW5kZXggPSBhbmNlc3RvckVsZW1lbnRzLnNpemUoKTsg aW5kZXg7KSB7Ci0gICAgICAgICAgICBpbmRleC0tOwotICAgICAgICAgICAgW2F0dHJpYnV0ZXMg YWRkRW50cmllc0Zyb21EaWN0aW9uYXJ5OmF0dHJpYnV0ZXNGb3JFbGVtZW50KCphbmNlc3RvckVs ZW1lbnRzW2luZGV4XSldOwotICAgICAgICB9CisgICAgTlNEaWN0aW9uYXJ5KiBhdHRyaWJ1dGVz Rm9yQ3VycmVudEVsZW1lbnQgPSBhdHRyaWJ1dGVzRm9yRWxlbWVudChlbGVtZW50KTsKKyAgICBB U1NFUlQoYXR0cmlidXRlc0ZvckN1cnJlbnRFbGVtZW50KTsKKworICAgIE5vZGUqIGFuY2VzdG9y ID0gZWxlbWVudC5wYXJlbnROb2RlKCk7CisgICAgd2hpbGUgKGFuY2VzdG9yICYmICFhbmNlc3Rv ci0+aXNFbGVtZW50Tm9kZSgpKQorICAgICAgICBhbmNlc3RvciA9IGFuY2VzdG9yLT5wYXJlbnRO b2RlKCk7CisKKyAgICBpZiAoIWFuY2VzdG9yKSB7CisgICAgICAgIGNhY2hlZEF0dHJpYnV0ZXMg PSBhdHRyaWJ1dGVzRm9yQ3VycmVudEVsZW1lbnQ7CisgICAgICAgIHJldHVybiBhdHRyaWJ1dGVz Rm9yQ3VycmVudEVsZW1lbnQ7CiAgICAgfQogCi0gICAgcmV0dXJuIGF0dHJpYnV0ZXMuZ2V0KCk7 CisgICAgUmV0YWluUHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+IGF0dHJpYnV0ZXNGb3JBbmNlc3Rv cnMgPSBhZG9wdE5TKFthZ2dyZWdhdGVkQXR0cmlidXRlc0ZvckVsZW1lbnRBbmRJdHNBbmNlc3Rv cnMoKnRvRWxlbWVudChhbmNlc3RvcikpIG11dGFibGVDb3B5XSk7CisgICAgW2F0dHJpYnV0ZXNG b3JBbmNlc3RvcnMgYWRkRW50cmllc0Zyb21EaWN0aW9uYXJ5OmF0dHJpYnV0ZXNGb3JDdXJyZW50 RWxlbWVudF07CisgICAgbV9hZ2dyZWdhdGVkQXR0cmlidXRlc0ZvckVsZW1lbnRzLnNldCgmZWxl bWVudCwgYXR0cmlidXRlc0ZvckFuY2VzdG9ycyk7CisKKyAgICByZXR1cm4gYXR0cmlidXRlc0Zv ckFuY2VzdG9ycy5nZXQoKTsKIH0KIAogdm9pZCBIVE1MQ29udmVydGVyOjpfbmV3UGFyYWdyYXBo Rm9yRWxlbWVudChET01FbGVtZW50ICplbGVtZW50LCBOU1N0cmluZyAqdGFnLCBCT09MIGZsYWcs IEJPT0wgc3VwcHJlc3NUcmFpbGluZ1NwYWNlKQo= 228908 2014-04-08 16:27:45 -0700 2014-04-08 16:27:56 -0700 Patch for landing bug-131400-20140408162824.patch text/plain 5809 rniwa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjY5NzUpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA0LTA4ICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE5lZWQgYSBzaG9ydCBk ZXNjcmlwdGlvbiAoT09QUyEpLgorICAgICAgICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICAqIEludGVyYWN0aXZl L0NvcHlBbGwuaHRtbDoKKworMjAxNC0wMy0yNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0 Lm9yZz4KKworICAgICAgICBOZWVkIGEgc2hvcnQgZGVzY3JpcHRpb24gKE9PUFMhKS4KKyAgICAg ICAgTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEpLgorCisgICAgICAgIFJldmlld2VkIGJ5IFNhbSBX ZWluaWcuCisKKyAgICAgICAgKiBJbnRlcmFjdGl2ZS9Db3B5QWxsLmh0bWw6CisKKzIwMTQtMDMt MjQgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVwbGFjZSBI VE1MQ29udmVydGVyOjpfc3RyaW5nRm9yTm9kZSBieSBwcm9wZXJ0eVZhbHVlRm9yTm9kZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNzExCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICAqIEludGVyYWN0aXZlL0Nv cHlBbGwuaHRtbDoKKwogMjAxNC0wNC0wMiAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuCkluZGV4OiBQZXJmb3JtYW5jZVRlc3RzL0ludGVy YWN0aXZlL0NvcHlBbGwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5jZVRlc3RzL0ludGVy YWN0aXZlL0NvcHlBbGwuaHRtbAkocmV2aXNpb24gMTY2OTc1KQorKysgUGVyZm9ybWFuY2VUZXN0 cy9JbnRlcmFjdGl2ZS9Db3B5QWxsLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTIzLDcgKzIzLDgg QEAgZnVuY3Rpb24gc3RhcnRUZXN0KCkgewogICAgICAgICB9LAogICAgICAgICBkb25lOiBmdW5j dGlvbiAoKSB7CiAgICAgICAgICAgICBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdpZnJhbWUnKS5w YXJlbnROb2RlLnJlbW92ZUNoaWxkKGlmcmFtZSk7Ci0gICAgICAgIH0KKyAgICAgICAgfSwKKyAg ICAgICAgY3VzdG9tSXRlcmF0aW9uQ291bnQ6IDIsCiAgICAgfSk7CiB9CiAKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDE2Njk3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA0LTA4ICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgorCisgICAgICAgIEhUTUxDb252ZXJ0ZXI6OmFnZ3JlZ2F0ZWRBdHRyaWJ1 dGVzRm9yQW5jZXN0b3JzIHNob3VsZCBjYWNoZSBpbnRlcm1lZGlhdGUgcmVzdWx0cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNDAwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICBJbnN0ZWFkIG9mIGFjY3VtdWxh dGluZyBhdHRyaWJ1dGVzIGZyb20gYSBjaGFyYWN0ZXIgbm9kZSB0byB0aGUgaGlnaGVzdCBhbmNl c3RvciwKKyAgICAgICAgcmVjdXJzaXZlbHkgY2FsbCBhZ2dyZWdhdGVkQXR0cmlidXRlc0ZvckVs ZW1lbnRBbmRJdHNBbmNlc3RvcnMgc28gdGhhdCBhZ2dyZWdhdGVkCisgICAgICAgIGF0dHJpYnV0 ZXMgYXJlIGNhY2hlZCBvbiBlYWNoIGFuY2VzdG9yIHRvIGVsaW1pbmF0ZSB0aGUgb2xkIE8obl4y KSBiZWhhdmlvci4KKworICAgICAgICAqIGVkaXRpbmcvY29jb2EvSFRNTENvbnZlcnRlci5tbToK KyAgICAgICAgKEhUTUxDb252ZXJ0ZXI6OmFnZ3JlZ2F0ZWRBdHRyaWJ1dGVzRm9yQW5jZXN0b3Jz KToKKyAgICAgICAgKEhUTUxDb252ZXJ0ZXI6OmFnZ3JlZ2F0ZWRBdHRyaWJ1dGVzRm9yRWxlbWVu dEFuZEl0c0FuY2VzdG9ycyk6IEV4dHJhY3RlZCBmcm9tIGFnZ3JlZ2F0ZWRBdHRyaWJ1dGVzRm9y QW5jZXN0b3JzLgorCiAyMDE0LTA0LTA4ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBpT1MgYnVpbGQgZml4LgpJbmRleDogU291cmNlL1dl YkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvSFRNTENvbnZlcnRlci5tbQkocmV2aXNpb24gMTY2OTc1 KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC00NDksNyArNDQ5LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICBIYXNoTWFw PFJlZlB0cjxFbGVtZW50PiwgUmV0YWluUHRyPE5TRGljdGlvbmFyeT4+IG1fYXR0cmlidXRlc0Zv ckVsZW1lbnRzOwogICAgIEhhc2hNYXA8UmV0YWluUHRyPE5TVGV4dFRhYmxlPiwgUmVmUHRyPEVs ZW1lbnQ+PiBtX3RleHRUYWJsZUZvb3RlcnM7Ci0gICAgSGFzaE1hcDxSZWZQdHI8RWxlbWVudD4s IFJldGFpblB0cjxOU011dGFibGVEaWN0aW9uYXJ5Pj4gbV9hZ2dyZWdhdGVkQXR0cmlidXRlc0Zv ckVsZW1lbnRzOworICAgIEhhc2hNYXA8UmVmUHRyPEVsZW1lbnQ+LCBSZXRhaW5QdHI8TlNEaWN0 aW9uYXJ5Pj4gbV9hZ2dyZWdhdGVkQXR0cmlidXRlc0ZvckVsZW1lbnRzOwogCiAgICAgTlNNdXRh YmxlQXR0cmlidXRlZFN0cmluZyAqX2F0dHJTdHI7CiAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAq X2RvY3VtZW50QXR0cnM7CkBAIC00ODcsNyArNDg3LDggQEAgcHJpdmF0ZToKICAgICBOU0RpY3Rp b25hcnkgKmNvbXB1dGVkQXR0cmlidXRlc0ZvckVsZW1lbnQoRWxlbWVudCYpOwogICAgIE5TRGlj dGlvbmFyeSAqYXR0cmlidXRlc0ZvckVsZW1lbnQoRWxlbWVudCYpOwogICAgIE5TRGljdGlvbmFy eSAqYWdncmVnYXRlZEF0dHJpYnV0ZXNGb3JBbmNlc3RvcnMoQ2hhcmFjdGVyRGF0YSYpOwotICAg IAorICAgIE5TRGljdGlvbmFyeSogYWdncmVnYXRlZEF0dHJpYnV0ZXNGb3JFbGVtZW50QW5kSXRz QW5jZXN0b3JzKEVsZW1lbnQmKTsKKwogICAgIEVsZW1lbnQqIF9ibG9ja0xldmVsRWxlbWVudEZv ck5vZGUoTm9kZSopOwogICAgIAogICAgIHZvaWQgX25ld1BhcmFncmFwaEZvckVsZW1lbnQoRWxl bWVudCYsIE5TU3RyaW5nICp0YWcsIEJPT0wgZmxhZywgQk9PTCBzdXBwcmVzc1RyYWlsaW5nU3Bh Y2UpOwpAQCAtMTM1NywyNSArMTM1OCwzMiBAQCBOU0RpY3Rpb25hcnkqIEhUTUxDb252ZXJ0ZXI6 OmFnZ3JlZ2F0ZWRBCiAgICAgICAgIGFuY2VzdG9yID0gYW5jZXN0b3ItPnBhcmVudE5vZGUoKTsK ICAgICBpZiAoIWFuY2VzdG9yKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICByZXR1cm4g YWdncmVnYXRlZEF0dHJpYnV0ZXNGb3JFbGVtZW50QW5kSXRzQW5jZXN0b3JzKCp0b0VsZW1lbnQo YW5jZXN0b3IpKTsKK30KIAotICAgIGF1dG8mIGF0dHJpYnV0ZXMgPSBtX2FnZ3JlZ2F0ZWRBdHRy aWJ1dGVzRm9yRWxlbWVudHMuYWRkKHRvRWxlbWVudChhbmNlc3RvciksIG51bGxwdHIpLml0ZXJh dG9yLT52YWx1ZTsKLSAgICBpZiAoIWF0dHJpYnV0ZXMpIHsKLSAgICAgICAgVmVjdG9yPEVsZW1l bnQqLCAxNj4gYW5jZXN0b3JFbGVtZW50czsKLSAgICAgICAgYW5jZXN0b3JFbGVtZW50cy5hcHBl bmQodG9FbGVtZW50KGFuY2VzdG9yKSk7Ci0gICAgICAgIGZvciAoOyBhbmNlc3RvcjsgYW5jZXN0 b3IgPSBhbmNlc3Rvci0+cGFyZW50Tm9kZSgpKSB7Ci0gICAgICAgICAgICBpZiAoYW5jZXN0b3It PmlzRWxlbWVudE5vZGUoKSkKLSAgICAgICAgICAgICAgICBhbmNlc3RvckVsZW1lbnRzLmFwcGVu ZCh0b0VsZW1lbnQoYW5jZXN0b3IpKTsKLSAgICAgICAgfQorTlNEaWN0aW9uYXJ5KiBIVE1MQ29u dmVydGVyOjphZ2dyZWdhdGVkQXR0cmlidXRlc0ZvckVsZW1lbnRBbmRJdHNBbmNlc3RvcnMoRWxl bWVudCYgZWxlbWVudCkKK3sKKyAgICBhdXRvJiBjYWNoZWRBdHRyaWJ1dGVzID0gbV9hZ2dyZWdh dGVkQXR0cmlidXRlc0ZvckVsZW1lbnRzLmFkZCgmZWxlbWVudCwgbnVsbHB0cikuaXRlcmF0b3It PnZhbHVlOworICAgIGlmIChjYWNoZWRBdHRyaWJ1dGVzKQorICAgICAgICByZXR1cm4gY2FjaGVk QXR0cmlidXRlcy5nZXQoKTsKIAotICAgICAgICBhdHRyaWJ1dGVzID0gW05TTXV0YWJsZURpY3Rp b25hcnkgZGljdGlvbmFyeV07Ci0gICAgICAgIC8vIEZpbGwgYXR0cnMgZGljdGlvbmFyeSB3aXRo IGF0dHJpYnV0ZXMgZnJvbSB0aGUgaGlnaGVzdCB0byB0aGUgbG93ZXN0LCBub3Qgb3ZlcndyaXRp bmcgb25lcyBkZWVwZXIgaW4gdGhlIHRyZWUKLSAgICAgICAgZm9yICh1bnNpZ25lZCBpbmRleCA9 IGFuY2VzdG9yRWxlbWVudHMuc2l6ZSgpOyBpbmRleDspIHsKLSAgICAgICAgICAgIGluZGV4LS07 Ci0gICAgICAgICAgICBbYXR0cmlidXRlcyBhZGRFbnRyaWVzRnJvbURpY3Rpb25hcnk6YXR0cmli dXRlc0ZvckVsZW1lbnQoKmFuY2VzdG9yRWxlbWVudHNbaW5kZXhdKV07Ci0gICAgICAgIH0KKyAg ICBOU0RpY3Rpb25hcnkqIGF0dHJpYnV0ZXNGb3JDdXJyZW50RWxlbWVudCA9IGF0dHJpYnV0ZXNG b3JFbGVtZW50KGVsZW1lbnQpOworICAgIEFTU0VSVChhdHRyaWJ1dGVzRm9yQ3VycmVudEVsZW1l bnQpOworCisgICAgTm9kZSogYW5jZXN0b3IgPSBlbGVtZW50LnBhcmVudE5vZGUoKTsKKyAgICB3 aGlsZSAoYW5jZXN0b3IgJiYgIWFuY2VzdG9yLT5pc0VsZW1lbnROb2RlKCkpCisgICAgICAgIGFu Y2VzdG9yID0gYW5jZXN0b3ItPnBhcmVudE5vZGUoKTsKKworICAgIGlmICghYW5jZXN0b3IpIHsK KyAgICAgICAgY2FjaGVkQXR0cmlidXRlcyA9IGF0dHJpYnV0ZXNGb3JDdXJyZW50RWxlbWVudDsK KyAgICAgICAgcmV0dXJuIGF0dHJpYnV0ZXNGb3JDdXJyZW50RWxlbWVudDsKICAgICB9CiAKLSAg ICByZXR1cm4gYXR0cmlidXRlcy5nZXQoKTsKKyAgICBSZXRhaW5QdHI8TlNNdXRhYmxlRGljdGlv bmFyeT4gYXR0cmlidXRlc0ZvckFuY2VzdG9ycyA9IGFkb3B0TlMoW2FnZ3JlZ2F0ZWRBdHRyaWJ1 dGVzRm9yRWxlbWVudEFuZEl0c0FuY2VzdG9ycygqdG9FbGVtZW50KGFuY2VzdG9yKSkgbXV0YWJs ZUNvcHldKTsKKyAgICBbYXR0cmlidXRlc0ZvckFuY2VzdG9ycyBhZGRFbnRyaWVzRnJvbURpY3Rp b25hcnk6YXR0cmlidXRlc0ZvckN1cnJlbnRFbGVtZW50XTsKKyAgICBtX2FnZ3JlZ2F0ZWRBdHRy aWJ1dGVzRm9yRWxlbWVudHMuc2V0KCZlbGVtZW50LCBhdHRyaWJ1dGVzRm9yQW5jZXN0b3JzKTsK KworICAgIHJldHVybiBhdHRyaWJ1dGVzRm9yQW5jZXN0b3JzLmdldCgpOwogfQogCiB2b2lkIEhU TUxDb252ZXJ0ZXI6Ol9uZXdQYXJhZ3JhcGhGb3JFbGVtZW50KEVsZW1lbnQmIGVsZW1lbnQsIE5T U3RyaW5nICp0YWcsIEJPT0wgZmxhZywgQk9PTCBzdXBwcmVzc1RyYWlsaW5nU3BhY2UpCg== 228909 2014-04-08 16:28:18 -0700 2014-04-08 17:06:36 -0700 Patch for landing 2 fix131400c text/plain 4337 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Njk3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA0LTA4ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEhUTUxDb252ZXJ0ZXI6OmFnZ3Jl Z2F0ZWRBdHRyaWJ1dGVzRm9yQW5jZXN0b3JzIHNob3VsZCBjYWNoZSBpbnRlcm1lZGlhdGUgcmVz dWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMx NDAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICBJbnN0ZWFk IG9mIGFjY3VtdWxhdGluZyBhdHRyaWJ1dGVzIGZyb20gYSBjaGFyYWN0ZXIgbm9kZSB0byB0aGUg aGlnaGVzdCBhbmNlc3RvciwKKyAgICAgICAgcmVjdXJzaXZlbHkgY2FsbCBhZ2dyZWdhdGVkQXR0 cmlidXRlc0ZvckVsZW1lbnRBbmRJdHNBbmNlc3RvcnMgc28gdGhhdCBhZ2dyZWdhdGVkCisgICAg ICAgIGF0dHJpYnV0ZXMgYXJlIGNhY2hlZCBvbiBlYWNoIGFuY2VzdG9yIHRvIGVsaW1pbmF0ZSB0 aGUgb2xkIE8obl4yKSBiZWhhdmlvci4KKworICAgICAgICAqIGVkaXRpbmcvY29jb2EvSFRNTENv bnZlcnRlci5tbToKKyAgICAgICAgKEhUTUxDb252ZXJ0ZXI6OmFnZ3JlZ2F0ZWRBdHRyaWJ1dGVz Rm9yQW5jZXN0b3JzKToKKyAgICAgICAgKEhUTUxDb252ZXJ0ZXI6OmFnZ3JlZ2F0ZWRBdHRyaWJ1 dGVzRm9yRWxlbWVudEFuZEl0c0FuY2VzdG9ycyk6IEV4dHJhY3RlZCBmcm9tIGFnZ3JlZ2F0ZWRB dHRyaWJ1dGVzRm9yQW5jZXN0b3JzLgorCiAyMDE0LTA0LTA4ICBFbnJpY2EgQ2FzdWNjaSAgPGVu cmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBpT1MgYnVpbGQgZml4LgpJbmRl eDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvSFRNTENvbnZlcnRlci5tbQkocmV2 aXNpb24gMTY2OTc1KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVy dGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00NDksNyArNDQ5LDcgQEAKICAgICAKICAgICBIYXNo TWFwPFJlZlB0cjxFbGVtZW50PiwgUmV0YWluUHRyPE5TRGljdGlvbmFyeT4+IG1fYXR0cmlidXRl c0ZvckVsZW1lbnRzOwogICAgIEhhc2hNYXA8UmV0YWluUHRyPE5TVGV4dFRhYmxlPiwgUmVmUHRy PEVsZW1lbnQ+PiBtX3RleHRUYWJsZUZvb3RlcnM7Ci0gICAgSGFzaE1hcDxSZWZQdHI8RWxlbWVu dD4sIFJldGFpblB0cjxOU011dGFibGVEaWN0aW9uYXJ5Pj4gbV9hZ2dyZWdhdGVkQXR0cmlidXRl c0ZvckVsZW1lbnRzOworICAgIEhhc2hNYXA8UmVmUHRyPEVsZW1lbnQ+LCBSZXRhaW5QdHI8TlNE aWN0aW9uYXJ5Pj4gbV9hZ2dyZWdhdGVkQXR0cmlidXRlc0ZvckVsZW1lbnRzOwogCiAgICAgTlNN dXRhYmxlQXR0cmlidXRlZFN0cmluZyAqX2F0dHJTdHI7CiAgICAgTlNNdXRhYmxlRGljdGlvbmFy eSAqX2RvY3VtZW50QXR0cnM7CkBAIC00ODcsNyArNDg3LDggQEAKICAgICBOU0RpY3Rpb25hcnkg KmNvbXB1dGVkQXR0cmlidXRlc0ZvckVsZW1lbnQoRWxlbWVudCYpOwogICAgIE5TRGljdGlvbmFy eSAqYXR0cmlidXRlc0ZvckVsZW1lbnQoRWxlbWVudCYpOwogICAgIE5TRGljdGlvbmFyeSAqYWdn cmVnYXRlZEF0dHJpYnV0ZXNGb3JBbmNlc3RvcnMoQ2hhcmFjdGVyRGF0YSYpOwotICAgIAorICAg IE5TRGljdGlvbmFyeSogYWdncmVnYXRlZEF0dHJpYnV0ZXNGb3JFbGVtZW50QW5kSXRzQW5jZXN0 b3JzKEVsZW1lbnQmKTsKKwogICAgIEVsZW1lbnQqIF9ibG9ja0xldmVsRWxlbWVudEZvck5vZGUo Tm9kZSopOwogICAgIAogICAgIHZvaWQgX25ld1BhcmFncmFwaEZvckVsZW1lbnQoRWxlbWVudCYs IE5TU3RyaW5nICp0YWcsIEJPT0wgZmxhZywgQk9PTCBzdXBwcmVzc1RyYWlsaW5nU3BhY2UpOwpA QCAtMTM1NywyNSArMTM1OCwzMiBAQAogICAgICAgICBhbmNlc3RvciA9IGFuY2VzdG9yLT5wYXJl bnROb2RlKCk7CiAgICAgaWYgKCFhbmNlc3RvcikKICAgICAgICAgcmV0dXJuIG51bGxwdHI7Cisg ICAgcmV0dXJuIGFnZ3JlZ2F0ZWRBdHRyaWJ1dGVzRm9yRWxlbWVudEFuZEl0c0FuY2VzdG9ycygq dG9FbGVtZW50KGFuY2VzdG9yKSk7Cit9CiAKLSAgICBhdXRvJiBhdHRyaWJ1dGVzID0gbV9hZ2dy ZWdhdGVkQXR0cmlidXRlc0ZvckVsZW1lbnRzLmFkZCh0b0VsZW1lbnQoYW5jZXN0b3IpLCBudWxs cHRyKS5pdGVyYXRvci0+dmFsdWU7Ci0gICAgaWYgKCFhdHRyaWJ1dGVzKSB7Ci0gICAgICAgIFZl Y3RvcjxFbGVtZW50KiwgMTY+IGFuY2VzdG9yRWxlbWVudHM7Ci0gICAgICAgIGFuY2VzdG9yRWxl bWVudHMuYXBwZW5kKHRvRWxlbWVudChhbmNlc3RvcikpOwotICAgICAgICBmb3IgKDsgYW5jZXN0 b3I7IGFuY2VzdG9yID0gYW5jZXN0b3ItPnBhcmVudE5vZGUoKSkgewotICAgICAgICAgICAgaWYg KGFuY2VzdG9yLT5pc0VsZW1lbnROb2RlKCkpCi0gICAgICAgICAgICAgICAgYW5jZXN0b3JFbGVt ZW50cy5hcHBlbmQodG9FbGVtZW50KGFuY2VzdG9yKSk7Ci0gICAgICAgIH0KK05TRGljdGlvbmFy eSogSFRNTENvbnZlcnRlcjo6YWdncmVnYXRlZEF0dHJpYnV0ZXNGb3JFbGVtZW50QW5kSXRzQW5j ZXN0b3JzKEVsZW1lbnQmIGVsZW1lbnQpCit7CisgICAgYXV0byYgY2FjaGVkQXR0cmlidXRlcyA9 IG1fYWdncmVnYXRlZEF0dHJpYnV0ZXNGb3JFbGVtZW50cy5hZGQoJmVsZW1lbnQsIG51bGxwdHIp Lml0ZXJhdG9yLT52YWx1ZTsKKyAgICBpZiAoY2FjaGVkQXR0cmlidXRlcykKKyAgICAgICAgcmV0 dXJuIGNhY2hlZEF0dHJpYnV0ZXMuZ2V0KCk7CiAKLSAgICAgICAgYXR0cmlidXRlcyA9IFtOU011 dGFibGVEaWN0aW9uYXJ5IGRpY3Rpb25hcnldOwotICAgICAgICAvLyBGaWxsIGF0dHJzIGRpY3Rp b25hcnkgd2l0aCBhdHRyaWJ1dGVzIGZyb20gdGhlIGhpZ2hlc3QgdG8gdGhlIGxvd2VzdCwgbm90 IG92ZXJ3cml0aW5nIG9uZXMgZGVlcGVyIGluIHRoZSB0cmVlCi0gICAgICAgIGZvciAodW5zaWdu ZWQgaW5kZXggPSBhbmNlc3RvckVsZW1lbnRzLnNpemUoKTsgaW5kZXg7KSB7Ci0gICAgICAgICAg ICBpbmRleC0tOwotICAgICAgICAgICAgW2F0dHJpYnV0ZXMgYWRkRW50cmllc0Zyb21EaWN0aW9u YXJ5OmF0dHJpYnV0ZXNGb3JFbGVtZW50KCphbmNlc3RvckVsZW1lbnRzW2luZGV4XSldOwotICAg ICAgICB9CisgICAgTlNEaWN0aW9uYXJ5KiBhdHRyaWJ1dGVzRm9yQ3VycmVudEVsZW1lbnQgPSBh dHRyaWJ1dGVzRm9yRWxlbWVudChlbGVtZW50KTsKKyAgICBBU1NFUlQoYXR0cmlidXRlc0ZvckN1 cnJlbnRFbGVtZW50KTsKKworICAgIE5vZGUqIGFuY2VzdG9yID0gZWxlbWVudC5wYXJlbnROb2Rl KCk7CisgICAgd2hpbGUgKGFuY2VzdG9yICYmICFhbmNlc3Rvci0+aXNFbGVtZW50Tm9kZSgpKQor ICAgICAgICBhbmNlc3RvciA9IGFuY2VzdG9yLT5wYXJlbnROb2RlKCk7CisKKyAgICBpZiAoIWFu Y2VzdG9yKSB7CisgICAgICAgIGNhY2hlZEF0dHJpYnV0ZXMgPSBhdHRyaWJ1dGVzRm9yQ3VycmVu dEVsZW1lbnQ7CisgICAgICAgIHJldHVybiBhdHRyaWJ1dGVzRm9yQ3VycmVudEVsZW1lbnQ7CiAg ICAgfQogCi0gICAgcmV0dXJuIGF0dHJpYnV0ZXMuZ2V0KCk7CisgICAgUmV0YWluUHRyPE5TTXV0 YWJsZURpY3Rpb25hcnk+IGF0dHJpYnV0ZXNGb3JBbmNlc3RvcnMgPSBhZG9wdE5TKFthZ2dyZWdh dGVkQXR0cmlidXRlc0ZvckVsZW1lbnRBbmRJdHNBbmNlc3RvcnMoKnRvRWxlbWVudChhbmNlc3Rv cikpIG11dGFibGVDb3B5XSk7CisgICAgW2F0dHJpYnV0ZXNGb3JBbmNlc3RvcnMgYWRkRW50cmll c0Zyb21EaWN0aW9uYXJ5OmF0dHJpYnV0ZXNGb3JDdXJyZW50RWxlbWVudF07CisgICAgbV9hZ2dy ZWdhdGVkQXR0cmlidXRlc0ZvckVsZW1lbnRzLnNldCgmZWxlbWVudCwgYXR0cmlidXRlc0ZvckFu Y2VzdG9ycyk7CisKKyAgICByZXR1cm4gYXR0cmlidXRlc0ZvckFuY2VzdG9ycy5nZXQoKTsKIH0K IAogdm9pZCBIVE1MQ29udmVydGVyOjpfbmV3UGFyYWdyYXBoRm9yRWxlbWVudChFbGVtZW50JiBl bGVtZW50LCBOU1N0cmluZyAqdGFnLCBCT09MIGZsYWcsIEJPT0wgc3VwcHJlc3NUcmFpbGluZ1Nw YWNlKQo=