79115 2012-02-21 08:37:38 -0800 [BlackBerry] Fat fingers - cache the first rect-based hit test so we do not need to do it again 2012-02-21 11:49:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tonikitoo tonikitoo efidler rwlbuis oldest_to_newest 560907 0 tonikitoo 2012-02-21 08:37:38 -0800 Fat fingers is two phased, and it rect-hittests twice needlessly. Instead, we could/should cache the result of the first when performing the "phase_2". Patch coming... 560915 1 tonikitoo 2012-02-21 08:46:02 -0800 PR #120835 560934 2 127982 tonikitoo 2012-02-21 08:59:45 -0800 Created attachment 127982 patch v1 561038 3 127982 manyoso 2012-02-21 11:01:24 -0800 Comment on attachment 127982 patch v1 Clean the cache? 561099 4 128013 tonikitoo 2012-02-21 11:48:40 -0800 Created attachment 128013 (committed r108380, r=atreat) patch v2 - for landing 127982 2012-02-21 08:59:45 -0800 2012-02-21 11:48:40 -0800 patch v1 0001-2012-02-18-Antonio-Gomes-agomes-rim.com.patch text/plain 9125 tonikitoo RnJvbSA1MzY4NjlkY2NlMjUxM2UxYWUwMTBmMWFiNzRkNzIxNmVjZGVmZmYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog U3VuLCAxOSBGZWIgMjAxMiAwMToyMzoxNCAtMDUwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTItMDIt MTggIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNvbT4KCiAgICAgICAgRmF0IGZpbmdlcnMg LSBjYWNoZSB0aGUgZmlyc3QgcmVjdC1iYXNlZCBoaXQgdGVzdCBzbyB3ZSBkbyBub3QgbmVlZCB0 byBkbyBpdCBhZ2FpbgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03OTExNQoKICAgICAgICBSZXZpZXdlZCBieSBPT1BTLgoKICAgICAgICBPdXIgRmF0Rmlu Z2VycyBpbXBsZW1lbnRhdGlvbiBydW5zIGN1cnJlbnRseSBpbiB0d28gcGhhc2VzOgogICAgICAg IHRoZSBmaXJzdCBjaGVja3MgZm9yIHRoZSBlbGVtZW50cyBpbnRyaW5zaWNhbGx5IGNsaWNrYWJs ZTsKICAgICAgICB0aGUgc2Vjb25kIGNoZWNrcyBmb3IgZWxlbWVudHMgbWFkZSBjbGlja2FibGUg YnkgdGhlIHBhZ2UKICAgICAgICAoZm9yIGV4YW1wbGUsIGEgZGl2IHdpdGggYSBvbmNsaWNrIGV2 ZW50IGxpc3RlbmVyIGF0dGFjaGVkIHRvIGl0KS4KICAgICAgICBGb3IgZWFjaCBwaGFzZSwgd2Ug cGVyZm9ybSBhIHJlY3QgaGl0dGVzdCwgd2hpY2ggaXMgbm90IG5lZWRlZCBzaW5jZQogICAgICAg IHRoZSByZXN1bHQgb2YgZWFjaCBpcyB0aGUgc2FtZS4KCiAgICAgICAgUGF0Y2ggaW50cm9kdWNl cyBhIGNhY2hpbmcgbWVjaGFuaXNtIHNvIHdlIGF2b2lkIG9uIHJlY3QgaGl0dGVzdDoKICAgICAg ICB3aGVuIHRoZSBmaXJzdCBwaGFzZSBydW5zLCBpdCBjYWNoZXMgZWFjaCBub2Rlc2V0IHBlciBk b2N1bWVudCBpbgogICAgICAgIGEgaGFzaG1hcC4gVGhpcyBzZWNvbmQgcGhhc2Ugd29ya3Mgd2l0 aCB0aGUgY2FjaGVkIHJlc3VsdHMuCgogICAgICAgIE5vIGJlaGF2aW9yYWwgY2hhbmdlLCBidXQg cGVyZm9ybWFuY2UgaXMgYmV0dGVyIHNpbmNlIHdlCiAgICAgICAgYXZvaWQgb25lIChwb3NzaWJs eSBleHBlbnNpdmUpIHJlY3QgaGl0dGVzdC4KCiAgICAgICAgSSBtZWFzdXJlZCB0aGUgcGVyZm9y bWFuY2UgZ2FpbiBvbiBodHRwczovL3d3dy5rdmQuc2UvLCBhbmQgd2UKICAgICAgICBzYXZlIHVw IHRvIDAuMDQgc2Vjb25kcywgYnkgY2FjaGluZyBhbmQgcmUtdXNpbmcgdGhlIHJlc3VsdHMuCgog ICAgICAgICogV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmNwcDoKICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpkdW1wSGl0VGVzdFJlc3VsdCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6RmF0RmluZ2Vyczo6ZmluZEJlc3RQb2ludCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6RmF0RmluZ2Vyczo6ZmluZEludGVyc2VjdGluZ1JlZ2lvbnMpOgogICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmNhY2hpbmdTdHJhdGVneSk6CiAgICAgICAgKFdlYktp dCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6Z2V0Tm9kZXNGcm9t UmVjdCk6CiAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuaDoKLS0tCiBTb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICB8ICAgMzMgKysrKysr KysrKysrKysrCiAuLi4vV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJz LmNwcCB8ICAgNDMgKysrKysrKysrKysrKysrKystLS0KIC4uLi9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuaCAgIHwgICAxMSArKysrLQogMyBmaWxlcyBjaGFuZ2Vk LCA3OSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hh bmdlTG9nCmluZGV4IGVkN2RhZmQuLjg4MjljNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTAyLTE4ICBBbnRvbmlvIEdvbWVzICA8YWdvbWVz QHJpbS5jb20+CisKKyAgICAgICAgRmF0IGZpbmdlcnMgLSBjYWNoZSB0aGUgZmlyc3QgcmVjdC1i YXNlZCBoaXQgdGVzdCBzbyB3ZSBkbyBub3QgbmVlZCB0byBkbyBpdCBhZ2FpbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzkxMTUKKworICAgICAgICBS ZXZpZXdlZCBieSBPT1BTLgorCisgICAgICAgIE91ciBGYXRGaW5nZXJzIGltcGxlbWVudGF0aW9u IHJ1bnMgY3VycmVudGx5IGluIHR3byBwaGFzZXM6CisgICAgICAgIHRoZSBmaXJzdCBjaGVja3Mg Zm9yIHRoZSBlbGVtZW50cyBpbnRyaW5zaWNhbGx5IGNsaWNrYWJsZTsKKyAgICAgICAgdGhlIHNl Y29uZCBjaGVja3MgZm9yIGVsZW1lbnRzIG1hZGUgY2xpY2thYmxlIGJ5IHRoZSBwYWdlCisgICAg ICAgIChmb3IgZXhhbXBsZSwgYSBkaXYgd2l0aCBhIG9uY2xpY2sgZXZlbnQgbGlzdGVuZXIgYXR0 YWNoZWQgdG8gaXQpLgorICAgICAgICBGb3IgZWFjaCBwaGFzZSwgd2UgcGVyZm9ybSBhIHJlY3Qg aGl0dGVzdCwgd2hpY2ggaXMgbm90IG5lZWRlZCBzaW5jZQorICAgICAgICB0aGUgcmVzdWx0IG9m IGVhY2ggaXMgdGhlIHNhbWUuCisKKyAgICAgICAgUGF0Y2ggaW50cm9kdWNlcyBhIGNhY2hpbmcg bWVjaGFuaXNtIHNvIHdlIGF2b2lkIG9uIHJlY3QgaGl0dGVzdDoKKyAgICAgICAgd2hlbiB0aGUg Zmlyc3QgcGhhc2UgcnVucywgaXQgY2FjaGVzIGVhY2ggbm9kZXNldCBwZXIgZG9jdW1lbnQgaW4K KyAgICAgICAgYSBoYXNobWFwLiBUaGlzIHNlY29uZCBwaGFzZSB3b3JrcyB3aXRoIHRoZSBjYWNo ZWQgcmVzdWx0cy4KKworICAgICAgICBObyBiZWhhdmlvcmFsIGNoYW5nZSwgYnV0IHBlcmZvcm1h bmNlIGlzIGJldHRlciBzaW5jZSB3ZQorICAgICAgICBhdm9pZCBvbmUgKHBvc3NpYmx5IGV4cGVu c2l2ZSkgcmVjdCBoaXR0ZXN0LgorCisgICAgICAgIEkgbWVhc3VyZWQgdGhlIHBlcmZvcm1hbmNl IGdhaW4gb24gaHR0cHM6Ly93d3cua3ZkLnNlLywgYW5kIHdlCisgICAgICAgIHNhdmUgdXAgdG8g MC4wNCBzZWNvbmRzLCBieSBjYWNoaW5nIGFuZCByZS11c2luZyB0aGUgcmVzdWx0cy4KKworICAg ICAgICAqIFdlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OmR1bXBIaXRUZXN0UmVzdWx0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6RmF0RmluZ2Vyczo6ZmluZEJlc3RQb2ludCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OkZhdEZpbmdlcnM6OmZpbmRJbnRlcnNlY3RpbmdSZWdpb25zKToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6Y2FjaGluZ1N0cmF0ZWd5KToKKyAgICAgICAgKFdl YktpdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmdldE5vZGVz RnJvbVJlY3QpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5oOgorCiAyMDEy LTAyLTIwICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5jb20+CiAKICAgICAgICAgQWxsIGRl ZmF1bHQgdmlkZW8vYXVkaW8gY29udHJvbCBlbGVtZW50cyBzaG91bGQgYmUgcmVjdC1oaXQgdGVz dGFibGUgKFBhcnQgSUkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi S2l0U3VwcG9ydC9GYXRGaW5nZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwCmluZGV4IGQ2NzU3OGIuLjkyZmQzMmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMu Y3BwCkBAIC0xNzMsNiArMTczLDkgQEAgY29uc3QgRmF0RmluZ2Vyc1Jlc3VsdCBGYXRGaW5nZXJz OjpmaW5kQmVzdFBvaW50KCkKIAogICAgIGlmICghbV93ZWJQYWdlLT5tX21haW5GcmFtZSkKICAg ICAgICAgcmV0dXJuIG1fY29udGVudFBvczsKKworICAgIG1fY2FjaGVkUmVjdEhpdFRlc3RSZXN1 bHRzLmNsZWFyKCk7CisKICAgICBGYXRGaW5nZXJzUmVzdWx0IHJlc3VsdChtX2NvbnRlbnRQb3Mp OwogICAgIG1fbWF0Y2hpbmdBcHByb2FjaCA9IENsaWNrYWJsZUJ5RGVmYXVsdDsKIApAQCAtMzEx LDE2ICszMTQsMTUgQEAgYm9vbCBGYXRGaW5nZXJzOjpmaW5kSW50ZXJzZWN0aW5nUmVnaW9ucyhE b2N1bWVudCogZG9jdW1lbnQsCiAgICAgICAgIG1fZGVidWdGYXRGaW5nZXJSZWN0ID0gbV93ZWJQ YWdlLT5tYXBUb1RyYW5zZm9ybWVkKG1fd2ViUGFnZS0+bWFwRnJvbUNvbnRlbnRzVG9WaWV3cG9y dChmaW5nZXJSZWN0KSk7CiAjZW5kaWYKIAotICAgIC8vIERvY3VtZW50Ojpub2Rlc0Zyb21SZWN0 IG5lZWRzIHZpZXdwb3J0IGNvb3JkaW5hdGVzLCBidXQgRmF0RmluZ2VyOjpub2Rlc0Zyb21SZWN0 IGdldHMgY29udGVudHMgY29vcmRpbmF0ZXMKLSAgICAvLyBmb3Igc2ltcGxpY2l0eSBpbnN0ZWFk LgogICAgIGJvb2wgZm91bmRPbmUgPSBmYWxzZTsKLSAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCA9 IG5vZGVzRnJvbVJlY3QoZG9jdW1lbnQsIGZyYW1lQ29udGVudFBvcyk7CiAKICAgICBSZW5kZXJM YXllciogbG93ZXN0UG9zaXRpb25lZEVuY2xvc2luZ0xheWVyU29GYXIgPSAwOwogCiAgICAgLy8g SXRlcmF0ZSBvdmVyIHRoZSBsaXN0IG9mIG5vZGVzIChhbmQgc3VicmVjdHMgb2Ygbm9kZXMgd2hl cmUgcG9zc2libGUpLCBmb3IgZWFjaCBzYXZpbmcgdGhlCiAgICAgLy8gaW50ZXJzZWN0aW9uIG9m IHRoZSBib3VuZGluZyBib3ggd2l0aCB0aGUgZmluZ2VyIHJlY3QuCi0gICAgTGlzdEhhc2hTZXQ8 UmVmUHRyPE5vZGU+ID4gaW50ZXJzZWN0ZWROb2RlcyA9IHJlc3VsdC5yZWN0QmFzZWRUZXN0UmVz dWx0KCk7CisgICAgTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID4gaW50ZXJzZWN0ZWROb2RlczsK KyAgICBnZXROb2Rlc0Zyb21SZWN0KGRvY3VtZW50LCBmcmFtZUNvbnRlbnRQb3MsIGludGVyc2Vj dGVkTm9kZXMpOworCiAgICAgTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID46OmNvbnN0X2l0ZXJh dG9yIGl0ID0gaW50ZXJzZWN0ZWROb2Rlcy5iZWdpbigpOwogICAgIExpc3RIYXNoU2V0PFJlZlB0 cjxOb2RlPiA+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBpbnRlcnNlY3RlZE5vZGVzLmVuZCgpOwog ICAgIGZvciAoIDsgaXQgIT0gZW5kOyArK2l0KSB7CkBAIC00NjEsOCArNDYzLDMyIEBAIHZvaWQg RmF0RmluZ2Vyczo6Z2V0UGFkZGluZ3ModW5zaWduZWQmIHRvcCwgdW5zaWduZWQmIHJpZ2h0LCB1 bnNpZ25lZCYgYm90dG9tLCB1CiAgICAgbGVmdCA9IGxlZnRQYWRkaW5nIC8gY3VycmVudFNjYWxl OwogfQogCi1IaXRUZXN0UmVzdWx0IEZhdEZpbmdlcnM6Om5vZGVzRnJvbVJlY3QoRG9jdW1lbnQq IGRvY3VtZW50LCBjb25zdCBJbnRQb2ludCYgY29udGVudFBvcykgY29uc3QKK0ZhdEZpbmdlcnM6 OkNhY2hlZFJlc3VsdHNTdHJhdGVneSBGYXRGaW5nZXJzOjpjYWNoaW5nU3RyYXRlZ3koKSBjb25z dAoreworICAgIHN3aXRjaCAobV9tYXRjaGluZ0FwcHJvYWNoKSB7CisgICAgY2FzZSBDbGlja2Fi bGVFbGVtZW50OgorICAgICAgICByZXR1cm4gR2V0RnJvbVJlbmRlclRyZWU7CisgICAgY2FzZSBN YWRlQ2xpY2thYmxlQnlUaGVXZWJwYWdlOgorICAgICAgICByZXR1cm4gR2V0RnJvbUNhY2hlOwor ICAgIGNhc2UgRG9uZToKKyAgICBkZWZhdWx0OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICAgICAgcmV0dXJuIEdldEZyb21SZW5kZXJUcmVlOworICAgIH0KK30KKwordm9pZCBG YXRGaW5nZXJzOjpnZXROb2Rlc0Zyb21SZWN0KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgSW50 UG9pbnQmIGNvbnRlbnRQb3MsIExpc3RIYXNoU2V0PFJlZlB0cjxXZWJDb3JlOjpOb2RlPiA+JiBp bnRlcnNlY3RlZE5vZGVzKQogeworICAgIEZhdEZpbmdlcnM6OkNhY2hlZFJlc3VsdHNTdHJhdGVn eSBjYWNoZVJlc29sdmluZ1N0cmF0ZWd5ID0gY2FjaGluZ1N0cmF0ZWd5KCk7CisKKyAgICBpZiAo Y2FjaGVSZXNvbHZpbmdTdHJhdGVneSA9PSBHZXRGcm9tQ2FjaGUpIHsKKyAgICAgICAgQVNTRVJU KG1fY2FjaGVkUmVjdEhpdFRlc3RSZXN1bHRzLmNvbnRhaW5zKGRvY3VtZW50KSk7CisgICAgICAg IGludGVyc2VjdGVkTm9kZXMgPSBtX2NhY2hlZFJlY3RIaXRUZXN0UmVzdWx0cy5nZXQoZG9jdW1l bnQpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgQVNTRVJUKGNhY2hlUmVzb2x2aW5n U3RyYXRlZ3kgPT0gR2V0RnJvbVJlbmRlclRyZWUpOworCiAgICAgdW5zaWduZWQgdG9wUGFkZGlu ZywgcmlnaHRQYWRkaW5nLCBib3R0b21QYWRkaW5nLCBsZWZ0UGFkZGluZzsKICAgICBnZXRQYWRk aW5ncyh0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5n KTsKIApAQCAtNDcwLDcgKzQ5NiwxMiBAQCBIaXRUZXN0UmVzdWx0IEZhdEZpbmdlcnM6Om5vZGVz RnJvbVJlY3QoRG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBJbnRQb2ludCYgY29udAogICAgIEhp dFRlc3RSZXN1bHQgcmVzdWx0KGNvbnRlbnRQb3MsIHRvcFBhZGRpbmcsIHJpZ2h0UGFkZGluZywg Ym90dG9tUGFkZGluZywgbGVmdFBhZGRpbmcsIEhpdFRlc3RTaGFkb3dET00pOwogCiAgICAgZG9j dW1lbnQtPnJlbmRlclZpZXcoKS0+bGF5ZXIoKS0+aGl0VGVzdChyZXF1ZXN0LCByZXN1bHQpOwot ICAgIHJldHVybiByZXN1bHQ7CisjaWYgREVCVUdfRkFUX0ZJTkdFUlMKKyAgICBkdW1wSGl0VGVz dFJlc3VsdChyZXN1bHQpOworI2VuZGlmCisKKyAgICBtX2NhY2hlZFJlY3RIaXRUZXN0UmVzdWx0 cy5hZGQoZG9jdW1lbnQsIHJlc3VsdC5yZWN0QmFzZWRUZXN0UmVzdWx0KCkpOworICAgIGludGVy c2VjdGVkTm9kZXMgPSByZXN1bHQucmVjdEJhc2VkVGVzdFJlc3VsdCgpOwogfQogCiB2b2lkIEZh dEZpbmdlcnM6OmdldFJlbGV2YW50SW5mb0Zyb21Qb2ludChEb2N1bWVudCogZG9jdW1lbnQsIGNv bnN0IEludFBvaW50JiBjb250ZW50UG9zLCBFbGVtZW50KiYgZWxlbWVudFVuZGVyUG9pbnQsIEVs ZW1lbnQqJiBjbGlja2FibGVFbGVtZW50VW5kZXJQb2ludCkgY29uc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuaCBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuaAppbmRleCBjMTdk N2I0Li42Yjg0N2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0 U3VwcG9ydC9GYXRGaW5nZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktp dFN1cHBvcnQvRmF0RmluZ2Vycy5oCkBAIC0yNSw2ICsyNSw5IEBACiAjaW5jbHVkZSA8QmxhY2tC ZXJyeVBsYXRmb3JtSW50UmVjdFJlZ2lvbi5oPgogCiAjaW5jbHVkZSA8dXRpbGl0eT4KKworI2lu Y2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CisjaW5jbHVkZSA8d3RmL0xpc3RIYXNoU2V0Lmg+CiAjaW5j bHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0xMTMsNiArMTE2 LDEwIEBAIHByaXZhdGU6CiAKICAgICB0eXBlZGVmIHN0ZDo6cGFpcjxXZWJDb3JlOjpOb2RlKiwg UGxhdGZvcm06OkludFJlY3RSZWdpb24+IEludGVyc2VjdGluZ1JlZ2lvbjsKIAorICAgIGVudW0g Q2FjaGVkUmVzdWx0c1N0cmF0ZWd5IHsgR2V0RnJvbVJlbmRlclRyZWUgPSAwLCBHZXRGcm9tQ2Fj aGUgfTsKKyAgICBDYWNoZWRSZXN1bHRzU3RyYXRlZ3kgY2FjaGluZ1N0cmF0ZWd5KCkgY29uc3Q7 CisgICAgdHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxXZWJDb3JlOjpEb2N1bWVudD4sIExpc3RIYXNo U2V0PFJlZlB0cjxXZWJDb3JlOjpOb2RlPiA+ID4gQ2FjaGVkUmVjdEhpdFRlc3RSZXN1bHRzOwor CiAgICAgYm9vbCBjaGVja0ZpbmdlckludGVyc2VjdGlvbihjb25zdCBQbGF0Zm9ybTo6SW50UmVj dFJlZ2lvbiYsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQbGF0Zm9y bTo6SW50UmVjdFJlZ2lvbiYgcmVtYWluaW5nRmluZ2VyUmVnaW9uLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgV2ViQ29yZTo6Tm9kZSosCkBAIC0xMzMsOCArMTQwLDcgQEAgcHJp dmF0ZToKIAogICAgIHZvaWQgc2V0U3VjY2Vzc2Z1bEZhdEZpbmdlcnNSZXN1bHQoRmF0RmluZ2Vy c1Jlc3VsdCYsIFdlYkNvcmU6Ok5vZGUqLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogCi0g ICAgLy8gSXQgbWltaWNzIERvY3VtZW50Ojpub2Rlc0Zyb21SZWN0LCBidXQgaGFzIGEgZGlmZmVy ZW50IHJldHVybiB2YWx1ZSB0byBmaXQgb3VyIG5lZWRzLgotICAgIFdlYkNvcmU6OkhpdFRlc3RS ZXN1bHQgbm9kZXNGcm9tUmVjdChXZWJDb3JlOjpEb2N1bWVudCosIGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50JikgY29uc3Q7CisgICAgdm9pZCBnZXROb2Rlc0Zyb21SZWN0KFdlYkNvcmU6OkRvY3Vt ZW50KiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBMaXN0SGFzaFNldDxSZWZQdHI8V2ViQ29y ZTo6Tm9kZT4gPiYpOwogCiAgICAgLy8gSXQgbWltaWNzIERvY3VtZW50OjplbGVtZW50RnJvbVBv aW50LCBidXQgcmVjdXJzaXZlbHkgaGl0LXRlc3RzIGluIGNhc2UgYW4gaW5uZXIgZnJhbWUgaXMg Zm91bmQuCiAgICAgdm9pZCBnZXRSZWxldmFudEluZm9Gcm9tUG9pbnQoV2ViQ29yZTo6RG9jdW1l bnQqLApAQCAtMTUxLDYgKzE1Nyw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6SW50UG9pbnQg bV9jb250ZW50UG9zOwogICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBlOwogICAgIE1hdGNoaW5n QXBwcm9hY2hGb3JDbGlja2FibGUgbV9tYXRjaGluZ0FwcHJvYWNoOworICAgIENhY2hlZFJlY3RI aXRUZXN0UmVzdWx0cyBtX2NhY2hlZFJlY3RIaXRUZXN0UmVzdWx0czsKIH07CiAKIH0KLS0gCjEu Ny4xCgo= 128013 2012-02-21 11:48:40 -0800 2012-02-21 11:49:16 -0800 (committed r108380, r=atreat) patch v2 - for landing 0001-2012-02-18-Antonio-Gomes-agomes-rim.com.patch text/plain 9349 tonikitoo RnJvbSA5Y2RlOWI3M2NjZWUxNWU0OWMzYjFjZTgyMGI3NTE1MTVmODBlYTI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog U3VuLCAxOSBGZWIgMjAxMiAwMToyMzoxNCAtMDUwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTItMDIt MTggIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNvbT4KCiAgICAgICAgRmF0IGZpbmdlcnMg LSBjYWNoZSB0aGUgZmlyc3QgcmVjdC1iYXNlZCBoaXQgdGVzdCBzbyB3ZSBkbyBub3QgbmVlZCB0 byBkbyBpdCBhZ2FpbgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03OTExNQoKICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFRyZWF0LgoKICAgICAgICBPdXIg RmF0RmluZ2VycyBpbXBsZW1lbnRhdGlvbiBydW5zIGN1cnJlbnRseSBpbiB0d28gcGhhc2VzOgog ICAgICAgIHRoZSBmaXJzdCBjaGVja3MgZm9yIHRoZSBlbGVtZW50cyBpbnRyaW5zaWNhbGx5IGNs aWNrYWJsZTsKICAgICAgICB0aGUgc2Vjb25kIGNoZWNrcyBmb3IgZWxlbWVudHMgbWFkZSBjbGlj a2FibGUgYnkgdGhlIHBhZ2UKICAgICAgICAoZm9yIGV4YW1wbGUsIGEgZGl2IHdpdGggYSBvbmNs aWNrIGV2ZW50IGxpc3RlbmVyIGF0dGFjaGVkIHRvIGl0KS4KICAgICAgICBGb3IgZWFjaCBwaGFz ZSwgd2UgcGVyZm9ybSBhIHJlY3QgaGl0dGVzdCwgd2hpY2ggaXMgbm90IG5lZWRlZCBzaW5jZQog ICAgICAgIHRoZSByZXN1bHQgb2YgZWFjaCBpcyB0aGUgc2FtZS4KCiAgICAgICAgUGF0Y2ggaW50 cm9kdWNlcyBhIGNhY2hpbmcgbWVjaGFuaXNtIHNvIHdlIGF2b2lkIG9uIHJlY3QgaGl0dGVzdDoK ICAgICAgICB3aGVuIHRoZSBmaXJzdCBwaGFzZSBydW5zLCBpdCBjYWNoZXMgZWFjaCBub2Rlc2V0 IHBlciBkb2N1bWVudCBpbgogICAgICAgIGEgaGFzaG1hcC4gVGhpcyBzZWNvbmQgcGhhc2Ugd29y a3Mgd2l0aCB0aGUgY2FjaGVkIHJlc3VsdHMuCgogICAgICAgIE5vIGJlaGF2aW9yYWwgY2hhbmdl LCBidXQgcGVyZm9ybWFuY2UgaXMgYmV0dGVyIHNpbmNlIHdlCiAgICAgICAgYXZvaWQgb25lIChw b3NzaWJseSBleHBlbnNpdmUpIHJlY3QgaGl0dGVzdC4KCiAgICAgICAgSSBtZWFzdXJlZCB0aGUg cGVyZm9ybWFuY2UgZ2FpbiBvbiBodHRwczovL3d3dy5rdmQuc2UvLCBhbmQgd2UKICAgICAgICBz YXZlIHVwIHRvIDAuMDQgc2Vjb25kcywgYnkgY2FjaGluZyBhbmQgcmUtdXNpbmcgdGhlIHJlc3Vs dHMuCgogICAgICAgICogV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmNwcDoKICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpkdW1wSGl0VGVzdFJlc3VsdCk6CiAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6RmF0RmluZ2Vyczo6ZmluZEJlc3RQb2ludCk6CiAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6RmF0RmluZ2Vyczo6ZmluZEludGVyc2VjdGluZ1JlZ2lvbnMpOgogICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmNhY2hpbmdTdHJhdGVneSk6CiAgICAgICAg KFdlYktpdCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6Z2V0Tm9k ZXNGcm9tUmVjdCk6CiAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuaDoKLS0tCiBT b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICB8ICAgMzMg KysrKysrKysrKysrKysrCiAuLi4vV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRG aW5nZXJzLmNwcCB8ICAgNDIgKysrKysrKysrKysrKysrKy0tLS0KIC4uLi9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuaCAgIHwgICAxMSArKysrLQogMyBmaWxlcyBj aGFuZ2VkLCA3NiBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0NoYW5nZUxvZwppbmRleCBlZDdkYWZkLi45ZDZiNjNmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAxMi0wMi0xOCAgQW50b25pbyBHb21lcyAg PGFnb21lc0ByaW0uY29tPgorCisgICAgICAgIEZhdCBmaW5nZXJzIC0gY2FjaGUgdGhlIGZpcnN0 IHJlY3QtYmFzZWQgaGl0IHRlc3Qgc28gd2UgZG8gbm90IG5lZWQgdG8gZG8gaXQgYWdhaW4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MTE1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBUcmVhdC4KKworICAgICAgICBPdXIgRmF0RmluZ2VycyBp bXBsZW1lbnRhdGlvbiBydW5zIGN1cnJlbnRseSBpbiB0d28gcGhhc2VzOgorICAgICAgICB0aGUg Zmlyc3QgY2hlY2tzIGZvciB0aGUgZWxlbWVudHMgaW50cmluc2ljYWxseSBjbGlja2FibGU7Cisg ICAgICAgIHRoZSBzZWNvbmQgY2hlY2tzIGZvciBlbGVtZW50cyBtYWRlIGNsaWNrYWJsZSBieSB0 aGUgcGFnZQorICAgICAgICAoZm9yIGV4YW1wbGUsIGEgZGl2IHdpdGggYSBvbmNsaWNrIGV2ZW50 IGxpc3RlbmVyIGF0dGFjaGVkIHRvIGl0KS4KKyAgICAgICAgRm9yIGVhY2ggcGhhc2UsIHdlIHBl cmZvcm0gYSByZWN0IGhpdHRlc3QsIHdoaWNoIGlzIG5vdCBuZWVkZWQgc2luY2UKKyAgICAgICAg dGhlIHJlc3VsdCBvZiBlYWNoIGlzIHRoZSBzYW1lLgorCisgICAgICAgIFBhdGNoIGludHJvZHVj ZXMgYSBjYWNoaW5nIG1lY2hhbmlzbSBzbyB3ZSBhdm9pZCBvbiByZWN0IGhpdHRlc3Q6CisgICAg ICAgIHdoZW4gdGhlIGZpcnN0IHBoYXNlIHJ1bnMsIGl0IGNhY2hlcyBlYWNoIG5vZGVzZXQgcGVy IGRvY3VtZW50IGluCisgICAgICAgIGEgaGFzaG1hcC4gVGhpcyBzZWNvbmQgcGhhc2Ugd29ya3Mg d2l0aCB0aGUgY2FjaGVkIHJlc3VsdHMuCisKKyAgICAgICAgTm8gYmVoYXZpb3JhbCBjaGFuZ2Us IGJ1dCBwZXJmb3JtYW5jZSBpcyBiZXR0ZXIgc2luY2Ugd2UKKyAgICAgICAgYXZvaWQgb25lIChw b3NzaWJseSBleHBlbnNpdmUpIHJlY3QgaGl0dGVzdC4KKworICAgICAgICBJIG1lYXN1cmVkIHRo ZSBwZXJmb3JtYW5jZSBnYWluIG9uIGh0dHBzOi8vd3d3Lmt2ZC5zZS8sIGFuZCB3ZQorICAgICAg ICBzYXZlIHVwIHRvIDAuMDQgc2Vjb25kcywgYnkgY2FjaGluZyBhbmQgcmUtdXNpbmcgdGhlIHJl c3VsdHMuCisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0ZhdEZpbmdlcnMuY3BwOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpkdW1wSGl0VGVzdFJlc3VsdCk6CisgICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmZpbmRCZXN0UG9pbnQpOgorICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpGYXRGaW5nZXJzOjpmaW5kSW50ZXJzZWN0aW5nUmVnaW9ucyk6Cisg ICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmNhY2hpbmdTdHJhdGVneSk6 CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpGYXRGaW5n ZXJzOjpnZXROb2Rlc0Zyb21SZWN0KToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0ZhdEZpbmdl cnMuaDoKKwogMjAxMi0wMi0yMCAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAg ICAgICAgIEFsbCBkZWZhdWx0IHZpZGVvL2F1ZGlvIGNvbnRyb2wgZWxlbWVudHMgc2hvdWxkIGJl IHJlY3QtaGl0IHRlc3RhYmxlIChQYXJ0IElJKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmNwcAppbmRleCBkNjc1NzhiLi4wMTZh NDI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9G YXRGaW5nZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9y dC9GYXRGaW5nZXJzLmNwcApAQCAtMTcwLDkgKzE3MCwxMCBAQCBGYXRGaW5nZXJzOjp+RmF0Rmlu Z2VycygpCiBjb25zdCBGYXRGaW5nZXJzUmVzdWx0IEZhdEZpbmdlcnM6OmZpbmRCZXN0UG9pbnQo KQogewogICAgIEFTU0VSVChtX3dlYlBhZ2UpOworICAgIEFTU0VSVChtX3dlYlBhZ2UtPm1fbWFp bkZyYW1lKTsKKworICAgIG1fY2FjaGVkUmVjdEhpdFRlc3RSZXN1bHRzLmNsZWFyKCk7CiAKLSAg ICBpZiAoIW1fd2ViUGFnZS0+bV9tYWluRnJhbWUpCi0gICAgICAgIHJldHVybiBtX2NvbnRlbnRQ b3M7CiAgICAgRmF0RmluZ2Vyc1Jlc3VsdCByZXN1bHQobV9jb250ZW50UG9zKTsKICAgICBtX21h dGNoaW5nQXBwcm9hY2ggPSBDbGlja2FibGVCeURlZmF1bHQ7CiAKQEAgLTIxNiw2ICsyMTcsNyBA QCBjb25zdCBGYXRGaW5nZXJzUmVzdWx0IEZhdEZpbmdlcnM6OmZpbmRCZXN0UG9pbnQoKQogICAg IH0KIAogICAgIG1fbWF0Y2hpbmdBcHByb2FjaCA9IERvbmU7CisgICAgbV9jYWNoZWRSZWN0SGl0 VGVzdFJlc3VsdHMuY2xlYXIoKTsKIAogICAgIGlmICghZm91bmRPbmUpCiAgICAgICAgIHJldHVy biByZXN1bHQ7CkBAIC0zMTEsMTYgKzMxMywxNSBAQCBib29sIEZhdEZpbmdlcnM6OmZpbmRJbnRl cnNlY3RpbmdSZWdpb25zKERvY3VtZW50KiBkb2N1bWVudCwKICAgICAgICAgbV9kZWJ1Z0ZhdEZp bmdlclJlY3QgPSBtX3dlYlBhZ2UtPm1hcFRvVHJhbnNmb3JtZWQobV93ZWJQYWdlLT5tYXBGcm9t Q29udGVudHNUb1ZpZXdwb3J0KGZpbmdlclJlY3QpKTsKICNlbmRpZgogCi0gICAgLy8gRG9jdW1l bnQ6Om5vZGVzRnJvbVJlY3QgbmVlZHMgdmlld3BvcnQgY29vcmRpbmF0ZXMsIGJ1dCBGYXRGaW5n ZXI6Om5vZGVzRnJvbVJlY3QgZ2V0cyBjb250ZW50cyBjb29yZGluYXRlcwotICAgIC8vIGZvciBz aW1wbGljaXR5IGluc3RlYWQuCiAgICAgYm9vbCBmb3VuZE9uZSA9IGZhbHNlOwotICAgIEhpdFRl c3RSZXN1bHQgcmVzdWx0ID0gbm9kZXNGcm9tUmVjdChkb2N1bWVudCwgZnJhbWVDb250ZW50UG9z KTsKIAogICAgIFJlbmRlckxheWVyKiBsb3dlc3RQb3NpdGlvbmVkRW5jbG9zaW5nTGF5ZXJTb0Zh ciA9IDA7CiAKICAgICAvLyBJdGVyYXRlIG92ZXIgdGhlIGxpc3Qgb2Ygbm9kZXMgKGFuZCBzdWJy ZWN0cyBvZiBub2RlcyB3aGVyZSBwb3NzaWJsZSksIGZvciBlYWNoIHNhdmluZyB0aGUKICAgICAv LyBpbnRlcnNlY3Rpb24gb2YgdGhlIGJvdW5kaW5nIGJveCB3aXRoIHRoZSBmaW5nZXIgcmVjdC4K LSAgICBMaXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4gPiBpbnRlcnNlY3RlZE5vZGVzID0gcmVzdWx0 LnJlY3RCYXNlZFRlc3RSZXN1bHQoKTsKKyAgICBMaXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4gPiBp bnRlcnNlY3RlZE5vZGVzOworICAgIGdldE5vZGVzRnJvbVJlY3QoZG9jdW1lbnQsIGZyYW1lQ29u dGVudFBvcywgaW50ZXJzZWN0ZWROb2Rlcyk7CisKICAgICBMaXN0SGFzaFNldDxSZWZQdHI8Tm9k ZT4gPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBpbnRlcnNlY3RlZE5vZGVzLmJlZ2luKCk7CiAgICAg TGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IGludGVyc2Vj dGVkTm9kZXMuZW5kKCk7CiAgICAgZm9yICggOyBpdCAhPSBlbmQ7ICsraXQpIHsKQEAgLTQ2MSw4 ICs0NjIsMzIgQEAgdm9pZCBGYXRGaW5nZXJzOjpnZXRQYWRkaW5ncyh1bnNpZ25lZCYgdG9wLCB1 bnNpZ25lZCYgcmlnaHQsIHVuc2lnbmVkJiBib3R0b20sIHUKICAgICBsZWZ0ID0gbGVmdFBhZGRp bmcgLyBjdXJyZW50U2NhbGU7CiB9CiAKLUhpdFRlc3RSZXN1bHQgRmF0RmluZ2Vyczo6bm9kZXNG cm9tUmVjdChEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IEludFBvaW50JiBjb250ZW50UG9zKSBj b25zdAorRmF0RmluZ2Vyczo6Q2FjaGVkUmVzdWx0c1N0cmF0ZWd5IEZhdEZpbmdlcnM6OmNhY2hp bmdTdHJhdGVneSgpIGNvbnN0Cit7CisgICAgc3dpdGNoIChtX21hdGNoaW5nQXBwcm9hY2gpIHsK KyAgICBjYXNlIENsaWNrYWJsZUVsZW1lbnQ6CisgICAgICAgIHJldHVybiBHZXRGcm9tUmVuZGVy VHJlZTsKKyAgICBjYXNlIE1hZGVDbGlja2FibGVCeVRoZVdlYnBhZ2U6CisgICAgICAgIHJldHVy biBHZXRGcm9tQ2FjaGU7CisgICAgY2FzZSBEb25lOgorICAgIGRlZmF1bHQ6CisgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gR2V0RnJvbVJlbmRlclRyZWU7Cisg ICAgfQorfQorCit2b2lkIEZhdEZpbmdlcnM6OmdldE5vZGVzRnJvbVJlY3QoRG9jdW1lbnQqIGRv Y3VtZW50LCBjb25zdCBJbnRQb2ludCYgY29udGVudFBvcywgTGlzdEhhc2hTZXQ8UmVmUHRyPFdl YkNvcmU6Ok5vZGU+ID4mIGludGVyc2VjdGVkTm9kZXMpCiB7CisgICAgRmF0RmluZ2Vyczo6Q2Fj aGVkUmVzdWx0c1N0cmF0ZWd5IGNhY2hlUmVzb2x2aW5nU3RyYXRlZ3kgPSBjYWNoaW5nU3RyYXRl Z3koKTsKKworICAgIGlmIChjYWNoZVJlc29sdmluZ1N0cmF0ZWd5ID09IEdldEZyb21DYWNoZSkg eworICAgICAgICBBU1NFUlQobV9jYWNoZWRSZWN0SGl0VGVzdFJlc3VsdHMuY29udGFpbnMoZG9j dW1lbnQpKTsKKyAgICAgICAgaW50ZXJzZWN0ZWROb2RlcyA9IG1fY2FjaGVkUmVjdEhpdFRlc3RS ZXN1bHRzLmdldChkb2N1bWVudCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBBU1NF UlQoY2FjaGVSZXNvbHZpbmdTdHJhdGVneSA9PSBHZXRGcm9tUmVuZGVyVHJlZSk7CisKICAgICB1 bnNpZ25lZCB0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRk aW5nOwogICAgIGdldFBhZGRpbmdzKHRvcFBhZGRpbmcsIHJpZ2h0UGFkZGluZywgYm90dG9tUGFk ZGluZywgbGVmdFBhZGRpbmcpOwogCkBAIC00NzAsNyArNDk1LDggQEAgSGl0VGVzdFJlc3VsdCBG YXRGaW5nZXJzOjpub2Rlc0Zyb21SZWN0KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgSW50UG9p bnQmIGNvbnQKICAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdChjb250ZW50UG9zLCB0b3BQYWRkaW5n LCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5nLCBIaXRUZXN0U2hhZG93 RE9NKTsKIAogICAgIGRvY3VtZW50LT5yZW5kZXJWaWV3KCktPmxheWVyKCktPmhpdFRlc3QocmVx dWVzdCwgcmVzdWx0KTsKLSAgICByZXR1cm4gcmVzdWx0OworICAgIGludGVyc2VjdGVkTm9kZXMg PSByZXN1bHQucmVjdEJhc2VkVGVzdFJlc3VsdCgpOworICAgIG1fY2FjaGVkUmVjdEhpdFRlc3RS ZXN1bHRzLmFkZChkb2N1bWVudCwgaW50ZXJzZWN0ZWROb2Rlcyk7CiB9CiAKIHZvaWQgRmF0Rmlu Z2Vyczo6Z2V0UmVsZXZhbnRJbmZvRnJvbVBvaW50KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3Qg SW50UG9pbnQmIGNvbnRlbnRQb3MsIEVsZW1lbnQqJiBlbGVtZW50VW5kZXJQb2ludCwgRWxlbWVu dComIGNsaWNrYWJsZUVsZW1lbnRVbmRlclBvaW50KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5oIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5oCmluZGV4IGMxN2Q3YjQu LjZiODQ3ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L0ZhdEZpbmdlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9GYXRGaW5nZXJzLmgKQEAgLTI1LDYgKzI1LDkgQEAKICNpbmNsdWRlIDxCbGFja0JlcnJ5 UGxhdGZvcm1JbnRSZWN0UmVnaW9uLmg+CiAKICNpbmNsdWRlIDx1dGlsaXR5PgorCisjaW5jbHVk ZSA8d3RmL0hhc2hTZXQuaD4KKyNpbmNsdWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KICNpbmNsdWRl IDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTExMyw2ICsxMTYsMTAg QEAgcHJpdmF0ZToKIAogICAgIHR5cGVkZWYgc3RkOjpwYWlyPFdlYkNvcmU6Ok5vZGUqLCBQbGF0 Zm9ybTo6SW50UmVjdFJlZ2lvbj4gSW50ZXJzZWN0aW5nUmVnaW9uOwogCisgICAgZW51bSBDYWNo ZWRSZXN1bHRzU3RyYXRlZ3kgeyBHZXRGcm9tUmVuZGVyVHJlZSA9IDAsIEdldEZyb21DYWNoZSB9 OworICAgIENhY2hlZFJlc3VsdHNTdHJhdGVneSBjYWNoaW5nU3RyYXRlZ3koKSBjb25zdDsKKyAg ICB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPFdlYkNvcmU6OkRvY3VtZW50PiwgTGlzdEhhc2hTZXQ8 UmVmUHRyPFdlYkNvcmU6Ok5vZGU+ID4gPiBDYWNoZWRSZWN0SGl0VGVzdFJlc3VsdHM7CisKICAg ICBib29sIGNoZWNrRmluZ2VySW50ZXJzZWN0aW9uKGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0UmVn aW9uJiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBsYXRmb3JtOjpJ bnRSZWN0UmVnaW9uJiByZW1haW5pbmdGaW5nZXJSZWdpb24sCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBXZWJDb3JlOjpOb2RlKiwKQEAgLTEzMyw4ICsxNDAsNyBAQCBwcml2YXRl OgogCiAgICAgdm9pZCBzZXRTdWNjZXNzZnVsRmF0RmluZ2Vyc1Jlc3VsdChGYXRGaW5nZXJzUmVz dWx0JiwgV2ViQ29yZTo6Tm9kZSosIGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAKLSAgICAv LyBJdCBtaW1pY3MgRG9jdW1lbnQ6Om5vZGVzRnJvbVJlY3QsIGJ1dCBoYXMgYSBkaWZmZXJlbnQg cmV0dXJuIHZhbHVlIHRvIGZpdCBvdXIgbmVlZHMuCi0gICAgV2ViQ29yZTo6SGl0VGVzdFJlc3Vs dCBub2Rlc0Zyb21SZWN0KFdlYkNvcmU6OkRvY3VtZW50KiwgY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmKSBjb25zdDsKKyAgICB2b2lkIGdldE5vZGVzRnJvbVJlY3QoV2ViQ29yZTo6RG9jdW1lbnQq LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIExpc3RIYXNoU2V0PFJlZlB0cjxXZWJDb3JlOjpO b2RlPiA+Jik7CiAKICAgICAvLyBJdCBtaW1pY3MgRG9jdW1lbnQ6OmVsZW1lbnRGcm9tUG9pbnQs IGJ1dCByZWN1cnNpdmVseSBoaXQtdGVzdHMgaW4gY2FzZSBhbiBpbm5lciBmcmFtZSBpcyBmb3Vu ZC4KICAgICB2b2lkIGdldFJlbGV2YW50SW5mb0Zyb21Qb2ludChXZWJDb3JlOjpEb2N1bWVudCos CkBAIC0xNTEsNiArMTU3LDcgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpJbnRQb2ludCBtX2Nv bnRlbnRQb3M7CiAgICAgVGFyZ2V0VHlwZSBtX3RhcmdldFR5cGU7CiAgICAgTWF0Y2hpbmdBcHBy b2FjaEZvckNsaWNrYWJsZSBtX21hdGNoaW5nQXBwcm9hY2g7CisgICAgQ2FjaGVkUmVjdEhpdFRl c3RSZXN1bHRzIG1fY2FjaGVkUmVjdEhpdFRlc3RSZXN1bHRzOwogfTsKIAogfQotLSAKMS43LjEK Cg==