73212 2011-11-28 06:13:06 -0800 Make sure the useFixedLayout feature is consistently handled 2011-11-28 06:46:48 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann webkit.review.bot zalan zoltan oldest_to_newest 509775 0 kenneth 2011-11-28 06:13:06 -0800 SSIA 509776 1 116745 kenneth 2011-11-28 06:18:17 -0800 Created attachment 116745 Patch 509785 2 116745 hausmann 2011-11-28 06:36:41 -0800 Comment on attachment 116745 Patch r=me 509800 3 116745 kenneth 2011-11-28 06:46:38 -0800 Comment on attachment 116745 Patch Committed in r101259 116745 2011-11-28 06:18:17 -0800 2011-11-28 06:46:37 -0800 Patch 0001-Make-sure-the-useFixedLayout-feature-is-consistently.patch text/plain 12407 kenneth RnJvbSBkZjdhZTE2MGIxMmM2Y2ZiNGViODFmYWY1YTg0ZTFlYzYyMzBiMzI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBNb24sIDI4IE5vdiAyMDExIDE1OjExOjM4ICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gTWFrZSBzdXJlIHRoZSB1c2VGaXhlZExheW91dCBmZWF0dXJlIGlzIGNvbnNpc3Rl bnRseSBoYW5kbGVkCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMy MTIKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKU291cmNlL1dlYktpdDI6CgpTZXQgdGhl IGZpeGVkIGxheW91dCBvbiB0aGUgVUkgc2lkZSBzbyB0aGF0IGl0IGlzIHBhcnQgb2YgdGhlIHBh Z2UKY3JlYXRpb24gcGFyYW1ldGVycyBhbmQgZW5zdXJlIHRoYXQgdGhlIHBhZ2UgcGFyYW1ldGVy cyBhcmUgc2V0CmJlZm9yZSBjcmVhdGluZyB0aGUgcGFnZS4KClRoZSBwYXJhbWV0ZXJzIGFyZSBz ZXQgdG8gb3VyIGRlZmF1bHRzIGFuZCBhcmUgbm93IGFsdGVyZWQgaW4gdGhlCldlYktpdFRlc3RS dW5uZXIuCgoqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CihRUXVpY2tXZWJW aWV3UHJpdmF0ZTo6UVF1aWNrV2ViVmlld1ByaXZhdGUpOgooUVF1aWNrV2ViVmlld1ByaXZhdGU6 OnNldFVzZVRyYWRpdGlvbmFsRGVza3RvcEJlaGF2aW91cik6CihRUXVpY2tXZWJWaWV3RXhwZXJp bWVudGFsOjpzZXRVc2VUcmFkaXRpb25hbERlc2t0b3BCZWhhdmlvdXIpOgooUVF1aWNrV2ViVmll dzo6UVF1aWNrV2ViVmlldyk6CiogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CihXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6c2V0VXNlRml4ZWRMYXlvdXQpOgoqIFdlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcDoKKFdlYktpdDo6V2ViUGFnZTo6V2ViUGFnZSk6CgogICAgT24gdGhlIHdlYiBw cm9jZXNzIHNpZGUgdGhlIGRlZmF1bHQgdmFsdWUgZm9yIHVzZUZpeGVkTGF5b3V0CiAgICB3YXNu J3QgYWN0dWFsbHkgcmVhZCBmcm9tIHRoZSBjcmVhdGlvbiBwYXJhbWV0ZXJzLiBBcyBpdCBub3cg bWF5CiAgICBiZSBkaWZmZXJlbnQgdGhhbiB0aGF0IG9mIHRoZSBGcmFtZVZpZXcsIHdlIG5vdyBj YWxsCiAgICBzZXRGaXhlZExheW91dCBpbiB0aGUgY29uc3RydWN0b3Igc28gbWFrZSBzdXJlIHRo ZSB2YWx1ZSBpcwogICAgcHJvcGFnYXRlZCB0byB0aGUgRnJhbWVWaWV3LgoKKFdlYktpdDo6V2Vi UGFnZTo6c2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3QpOgooV2ViS2l0OjpXZWJQYWdlOjpzZXRS ZXNpemVzVG9Db250ZW50c1VzaW5nTGF5b3V0U2l6ZSk6CihXZWJLaXQ6OldlYlBhZ2U6OnJlc2l6 ZVRvQ29udGVudHNJZk5lZWRlZCk6CihXZWJLaXQ6OldlYlBhZ2U6OnNldFZpZXdwb3J0U2l6ZSk6 CihXZWJLaXQ6OldlYlBhZ2U6OnNldFVzZUZpeGVkTGF5b3V0KToKKFdlYktpdDo6V2ViUGFnZTo6 c2V0Rml4ZWRMYXlvdXRTaXplKToKCiAgICBUaGUgbWV0aG9kcyB0aGF0IGRlcGVuZHMgb24gZml4 ZWQgbGF5b3V0IG5vdyBoYXZlIGFzc2VydHMgdG8gbWFrZQogICAgc3VyZSB0aGF0IHRoZXkgYXJl IHVzZWQgcHJvcGVybHkuCgpUb29sczoKClRoZSB3ZWIgcGFnZSBwYXJhbWV0ZXJzIGFyZSBzZXQg dG8gb3VyIFF0IGRlZmF1bHRzIGFuZCBhcmUgbm93IGFsdGVyZWQKaW4gdGhlIFdlYktpdFRlc3RS dW5uZXIuCgoqIFdlYktpdFRlc3RSdW5uZXIvcXQvUGxhdGZvcm1XZWJWaWV3UXQuY3BwOgooV1RS OjpXcmFwcGVyV2luZG93OjpXcmFwcGVyV2luZG93KToKLS0tCiBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICA0MCArKysrKysrKysrKysrKysrKysr KysKIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgfCAg IDI1ICsrKysrKysrLS0tLS0KIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwICAgICAgICAgfCAgICAyICsKIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcCAgICAgfCAgIDMzICsrKysrKysrLS0tLS0tLS0tCiBUb29scy9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMyArKysrKysrCiBUb29scy9X ZWJLaXRUZXN0UnVubmVyL3F0L1BsYXRmb3JtV2ViVmlld1F0LmNwcCAgIHwgICAgMSArCiA2IGZp bGVzIGNoYW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpp bmRleCAwYmNlNTc0Li5kZjNjNzA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMTEt MTEtMjggIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgor CisgICAgICAgIE1ha2Ugc3VyZSB0aGUgdXNlRml4ZWRMYXlvdXQgZmVhdHVyZSBpcyBjb25zaXN0 ZW50bHkgaGFuZGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzMyMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTZXQgdGhlIGZpeGVkIGxheW91dCBvbiB0aGUgVUkgc2lkZSBzbyB0aGF0IGl0IGlzIHBh cnQgb2YgdGhlIHBhZ2UKKyAgICAgICAgY3JlYXRpb24gcGFyYW1ldGVycyBhbmQgZW5zdXJlIHRo YXQgdGhlIHBhZ2UgcGFyYW1ldGVycyBhcmUgc2V0CisgICAgICAgIGJlZm9yZSBjcmVhdGluZyB0 aGUgcGFnZS4KKworICAgICAgICBUaGUgcGFyYW1ldGVycyBhcmUgc2V0IHRvIG91ciBkZWZhdWx0 cyBhbmQgYXJlIG5vdyBhbHRlcmVkIGluIHRoZQorICAgICAgICBXZWJLaXRUZXN0UnVubmVyLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcDoKKyAgICAgICAg KFFRdWlja1dlYlZpZXdQcml2YXRlOjpRUXVpY2tXZWJWaWV3UHJpdmF0ZSk6CisgICAgICAgIChR UXVpY2tXZWJWaWV3UHJpdmF0ZTo6c2V0VXNlVHJhZGl0aW9uYWxEZXNrdG9wQmVoYXZpb3VyKToK KyAgICAgICAgKFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OnNldFVzZVRyYWRpdGlvbmFsRGVz a3RvcEJlaGF2aW91cik6CisgICAgICAgIChRUXVpY2tXZWJWaWV3OjpRUXVpY2tXZWJWaWV3KToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpzZXRVc2VGaXhlZExheW91dCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToK KworICAgICAgICAgICAgT24gdGhlIHdlYiBwcm9jZXNzIHNpZGUgdGhlIGRlZmF1bHQgdmFsdWUg Zm9yIHVzZUZpeGVkTGF5b3V0CisgICAgICAgICAgICB3YXNuJ3QgYWN0dWFsbHkgcmVhZCBmcm9t IHRoZSBjcmVhdGlvbiBwYXJhbWV0ZXJzLiBBcyBpdCBub3cgbWF5CisgICAgICAgICAgICBiZSBk aWZmZXJlbnQgdGhhbiB0aGF0IG9mIHRoZSBGcmFtZVZpZXcsIHdlIG5vdyBjYWxsCisgICAgICAg ICAgICBzZXRGaXhlZExheW91dCBpbiB0aGUgY29uc3RydWN0b3Igc28gbWFrZSBzdXJlIHRoZSB2 YWx1ZSBpcworICAgICAgICAgICAgcHJvcGFnYXRlZCB0byB0aGUgRnJhbWVWaWV3LgorCisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXNpemVUb0NvbnRlbnRzSWZOZWVkZWQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpzZXRVc2VGaXhlZExheW91dCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnNldEZpeGVkTGF5b3V0U2l6ZSk6CisKKyAgICAgICAgICAgIFRoZSBtZXRob2RzIHRoYXQg ZGVwZW5kcyBvbiBmaXhlZCBsYXlvdXQgbm93IGhhdmUgYXNzZXJ0cyB0byBtYWtlCisgICAgICAg ICAgICBzdXJlIHRoYXQgdGhleSBhcmUgdXNlZCBwcm9wZXJseS4KKwogMjAxMS0xMS0yOCAgUGF2 ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9O IChyMTAxMjAxKTogQ3Jhc2ggaW5zaWRlIFdlYktpdDo6V2ViSW5zcGVjdG9yOjpkaWRDbG9zZSgp IHdoZW4gY2xvc2luZyBhbnkgdGFiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCA2NDc0NTljLi43NjA4NjMyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKQEAgLTQz LDcgKzQzLDYgQEAgUVF1aWNrV2ViVmlld1ByaXZhdGU6OlFRdWlja1dlYlZpZXdQcml2YXRlKFFR dWlja1dlYlZpZXcqIHZpZXdwb3J0LCBXS0NvbnRleHRSZWYKICAgICAsIHByb21wdERpYWxvZygw KQogICAgICwgcG9zdFRyYW5zaXRpb25TdGF0ZShhZG9wdFB0cihuZXcgUG9zdFRyYW5zaXRpb25T dGF0ZSh0aGlzKSkpCiAgICAgLCB0cmFuc2l0aW9uaW5nVG9OZXdQYWdlKGZhbHNlKQotICAgICwg dXNlVHJhZGl0aW9uYWxEZXNrdG9wQmVoYXZpb3VyKGZhbHNlKQogewogICAgIHZpZXdwb3J0LT5z ZXRGbGFncyhRUXVpY2tJdGVtOjpJdGVtQ2xpcHNDaGlsZHJlblRvU2hhcGUpOwogCkBAIC01NCwx NCArNTMsMTcgQEAgUVF1aWNrV2ViVmlld1ByaXZhdGU6OlFRdWlja1dlYlZpZXdQcml2YXRlKFFR dWlja1dlYlZpZXcqIHZpZXdwb3J0LCBXS0NvbnRleHRSZWYKICAgICBzZXRQYWdlUHJveHkobmV3 IFF0V2ViUGFnZVByb3h5KHBhZ2VWaWV3LmRhdGEoKSwgcV9wdHIsIGNvbnRleHRSZWYsIHBhZ2VH cm91cFJlZikpOwogICAgIHBhZ2VWaWV3UHJpdmF0ZS0+c2V0UGFnZVByb3h5KHBhZ2VQcm94eS5k YXRhKCkpOwogCisgICAgcGFnZUxvYWRDbGllbnQucmVzZXQobmV3IFF0V2ViUGFnZUxvYWRDbGll bnQocGFnZVByb3h5LT5wYWdlUmVmKCksIHFfcHRyKSk7CisgICAgcGFnZVBvbGljeUNsaWVudC5y ZXNldChuZXcgUXRXZWJQYWdlUG9saWN5Q2xpZW50KHBhZ2VQcm94eS0+cGFnZVJlZigpLCBxX3B0 cikpOworICAgIHBhZ2VVSUNsaWVudC5yZXNldChuZXcgUXRXZWJQYWdlVUlDbGllbnQocGFnZVBy b3h5LT5wYWdlUmVmKCksIHFfcHRyKSk7CiAgICAgZXZlbnRIYW5kbGVyLnJlc2V0KG5ldyBRdFdl YlBhZ2VFdmVudEhhbmRsZXIocGFnZVByb3h5LT5wYWdlUmVmKCkpKTsKIAorICAgIC8vIEFueSBw YWdlIHNldHRpbmcgc2hvdWxkIHByZWZlcnJhYmxlIGJlIHNldCBiZWZvcmUgY3JlYXRpbmcgdGhl IHBhZ2UsIHNvIHNldCB0aGVtIGhlcmU6CisgICAgc2V0VXNlVHJhZGl0aW9uYWxEZXNrdG9wQmVo YXZpb3VyKGZhbHNlKTsKICAgICBRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpnZXQocGFnZVByb3h5 LT5wcmVmZXJlbmNlcygpKS0+c2V0QXR0cmlidXRlKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OkFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkLCB0cnVlKTsKLSAgICBwYWdlUHJveHktPmluaXQo ZXZlbnRIYW5kbGVyLmRhdGEoKSk7CiAKLSAgICBwYWdlTG9hZENsaWVudC5yZXNldChuZXcgUXRX ZWJQYWdlTG9hZENsaWVudChwYWdlUHJveHktPnBhZ2VSZWYoKSwgcV9wdHIpKTsKLSAgICBwYWdl UG9saWN5Q2xpZW50LnJlc2V0KG5ldyBRdFdlYlBhZ2VQb2xpY3lDbGllbnQocGFnZVByb3h5LT5w YWdlUmVmKCksIHFfcHRyKSk7Ci0gICAgcGFnZVVJQ2xpZW50LnJlc2V0KG5ldyBRdFdlYlBhZ2VV SUNsaWVudChwYWdlUHJveHktPnBhZ2VSZWYoKSwgcV9wdHIpKTsKKyAgICAvLyBDcmVhdGVzIGEg cGFnZSB3aXRoIHRoZSBwYWdlIGNyZWF0aW9uIHBhcmFtZXRlcnMuCisgICAgcGFnZVByb3h5LT5p bml0KGV2ZW50SGFuZGxlci5kYXRhKCkpOwogfQogCiB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRl OjplbmFibGVNb3VzZUV2ZW50cygpCkBAIC0zMjksOCArMzMxLDEwIEBAIHZvaWQgUVF1aWNrV2Vi Vmlld1ByaXZhdGU6Ol9xX29uT3BlblBhbmVsRmluaXNoZWQoaW50IHJlc3VsdCkKIHZvaWQgUVF1 aWNrV2ViVmlld1ByaXZhdGU6OnNldFVzZVRyYWRpdGlvbmFsRGVza3RvcEJlaGF2aW91cihib29s IGVuYWJsZSkKIHsKICAgICBRX1EoUVF1aWNrV2ViVmlldyk7Ci0gICAgaWYgKGVuYWJsZSA9PSB1 c2VUcmFkaXRpb25hbERlc2t0b3BCZWhhdmlvdXIpCi0gICAgICAgIHJldHVybjsKKworICAgIC8v IERvIG5vdCBndWFyZCwgdGVzdGluZyBmb3IgdGhlIHNhbWUgdmFsdWUsIGFzIHdlIGNhbGwgdGhp cyBmcm9tIHRoZSBjb25zdHJ1Y3Rvci4KKworICAgIHRvSW1wbChwYWdlUHJveHktPnBhZ2VSZWYo KSktPnNldFVzZUZpeGVkTGF5b3V0KCFlbmFibGUpOwogCiAgICAgdXNlVHJhZGl0aW9uYWxEZXNr dG9wQmVoYXZpb3VyID0gZW5hYmxlOwogICAgIGlmICh1c2VUcmFkaXRpb25hbERlc2t0b3BCZWhh dmlvdXIpCkBAIC0zOTQsNiArMzk4LDEwIEBAIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6On5R UXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsKCkKIHZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRh bDo6c2V0VXNlVHJhZGl0aW9uYWxEZXNrdG9wQmVoYXZpb3VyKGJvb2wgZW5hYmxlKQogewogICAg IFFfRChRUXVpY2tXZWJWaWV3KTsKKworICAgIGlmIChlbmFibGUgPT0gZC0+dXNlVHJhZGl0aW9u YWxEZXNrdG9wQmVoYXZpb3VyKQorICAgICAgICByZXR1cm47CisKICAgICBkLT5zZXRVc2VUcmFk aXRpb25hbERlc2t0b3BCZWhhdmlvdXIoZW5hYmxlKTsKIH0KIApAQCAtNDYyLDkgKzQ3MCw2IEBA IFFRdWlja1dlYlZpZXc6OlFRdWlja1dlYlZpZXcoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdL UGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlCiAgICAgLCBkX3B0cihuZXcgUVF1aWNrV2ViVmlld1By aXZhdGUodGhpcywgY29udGV4dFJlZiwgcGFnZUdyb3VwUmVmKSkKICAgICAsIG1fZXhwZXJpbWVu dGFsKG5ldyBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsKHRoaXMpKQogewotICAgIFFfRChRUXVp Y2tXZWJWaWV3KTsKLSAgICAvLyBVc2VkIGJ5IFdlYktpdFRlc3RSdW5uZXIuCi0gICAgZC0+c2V0 VXNlVHJhZGl0aW9uYWxEZXNrdG9wQmVoYXZpb3VyKHRydWUpOwogfQogCiBRUXVpY2tXZWJWaWV3 Ojp+UVF1aWNrV2ViVmlldygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCmluZGV4IDgzZTU4ZjIuLmY3YWNjOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCkBAIC0xMjYxLDYgKzEyNjEsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 c2V0VXNlRml4ZWRMYXlvdXQoYm9vbCBmaXhlZCkKICAgICBpZiAoIWlzVmFsaWQoKSkKICAgICAg ICAgcmV0dXJuOwogCisgICAgLy8gVGhpcyBjaGVjayBpcyBmaW5lIGFzIHRoZSB2YWx1ZSBpcyBp bml0aWFsaXplZCBpbiB0aGUgd2ViCisgICAgLy8gcHJvY2VzcyBhcyBwYXJ0IG9mIHRoZSBjcmVh dGlvbiBwYXJhbWV0ZXJzLgogICAgIGlmIChmaXhlZCA9PSBtX3VzZUZpeGVkTGF5b3V0KQogICAg ICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCA3NDlmOTBiLi5hZTA1MjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xNzIsNyArMTcyLDYgQEAgUGFzc1JlZlB0 cjxXZWJQYWdlPiBXZWJQYWdlOjpjcmVhdGUodWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJQYWdl Q3JlYXRpb25QYXJhbWUKIAogV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0 IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAgICAgOiBtX3ZpZXdTaXpl KHBhcmFtZXRlcnMudmlld1NpemUpCi0gICAgLCBtX3VzZUZpeGVkTGF5b3V0KGZhbHNlKQogICAg ICwgbV9kcmF3c0JhY2tncm91bmQodHJ1ZSkKICAgICAsIG1fZHJhd3NUcmFuc3BhcmVudEJhY2tn cm91bmQoZmFsc2UpCiAgICAgLCBtX2lzSW5SZWRvKGZhbHNlKQpAQCAtMjM5LDYgKzIzOCw4IEBA IFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogCiAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZTo6Y3Jl YXRlTWFpbkZyYW1lKHRoaXMpOwogCisgICAgc2V0VXNlRml4ZWRMYXlvdXQocGFyYW1ldGVycy51 c2VGaXhlZExheW91dCk7CisKICAgICBzZXREcmF3c0JhY2tncm91bmQocGFyYW1ldGVycy5kcmF3 c0JhY2tncm91bmQpOwogICAgIHNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKHBhcmFtZXRl cnMuZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQpOwogCkBAIC03MDAsNiArNzAxLDggQEAgdm9p ZCBXZWJQYWdlOjpzZXRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdTaXplKQogI2lm IFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogdm9pZCBXZWJQYWdlOjpzZXRGaXhlZFZpc2libGVD b250ZW50UmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogeworICAgIEFTU0VSVChtX3VzZUZpeGVk TGF5b3V0KTsKKwogICAgIEZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CiAKICAg ICBmcmFtZS0+dmlldygpLT5zZXRGaXhlZFZpc2libGVDb250ZW50UmVjdChyZWN0KTsKQEAgLTcw NywxNCArNzEwLDE0IEBAIHZvaWQgV2ViUGFnZTo6c2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3Qo Y29uc3QgSW50UmVjdCYgcmVjdCkKIAogdm9pZCBXZWJQYWdlOjpzZXRSZXNpemVzVG9Db250ZW50 c1VzaW5nTGF5b3V0U2l6ZShjb25zdCBJbnRTaXplJiB0YXJnZXRMYXlvdXRTaXplKQogewotICAg IEZyYW1lVmlldyogdmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKKyAgICBBU1NF UlQobV91c2VGaXhlZExheW91dCk7CisgICAgQVNTRVJUKCF0YXJnZXRMYXlvdXRTaXplLmlzRW1w dHkoKSk7CiAKLSAgICBtX3VzZUZpeGVkTGF5b3V0ID0gIXRhcmdldExheW91dFNpemUuaXNFbXB0 eSgpOworICAgIEZyYW1lVmlldyogdmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKTsK IAotICAgIC8vIFNldCB2aWV3IGF0dHJpYnV0ZXMgYmFzZWQgb24gd2hldGhlciBmaXhlZCBsYXlv dXQgaXMgdXNlZC4KLSAgICB2aWV3LT5zZXREZWxlZ2F0ZXNTY3JvbGxpbmcobV91c2VGaXhlZExh eW91dCk7Ci0gICAgdmlldy0+c2V0VXNlRml4ZWRMYXlvdXQobV91c2VGaXhlZExheW91dCk7Ci0g ICAgdmlldy0+c2V0UGFpbnRzRW50aXJlQ29udGVudHMobV91c2VGaXhlZExheW91dCk7CisgICAg dmlldy0+c2V0RGVsZWdhdGVzU2Nyb2xsaW5nKHRydWUpOworICAgIHZpZXctPnNldFVzZUZpeGVk TGF5b3V0KHRydWUpOworICAgIHZpZXctPnNldFBhaW50c0VudGlyZUNvbnRlbnRzKHRydWUpOwog CiAgICAgaWYgKHZpZXctPmZpeGVkTGF5b3V0U2l6ZSgpID09IHRhcmdldExheW91dFNpemUpCiAg ICAgICAgIHJldHVybjsKQEAgLTczMSw2ICs3MzQsOCBAQCB2b2lkIFdlYlBhZ2U6OnNldFJlc2l6 ZXNUb0NvbnRlbnRzVXNpbmdMYXlvdXRTaXplKGNvbnN0IEludFNpemUmIHRhcmdldExheW91dFNp egogCiB2b2lkIFdlYlBhZ2U6OnJlc2l6ZVRvQ29udGVudHNJZk5lZWRlZCgpCiB7CisgICAgQVNT RVJUKG1fdXNlRml4ZWRMYXlvdXQpOworCiAgICAgRnJhbWVWaWV3KiB2aWV3ID0gbV9wYWdlLT5t YWluRnJhbWUoKS0+dmlldygpOwogCiAgICAgaWYgKCF2aWV3LT51c2VGaXhlZExheW91dCgpKQpA QCAtNzQ3LDYgKzc1Miw4IEBAIHZvaWQgV2ViUGFnZTo6cmVzaXplVG9Db250ZW50c0lmTmVlZGVk KCkKIAogdm9pZCBXZWJQYWdlOjpzZXRWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkK IHsKKyAgICBBU1NFUlQobV91c2VGaXhlZExheW91dCk7CisKICAgICBpZiAobV92aWV3cG9ydFNp emUgPT0gc2l6ZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC04OTYsMTEgKzkwMyw3IEBAIHZvaWQg V2ViUGFnZTo6c2V0VXNlRml4ZWRMYXlvdXQoYm9vbCBmaXhlZCkKIHsKICAgICBtX3VzZUZpeGVk TGF5b3V0ID0gZml4ZWQ7CiAKLSAgICBGcmFtZSogZnJhbWUgPSBtX21haW5GcmFtZS0+Y29yZUZy YW1lKCk7Ci0gICAgaWYgKCFmcmFtZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgRnJhbWVWaWV3 KiB2aWV3ID0gZnJhbWUtPnZpZXcoKTsKKyAgICBGcmFtZVZpZXcqIHZpZXcgPSBtYWluRnJhbWVW aWV3KCk7CiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm47CiAKQEAgLTkxMSwxMSArOTE0 LDcgQEAgdm9pZCBXZWJQYWdlOjpzZXRVc2VGaXhlZExheW91dChib29sIGZpeGVkKQogCiB2b2lk IFdlYlBhZ2U6OnNldEZpeGVkTGF5b3V0U2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQogewotICAg IEZyYW1lKiBmcmFtZSA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKTsKLSAgICBpZiAoIWZyYW1l KQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgRnJhbWVWaWV3KiB2aWV3ID0gZnJhbWUtPnZp ZXcoKTsKKyAgICBGcmFtZVZpZXcqIHZpZXcgPSBtYWluRnJhbWVWaWV3KCk7CiAgICAgaWYgKCF2 aWV3KQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCBjMGVlZmJhLi4yMmYyMjg0IDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTEt MjggIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgorCisg ICAgICAgIE1ha2Ugc3VyZSB0aGUgdXNlRml4ZWRMYXlvdXQgZmVhdHVyZSBpcyBjb25zaXN0ZW50 bHkgaGFuZGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzMyMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGUgd2ViIHBhZ2UgcGFyYW1ldGVycyBhcmUgc2V0IHRvIG91ciBRdCBkZWZhdWx0cyBhbmQg YXJlIG5vdyBhbHRlcmVkCisgICAgICAgIGluIHRoZSBXZWJLaXRUZXN0UnVubmVyLgorCisgICAg ICAgICogV2ViS2l0VGVzdFJ1bm5lci9xdC9QbGF0Zm9ybVdlYlZpZXdRdC5jcHA6CisgICAgICAg IChXVFI6OldyYXBwZXJXaW5kb3c6OldyYXBwZXJXaW5kb3cpOgorCiAyMDExLTExLTI4ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR3RrXVtndGtk b2NdIFN5bnRheCBlcnJvciBpbiBUb29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jCmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L1BsYXRmb3JtV2ViVmlld1F0LmNwcCBiL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvcXQvUGxhdGZvcm1XZWJWaWV3UXQuY3BwCmluZGV4IDkyMDFmOTIu LmQ0ZjgxYjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvcXQvUGxhdGZvcm1X ZWJWaWV3UXQuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvcXQvUGxhdGZvcm1XZWJW aWV3UXQuY3BwCkBAIC00NCw2ICs0NCw3IEBAIHB1YmxpYzoKICAgICAgICAgOiBRUXVpY2tWaWV3 KFFVcmwoImRhdGE6dGV4dC9wbGFpbixpbXBvcnQgUXRRdWljayAyLjBcbkl0ZW0geyBvYmplY3RO YW1lOiAncm9vdCcgfSIpKQogICAgICAgICAsIG1fdmlldyh2aWV3KQogICAgIHsKKyAgICAgICAg UVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbCh2aWV3KS5zZXRVc2VUcmFkaXRpb25hbERlc2t0b3BC ZWhhdmlvdXIodHJ1ZSk7CiAgICAgICAgIGNvbm5lY3QodGhpcywgU0lHTkFMKHN0YXR1c0NoYW5n ZWQoUVF1aWNrVmlldzo6U3RhdHVzKSksIFNMT1QoaGFuZGxlU3RhdHVzQ2hhbmdlZChRUXVpY2tW aWV3OjpTdGF0dXMpKSk7CiAgICAgfQogCi0tIAoxLjcuNC4xCgo=