70520 2011-10-20 09:55:46 -0700 [Qt][WK2] Remove redundant setPageIsVisible() API 2011-10-25 04:01:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan webkit.review.bot oldest_to_newest 487667 0 zalan 2011-10-20 09:55:46 -0700 [Qt][WK2] Remove redundant setPageIsVisible() API 487677 1 111798 zalan 2011-10-20 10:06:47 -0700 Created attachment 111798 Patch 487680 2 webkit.review.bot 2011-10-20 10:09:10 -0700 Attachment 111798 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 487687 3 111802 zalan 2011-10-20 10:17:25 -0700 Created attachment 111802 Patch 489350 4 112192 zalan 2011-10-24 08:47:59 -0700 Created attachment 112192 Patch 489918 5 112192 hausmann 2011-10-25 01:39:02 -0700 Comment on attachment 112192 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112192&action=review r=me > Source/WebKit2/UIProcess/DrawingAreaProxy.h:-80 > - virtual void setPageIsVisible(bool isVisible) = 0; I guess visibilityDidChange() could be made pure virtual now, as suggested in r76157 489922 6 zalan 2011-10-25 02:01:04 -0700 as discussed on irc. zalan: simon_: i think when tileddrawingarea gets thrashed would be the good time to review the pure virtual functions. there are a few more that can be cleaned up once the tiled class goes away zalan: simon_: so that would be like one patch to fix the class design zalan: simon_: but if you have strong opinion on this, i can do that now. i can go either way simon_: no, you're right. might make more sense to do it all in one shot 489951 7 112192 webkit.review.bot 2011-10-25 04:00:58 -0700 Comment on attachment 112192 Patch Clearing flags on attachment: 112192 Committed r98332: <http://trac.webkit.org/changeset/98332> 489952 8 webkit.review.bot 2011-10-25 04:01:02 -0700 All reviewed patches have been landed. Closing bug. 111798 2011-10-20 10:06:47 -0700 2011-10-20 10:17:18 -0700 Patch bug-70520-20111020190646.patch text/plain 9664 zalan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3OTkxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMTAtMjAgIFphbGFuIEJ1 anRhcyAgPHpidWp0YXNAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBSZW1vdmUgcmVk dW5kYW50IHNldFBhZ2VJc1Zpc2libGUoKSBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNTIwCisKKwlVc2UgRHJhd2luZ0FyZWFQcm94eTo6dmlz aWJpbGl0eURpZENoYW5nZSgpIGluc3RlYWQgb2YgRHJhd2luZ0FyZWFQcm94eTo6c2V0UGFnZUlz VmlzaWJsZSgpCisgICAgICAgIFJlbW92ZSBEcmF3aW5nQXJlYVByb3h5OjpzZXRQYWdlSXNWaXNp YmxlKCksIG5vdCB1c2VkIGFueW1vcmUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuY3BwOgor ICAgICAgICAoUVRvdWNoV2ViUGFnZTo6UVRvdWNoV2ViUGFnZSk6CisgICAgICAgIChRVG91Y2hX ZWJQYWdlUHJpdmF0ZTo6c2V0UGFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xdG91 Y2h3ZWJwYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmNw cDoKKyAgICAgICAgKFFUb3VjaFdlYlZpZXc6OlFUb3VjaFdlYlZpZXcpOgorICAgICAgICAoUVRv dWNoV2ViVmlldzo6Z2VvbWV0cnlDaGFuZ2VkKToKKyAgICAgICAgKFFUb3VjaFdlYlZpZXc6Om9u VmlzaWJsZUNoYW5nZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmll dy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICog VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv RHJhd2luZ0FyZWFQcm94eUltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvVGlsZWREcmF3aW5n QXJlYVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYVByb3h5OjpU aWxlZERyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZERyYXdpbmdBcmVh UHJveHk6OmRldmljZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv VGlsZWREcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dmlld1N0YXRlRGlkQ2hhbmdl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAq IFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oOgorCiAyMDExLTEwLTIwICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUg V2ViS2l0V2ViTG9hZGVyQ2xpZW50UHJpdmF0ZQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0RyYXdpbmdBcmVhUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCShyZXZpc2lvbiA5Nzk1NSkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTc3LDgg Kzc3LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHdhaXRGb3JCYWNraW5nU3RvcmVV cGRhdGVPbk5leHRQYWludCgpIHsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNldFBhZ2VJc1Zpc2li bGUoYm9vbCBpc1Zpc2libGUpID0gMDsKLQogICAgIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNp emUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0KICAgICB2b2lkIHNldFNpemUoY29uc3QgV2Vi Q29yZTo6SW50U2l6ZSYsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCk7CiAK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJ bXBsLmNwcAkocmV2aXNpb24gOTc5NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJh d2luZ0FyZWFQcm94eUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzksMTAgKzEzOSw2IEBA IHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnZpc2liaWxpdHlEaWQKICNlbmRpZgogfQogCi12 b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpzZXRQYWdlSXNWaXNpYmxlKGJvb2wpCi17Ci19Ci0K IHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnNldEJhY2tpbmdTdG9yZUlzRGlzY2FyZGFibGUo Ym9vbCBpc0JhY2tpbmdTdG9yZURpc2NhcmRhYmxlKQogewogICAgIGlmIChtX2lzQmFja2luZ1N0 b3JlRGlzY2FyZGFibGUgPT0gaXNCYWNraW5nU3RvcmVEaXNjYXJkYWJsZSkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCShyZXZpc2lv biA5Nzk1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1w bC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw3ICs1NSw2IEBAIHByaXZhdGU6CiAgICAgdmlydHVh bCB2b2lkIHNpemVEaWRDaGFuZ2UoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGV2aWNlU2NhbGVGYWN0 b3JEaWRDaGFuZ2UoKTsKICAgICB2aXJ0dWFsIHZvaWQgdmlzaWJpbGl0eURpZENoYW5nZSgpOwot ICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlSXNWaXNpYmxlKGJvb2wpOwogICAgIHZpcnR1YWwgdm9p ZCBzZXRCYWNraW5nU3RvcmVJc0Rpc2NhcmRhYmxlKGJvb2wpOwogICAgIHZpcnR1YWwgdm9pZCB3 YWl0Rm9yQmFja2luZ1N0b3JlVXBkYXRlT25OZXh0UGFpbnQoKTsKIApJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5jcHAJKHJldmlz aW9uIDk3OTU1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQ cm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDYgQEAgUGFzc093blB0cjxUaWxl ZERyYXdpbmdBcmVhUHJveHk+IFRpbGVkRAogVGlsZWREcmF3aW5nQXJlYVByb3h5OjpUaWxlZERy YXdpbmdBcmVhUHJveHkoUGxhdGZvcm1XZWJWaWV3KiB3ZWJWaWV3LCBXZWJQYWdlUHJveHkqIHdl YlBhZ2VQcm94eSkKICAgICA6IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFUeXBlVGlsZWQs IHdlYlBhZ2VQcm94eSkKICAgICAsIG1faXNXYWl0aW5nRm9yRGlkU2V0RnJhbWVOb3RpZmljYXRp b24oZmFsc2UpCi0gICAgLCBtX2lzVmlzaWJsZSh0cnVlKQogICAgICwgbV93ZWJWaWV3KHdlYlZp ZXcpCiB7CiB9CkBAIC05MywyOSArOTIsNiBAQCB2b2lkIFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6 ZGV2aWNlU2NhbGVGCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotdm9pZCBUaWxlZERyYXdp bmdBcmVhUHJveHk6OnNldFBhZ2VJc1Zpc2libGUoYm9vbCBpc1Zpc2libGUpCi17Ci0gICAgV2Vi UGFnZVByb3h5KiBwYWdlID0gdGhpcy0+cGFnZSgpOwotCi0gICAgaWYgKGlzVmlzaWJsZSA9PSBt X2lzVmlzaWJsZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9pc1Zpc2libGUgPSBpc1Zpc2li bGU7Ci0gICAgaWYgKCFwYWdlIHx8ICFwYWdlLT5pc1ZhbGlkKCkpCi0gICAgICAgIHJldHVybjsK LQotICAgIGlmICghbV9pc1Zpc2libGUpIHsKLSAgICAgICAgLy8gVGVsbCB0aGUgd2ViIHByb2Nl c3MgdGhhdCBpdCBkb2Vzbid0IG5lZWQgdG8gcGFpbnQgYW55dGhpbmcgZm9yIG5vdy4KLSAgICAg ICAgcGFnZS0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U3VzcGVuZFBh aW50aW5nKCksIHBhZ2UtPnBhZ2VJRCgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAg IC8vIFRoZSBwYWdlIGlzIG5vdyB2aXNpYmxlLgotICAgIHBhZ2UtPnByb2Nlc3MoKS0+c2VuZChN ZXNzYWdlczo6RHJhd2luZ0FyZWE6OlJlc3VtZVBhaW50aW5nKCksIHBhZ2UtPnBhZ2VJRCgpKTsK LQotICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcmVxdWVzdCBhIGZ1bGwgcmVwYWludCBoZXJlIGlm IG5lZWRlZC4KLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZgpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaAkocmV2 aXNpb24gOTc5NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJl YVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTg3LDcgKzg3LDYgQEAgcHJpdmF0ZToKICAgICAv LyBEcmF3aW5nQXJlYVByb3h5CiAgICAgdmlydHVhbCB2b2lkIHNpemVEaWRDaGFuZ2UoKTsKICAg ICB2aXJ0dWFsIHZvaWQgZGV2aWNlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoKTsKLSAgICB2aXJ0dWFs IHZvaWQgc2V0UGFnZUlzVmlzaWJsZShib29sIGlzVmlzaWJsZSk7CiAKICAgICB2aXJ0dWFsIHZv aWQgY3JlYXRlVGlsZShpbnQgdGlsZUlELCBjb25zdCBVcGRhdGVJbmZvJik7CiAgICAgdmlydHVh bCB2b2lkIHVwZGF0ZVRpbGUoaW50IHRpbGVJRCwgY29uc3QgVXBkYXRlSW5mbyYpOwpAQCAtOTcs NyArOTYsNiBAQCBwcml2YXRlOgogCiBwcml2YXRlOgogICAgIGJvb2wgbV9pc1dhaXRpbmdGb3JE aWRTZXRGcmFtZU5vdGlmaWNhdGlvbjsKLSAgICBib29sIG1faXNWaXNpYmxlOwogCiAgICAgUGxh dGZvcm1XZWJWaWV3KiBtX3dlYlZpZXc7CiAjaWYgUExBVEZPUk0oUVQpCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gOTc5NTUpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjgwLDcgKzY4MCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3U3RhdGVEaWRDaGFuZ2Uo VmkKICAgICAgICAgaWYgKGlzVmlzaWJsZSAhPSBtX2lzVmlzaWJsZSkgewogICAgICAgICAgICAg bV9pc1Zpc2libGUgPSBpc1Zpc2libGU7CiAgICAgICAgICAgICBtX2RyYXdpbmdBcmVhLT52aXNp YmlsaXR5RGlkQ2hhbmdlKCk7Ci0gICAgICAgICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWdlSXNW aXNpYmxlKGlzVmlzaWJsZSk7CiAKICAgICAgICAgICAgIGlmICghbV9pc1Zpc2libGUpIHsKICAg ICAgICAgICAgICAgICAvLyBJZiB3ZSd2ZSBzdGFydGVkIHRoZSByZXNwb25zaXZlbmVzcyB0aW1l ciBhcyBwYXJ0IG9mIHRlbGxpbmcgdGhlIHdlYiBwcm9jZXNzIHRvIHVwZGF0ZSB0aGUgYmFja2lu ZyBzdG9yZQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJw YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0 b3VjaHdlYnBhZ2UuY3BwCShyZXZpc2lvbiA5Nzk1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4LDcgKzM4 LDYgQEAgUVRvdWNoV2ViUGFnZTo6UVRvdWNoV2ViUGFnZShRU0dJdGVtKiBwYQogICAgIC8vIFdl IGRvIHRoZSB0cmFuc2Zvcm0gZnJvbSB0aGUgdG9wIGxlZnQgc28gdGhlIHZpZXdwb3J0IGNhbiBh c3N1bWUgdGhlIHBvc2l0aW9uIDAsIDAKICAgICAvLyBpcyBhbHdheXMgd2hlcmUgcmVuZGVyaW5n IHN0YXJ0cy4KICAgICBzZXRUcmFuc2Zvcm1PcmlnaW4oVG9wTGVmdCk7Ci0gICAgY29ubmVjdCh0 aGlzLCBTSUdOQUwodmlzaWJsZUNoYW5nZWQoKSksIFNMT1Qob25WaXNpYmxlQ2hhbmdlZCgpKSk7 CiB9CiAKIFFUb3VjaFdlYlBhZ2U6On5RVG91Y2hXZWJQYWdlKCkKQEAgLTE2MSw5ICsxNjAsNCBA QCB2b2lkIFFUb3VjaFdlYlBhZ2VQcml2YXRlOjpzZXRQYWdlKFF0VG91CiAgICAgdGhpcy0+cGFn ZSA9IHBhZ2U7CiB9CiAKLXZvaWQgUVRvdWNoV2ViUGFnZTo6b25WaXNpYmxlQ2hhbmdlZCgpCi17 Ci0gICAgZC0+cGFnZS0+c2V0UGFnZUlzVmlzaWJsZShpc1Zpc2libGUoKSk7Ci19Ci0KICNpbmNs dWRlICJtb2NfcXRvdWNod2VicGFnZS5jcHAiCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuaAkocmV2aXNpb24gOTc5NTUpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuaAkod29ya2luZyBjb3B5 KQpAQCAtNzUsOSArNzUsNiBAQCBRX1NJR05BTFM6CiAgICAgdm9pZCBsb2FkRmFpbGVkKFFUb3Vj aFdlYlBhZ2U6OkVycm9yVHlwZSBlcnJvclR5cGUsIGludCBlcnJvckNvZGUsIGNvbnN0IFFVcmwm IHVybCk7CiAgICAgdm9pZCBsb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCBwcm9ncmVzcyk7CiAKLXBy b3RlY3RlZCBRX1NMT1RTOgotICAgIHZvaWQgb25WaXNpYmxlQ2hhbmdlZCgpOwotCiBwcm90ZWN0 ZWQ6CiAgICAgdmlydHVhbCB2b2lkIGtleVByZXNzRXZlbnQoUUtleUV2ZW50Kik7CiAgICAgdmly dHVhbCB2b2lkIGtleVJlbGVhc2VFdmVudChRS2V5RXZlbnQqKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmNwcAkocmV2aXNpb24g OTc5NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw2ICs5Nyw3IEBAIFFUb3VjaFdlYlZpZXc6OlFUb3Vj aFdlYlZpZXcoUVNHSXRlbSogcGEKICAgICAsIGQobmV3IFFUb3VjaFdlYlZpZXdQcml2YXRlKHRo aXMpKQogewogICAgIHNldEZsYWdzKFFTR0l0ZW06Okl0ZW1DbGlwc0NoaWxkcmVuVG9TaGFwZSk7 CisgICAgY29ubmVjdCh0aGlzLCBTSUdOQUwodmlzaWJsZUNoYW5nZWQoKSksIFNMT1Qob25WaXNp YmxlQ2hhbmdlZCgpKSk7CiB9CiAKIFFUb3VjaFdlYlZpZXc6On5RVG91Y2hXZWJWaWV3KCkKQEAg LTExOCw0ICsxMTksMTEgQEAgdm9pZCBRVG91Y2hXZWJWaWV3OjpnZW9tZXRyeUNoYW5nZWQoY29u cwogICAgIH0KIH0KIAordm9pZCBRVG91Y2hXZWJWaWV3OjpvblZpc2libGVDaGFuZ2VkKCkKK3sK KyAgICBXZWJQYWdlUHJveHkqIHBhZ2VQcm94eSA9IHRvSW1wbChkLT5wYWdlLnBhZ2VSZWYoKSk7 CisKKyAgICBwYWdlUHJveHktPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdJ c0luV2luZG93KTsKK30KKwogI2luY2x1ZGUgIm1vY19xdG91Y2h3ZWJ2aWV3LmNwcCIKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5oCShy ZXZpc2lvbiA5Nzk1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNo d2Vidmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw5IEBAIHB1YmxpYzoKIAogICAg IFFUb3VjaFdlYlBhZ2UgKnBhZ2UoKTsKIAorcHJvdGVjdGVkIFFfU0xPVFM6CisgICAgdm9pZCBv blZpc2libGVDaGFuZ2VkKCk7CisKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgZ2VvbWV0 cnlDaGFuZ2VkKGNvbnN0IFFSZWN0RiYsIGNvbnN0IFFSZWN0RiYpOwogCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDk3 OTU1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjk2LDkgKzY5Niw0IEBAIHZvaWQgUXRXZWJQYWdlUHJveHk6OnNl dFZpZXdwb3J0QXJndW1lbnQKICAgICBtX3ZpZXdJbnRlcmZhY2UtPmRpZFJlY2VpdmVWaWV3cG9y dEFyZ3VtZW50cyhhcmdzKTsKIH0KIAotdm9pZCBRdFdlYlBhZ2VQcm94eTo6c2V0UGFnZUlzVmlz aWJsZShib29sIGlzVmlzaWJsZSkKLXsKLSAgICBtX3dlYlBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEo KS0+c2V0UGFnZUlzVmlzaWJsZShpc1Zpc2libGUpOwotfQotCiAjaW5jbHVkZSAibW9jX1F0V2Vi UGFnZVByb3h5LmNwcCIKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdl YlBhZ2VQcm94eS5oCShyZXZpc2lvbiA5Nzk1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFdlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzAsOCArMTcwLDYgQEAg cHVibGljOgogCiAgICAgUVdLSGlzdG9yeSogaGlzdG9yeSgpIGNvbnN0OwogCi0gICAgdm9pZCBz ZXRQYWdlSXNWaXNpYmxlKGJvb2wpOwotCiBwdWJsaWMgUV9TTE9UUzoKICAgICB2b2lkIHdlYkFj dGlvblRyaWdnZXJlZChib29sIGNoZWNrZWQpOwogCg== 111802 2011-10-20 10:17:25 -0700 2011-10-20 10:26:37 -0700 Patch bug-70520-20111020191724.patch text/plain 9671 zalan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3OTkxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMTAtMjAgIFphbGFuIEJ1 anRhcyAgPHpidWp0YXNAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBSZW1vdmUgcmVk dW5kYW50IHNldFBhZ2VJc1Zpc2libGUoKSBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNTIwCisKKyAgICAgICAgVXNlIERyYXdpbmdBcmVhUHJv eHk6OnZpc2liaWxpdHlEaWRDaGFuZ2UoKSBpbnN0ZWFkIG9mIERyYXdpbmdBcmVhUHJveHk6OnNl dFBhZ2VJc1Zpc2libGUoKQorICAgICAgICBSZW1vdmUgRHJhd2luZ0FyZWFQcm94eTo6c2V0UGFn ZUlzVmlzaWJsZSgpLCBub3QgdXNlZCBhbnltb3JlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdl LmNwcDoKKyAgICAgICAgKFFUb3VjaFdlYlBhZ2U6OlFUb3VjaFdlYlBhZ2UpOgorICAgICAgICAo UVRvdWNoV2ViUGFnZVByaXZhdGU6OnNldFBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv cXQvcXRvdWNod2VicGFnZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vi dmlldy5jcHA6CisgICAgICAgIChRVG91Y2hXZWJWaWV3OjpRVG91Y2hXZWJWaWV3KToKKyAgICAg ICAgKFFUb3VjaFdlYlZpZXc6Omdlb21ldHJ5Q2hhbmdlZCk6CisgICAgICAgIChRVG91Y2hXZWJW aWV3OjpvblZpc2libGVDaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3Vj aHdlYnZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHA6CisgICAgICAgICogVUlQ cm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL1RpbGVk RHJhd2luZ0FyZWFQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkRHJhd2luZ0FyZWFQ cm94eTo6VGlsZWREcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3 aW5nQXJlYVByb3h5OjpkZXZpY2VTY2FsZUZhY3RvckRpZENoYW5nZSk6CisgICAgICAgICogVUlQ cm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnZpZXdTdGF0ZURp ZENoYW5nZSk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaDoKKwogMjAxMS0xMC0yMCAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10g UmVtb3ZlIFdlYktpdFdlYkxvYWRlckNsaWVudFByaXZhdGUKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAkocmV2aXNpb24gOTc5NTUpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBA IC03Nyw4ICs3Nyw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCB3YWl0Rm9yQmFja2lu Z1N0b3JlVXBkYXRlT25OZXh0UGFpbnQoKSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdl SXNWaXNpYmxlKGJvb2wgaXNWaXNpYmxlKSA9IDA7Ci0KICAgICBjb25zdCBXZWJDb3JlOjpJbnRT aXplJiBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9zaXplOyB9CiAgICAgdm9pZCBzZXRTaXplKGNv bnN0IFdlYkNvcmU6OkludFNpemUmLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZz ZXQpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUlt cGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5jcHAJKHJldmlzaW9uIDk3OTU1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM5LDEwICsx MzksNiBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjp2aXNpYmlsaXR5RGlkCiAjZW5kaWYK IH0KIAotdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2V0UGFnZUlzVmlzaWJsZShib29sKQot ewotfQotCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpzZXRCYWNraW5nU3RvcmVJc0Rpc2Nh cmRhYmxlKGJvb2wgaXNCYWNraW5nU3RvcmVEaXNjYXJkYWJsZSkKIHsKICAgICBpZiAobV9pc0Jh Y2tpbmdTdG9yZURpc2NhcmRhYmxlID09IGlzQmFja2luZ1N0b3JlRGlzY2FyZGFibGUpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaAko cmV2aXNpb24gOTc5NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQ cm94eUltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsNiBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBzaXplRGlkQ2hhbmdlKCk7CiAgICAgdmlydHVhbCB2b2lkIGRldmljZVNj YWxlRmFjdG9yRGlkQ2hhbmdlKCk7CiAgICAgdmlydHVhbCB2b2lkIHZpc2liaWxpdHlEaWRDaGFu Z2UoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZUlzVmlzaWJsZShib29sKTsKICAgICB2aXJ0 dWFsIHZvaWQgc2V0QmFja2luZ1N0b3JlSXNEaXNjYXJkYWJsZShib29sKTsKICAgICB2aXJ0dWFs IHZvaWQgd2FpdEZvckJhY2tpbmdTdG9yZVVwZGF0ZU9uTmV4dFBhaW50KCk7CiAKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuY3Bw CShyZXZpc2lvbiA5Nzk1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdp bmdBcmVhUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw2IEBAIFBhc3NPd25Q dHI8VGlsZWREcmF3aW5nQXJlYVByb3h5PiBUaWxlZEQKIFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6 VGlsZWREcmF3aW5nQXJlYVByb3h5KFBsYXRmb3JtV2ViVmlldyogd2ViVmlldywgV2ViUGFnZVBy b3h5KiB3ZWJQYWdlUHJveHkpCiAgICAgOiBEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhVHlw ZVRpbGVkLCB3ZWJQYWdlUHJveHkpCiAgICAgLCBtX2lzV2FpdGluZ0ZvckRpZFNldEZyYW1lTm90 aWZpY2F0aW9uKGZhbHNlKQotICAgICwgbV9pc1Zpc2libGUodHJ1ZSkKICAgICAsIG1fd2ViVmll dyh3ZWJWaWV3KQogewogfQpAQCAtOTMsMjkgKzkyLDYgQEAgdm9pZCBUaWxlZERyYXdpbmdBcmVh UHJveHk6OmRldmljZVNjYWxlRgogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgVGls ZWREcmF3aW5nQXJlYVByb3h5OjpzZXRQYWdlSXNWaXNpYmxlKGJvb2wgaXNWaXNpYmxlKQotewot ICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHRoaXMtPnBhZ2UoKTsKLQotICAgIGlmIChpc1Zpc2li bGUgPT0gbV9pc1Zpc2libGUpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1faXNWaXNpYmxlID0g aXNWaXNpYmxlOwotICAgIGlmICghcGFnZSB8fCAhcGFnZS0+aXNWYWxpZCgpKQotICAgICAgICBy ZXR1cm47Ci0KLSAgICBpZiAoIW1faXNWaXNpYmxlKSB7Ci0gICAgICAgIC8vIFRlbGwgdGhlIHdl YiBwcm9jZXNzIHRoYXQgaXQgZG9lc24ndCBuZWVkIHRvIHBhaW50IGFueXRoaW5nIGZvciBub3cu Ci0gICAgICAgIHBhZ2UtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OlN1 c3BlbmRQYWludGluZygpLCBwYWdlLT5wYWdlSUQoKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9 Ci0KLSAgICAvLyBUaGUgcGFnZSBpcyBub3cgdmlzaWJsZS4KLSAgICBwYWdlLT5wcm9jZXNzKCkt PnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpSZXN1bWVQYWludGluZygpLCBwYWdlLT5wYWdl SUQoKSk7Ci0KLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHJlcXVlc3QgYSBmdWxsIHJlcGFpbnQg aGVyZSBpZiBuZWVkZWQuCi19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5 LmgJKHJldmlzaW9uIDk3OTU1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVkRHJh d2luZ0FyZWFQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC04Nyw3ICs4Nyw2IEBAIHByaXZhdGU6 CiAgICAgLy8gRHJhd2luZ0FyZWFQcm94eQogICAgIHZpcnR1YWwgdm9pZCBzaXplRGlkQ2hhbmdl KCk7CiAgICAgdmlydHVhbCB2b2lkIGRldmljZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKCk7Ci0gICAg dmlydHVhbCB2b2lkIHNldFBhZ2VJc1Zpc2libGUoYm9vbCBpc1Zpc2libGUpOwogCiAgICAgdmly dHVhbCB2b2lkIGNyZWF0ZVRpbGUoaW50IHRpbGVJRCwgY29uc3QgVXBkYXRlSW5mbyYpOwogICAg IHZpcnR1YWwgdm9pZCB1cGRhdGVUaWxlKGludCB0aWxlSUQsIGNvbnN0IFVwZGF0ZUluZm8mKTsK QEAgLTk3LDcgKzk2LDYgQEAgcHJpdmF0ZToKIAogcHJpdmF0ZToKICAgICBib29sIG1faXNXYWl0 aW5nRm9yRGlkU2V0RnJhbWVOb3RpZmljYXRpb247Ci0gICAgYm9vbCBtX2lzVmlzaWJsZTsKIAog ICAgIFBsYXRmb3JtV2ViVmlldyogbV93ZWJWaWV3OwogI2lmIFBMQVRGT1JNKFFUKQpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDk3OTU1 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTY4MCw3ICs2ODAsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6dmlld1N0YXRlRGlk Q2hhbmdlKFZpCiAgICAgICAgIGlmIChpc1Zpc2libGUgIT0gbV9pc1Zpc2libGUpIHsKICAgICAg ICAgICAgIG1faXNWaXNpYmxlID0gaXNWaXNpYmxlOwogICAgICAgICAgICAgbV9kcmF3aW5nQXJl YS0+dmlzaWJpbGl0eURpZENoYW5nZSgpOwotICAgICAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0 UGFnZUlzVmlzaWJsZShpc1Zpc2libGUpOwogCiAgICAgICAgICAgICBpZiAoIW1faXNWaXNpYmxl KSB7CiAgICAgICAgICAgICAgICAgLy8gSWYgd2UndmUgc3RhcnRlZCB0aGUgcmVzcG9uc2l2ZW5l c3MgdGltZXIgYXMgcGFydCBvZiB0ZWxsaW5nIHRoZSB3ZWIgcHJvY2VzcyB0byB1cGRhdGUgdGhl IGJhY2tpbmcgc3RvcmUKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRv dWNod2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xdG91Y2h3ZWJwYWdlLmNwcAkocmV2aXNpb24gOTc5NTUpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z OCw3ICszOCw2IEBAIFFUb3VjaFdlYlBhZ2U6OlFUb3VjaFdlYlBhZ2UoUVNHSXRlbSogcGEKICAg ICAvLyBXZSBkbyB0aGUgdHJhbnNmb3JtIGZyb20gdGhlIHRvcCBsZWZ0IHNvIHRoZSB2aWV3cG9y dCBjYW4gYXNzdW1lIHRoZSBwb3NpdGlvbiAwLCAwCiAgICAgLy8gaXMgYWx3YXlzIHdoZXJlIHJl bmRlcmluZyBzdGFydHMuCiAgICAgc2V0VHJhbnNmb3JtT3JpZ2luKFRvcExlZnQpOwotICAgIGNv bm5lY3QodGhpcywgU0lHTkFMKHZpc2libGVDaGFuZ2VkKCkpLCBTTE9UKG9uVmlzaWJsZUNoYW5n ZWQoKSkpOwogfQogCiBRVG91Y2hXZWJQYWdlOjp+UVRvdWNoV2ViUGFnZSgpCkBAIC0xNjEsOSAr MTYwLDQgQEAgdm9pZCBRVG91Y2hXZWJQYWdlUHJpdmF0ZTo6c2V0UGFnZShRdFRvdQogICAgIHRo aXMtPnBhZ2UgPSBwYWdlOwogfQogCi12b2lkIFFUb3VjaFdlYlBhZ2U6Om9uVmlzaWJsZUNoYW5n ZWQoKQotewotICAgIGQtPnBhZ2UtPnNldFBhZ2VJc1Zpc2libGUoaXNWaXNpYmxlKCkpOwotfQot CiAjaW5jbHVkZSAibW9jX3F0b3VjaHdlYnBhZ2UuY3BwIgpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmgJKHJldmlzaW9uIDk3OTU1KQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmgJKHdvcmtp bmcgY29weSkKQEAgLTc1LDkgKzc1LDYgQEAgUV9TSUdOQUxTOgogICAgIHZvaWQgbG9hZEZhaWxl ZChRVG91Y2hXZWJQYWdlOjpFcnJvclR5cGUgZXJyb3JUeXBlLCBpbnQgZXJyb3JDb2RlLCBjb25z dCBRVXJsJiB1cmwpOwogICAgIHZvaWQgbG9hZFByb2dyZXNzQ2hhbmdlZChpbnQgcHJvZ3Jlc3Mp OwogCi1wcm90ZWN0ZWQgUV9TTE9UUzoKLSAgICB2b2lkIG9uVmlzaWJsZUNoYW5nZWQoKTsKLQog cHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBrZXlQcmVzc0V2ZW50KFFLZXlFdmVudCopOwog ICAgIHZpcnR1YWwgdm9pZCBrZXlSZWxlYXNlRXZlbnQoUUtleUV2ZW50Kik7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5jcHAJKHJl dmlzaW9uIDk3OTU1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3 ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTcsNiArOTcsNyBAQCBRVG91Y2hXZWJWaWV3 OjpRVG91Y2hXZWJWaWV3KFFTR0l0ZW0qIHBhCiAgICAgLCBkKG5ldyBRVG91Y2hXZWJWaWV3UHJp dmF0ZSh0aGlzKSkKIHsKICAgICBzZXRGbGFncyhRU0dJdGVtOjpJdGVtQ2xpcHNDaGlsZHJlblRv U2hhcGUpOworICAgIGNvbm5lY3QodGhpcywgU0lHTkFMKHZpc2libGVDaGFuZ2VkKCkpLCBTTE9U KG9uVmlzaWJsZUNoYW5nZWQoKSkpOwogfQogCiBRVG91Y2hXZWJWaWV3Ojp+UVRvdWNoV2ViVmll dygpCkBAIC0xMTgsNCArMTE5LDExIEBAIHZvaWQgUVRvdWNoV2ViVmlldzo6Z2VvbWV0cnlDaGFu Z2VkKGNvbnMKICAgICB9CiB9CiAKK3ZvaWQgUVRvdWNoV2ViVmlldzo6b25WaXNpYmxlQ2hhbmdl ZCgpCit7CisgICAgV2ViUGFnZVByb3h5KiBwYWdlUHJveHkgPSB0b0ltcGwoZC0+cGFnZS5wYWdl UmVmKCkpOworCisgICAgcGFnZVByb3h5LT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5 OjpWaWV3SXNJbldpbmRvdyk7Cit9CisKICNpbmNsdWRlICJtb2NfcXRvdWNod2Vidmlldy5jcHAi CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZp ZXcuaAkocmV2aXNpb24gOTc5NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3F0b3VjaHdlYnZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsOSBAQCBwdWJsaWM6 CiAKICAgICBRVG91Y2hXZWJQYWdlICpwYWdlKCk7CiAKK3Byb3RlY3RlZCBRX1NMT1RTOgorICAg IHZvaWQgb25WaXNpYmxlQ2hhbmdlZCgpOworCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lk IGdlb21ldHJ5Q2hhbmdlZChjb25zdCBRUmVjdEYmLCBjb25zdCBRUmVjdEYmKTsKIApJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCShyZXZp c2lvbiA5Nzk1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94 eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY5Niw5ICs2OTYsNCBAQCB2b2lkIFF0V2ViUGFnZVBy b3h5OjpzZXRWaWV3cG9ydEFyZ3VtZW50CiAgICAgbV92aWV3SW50ZXJmYWNlLT5kaWRSZWNlaXZl Vmlld3BvcnRBcmd1bWVudHMoYXJncyk7CiB9CiAKLXZvaWQgUXRXZWJQYWdlUHJveHk6OnNldFBh Z2VJc1Zpc2libGUoYm9vbCBpc1Zpc2libGUpCi17Ci0gICAgbV93ZWJQYWdlUHJveHktPmRyYXdp bmdBcmVhKCktPnNldFBhZ2VJc1Zpc2libGUoaXNWaXNpYmxlKTsKLX0KLQogI2luY2x1ZGUgIm1v Y19RdFdlYlBhZ2VQcm94eS5jcHAiCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRXZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvUXRXZWJQYWdlUHJveHkuaAkocmV2aXNpb24gOTc5NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTcwLDggKzE3 MCw2IEBAIHB1YmxpYzoKIAogICAgIFFXS0hpc3RvcnkqIGhpc3RvcnkoKSBjb25zdDsKIAotICAg IHZvaWQgc2V0UGFnZUlzVmlzaWJsZShib29sKTsKLQogcHVibGljIFFfU0xPVFM6CiAgICAgdm9p ZCB3ZWJBY3Rpb25UcmlnZ2VyZWQoYm9vbCBjaGVja2VkKTsKIAo= 112192 2011-10-24 08:47:59 -0700 2011-10-25 04:00:58 -0700 Patch bug-70520-20111024174758.patch text/plain 10051 zalan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4MjM1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTEtMTAtMjQgIFphbGFuIEJ1 anRhcyAgPHpidWp0YXNAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBSZW1vdmUgcmVk dW5kYW50IHNldFBhZ2VJc1Zpc2libGUoKSBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNTIwCisKKyAgICAgICAgVXNlIERyYXdpbmdBcmVhUHJv eHk6OnZpc2liaWxpdHlEaWRDaGFuZ2UoKSBpbnN0ZWFkIG9mIERyYXdpbmdBcmVhUHJveHk6OnNl dFBhZ2VJc1Zpc2libGUoKQorICAgICAgICBSZW1vdmUgRHJhd2luZ0FyZWFQcm94eTo6c2V0UGFn ZUlzVmlzaWJsZSgpLCBub3QgdXNlZCBhbnltb3JlLgorICAgICAgICBUaGlzIGNoYW5nZSBkaXNh YmxlcyB0aGUgYWJpbGl0eSBvZiBzdXNwZW5kaW5nIGFuZCByZXN1bWluZyBwYWludGluZyBmb3Ig VGlsZWREcmF3aW5nQXJlYVByb3h5LgorICAgICAgICBIb3dldmVyLCBUaWxlZERyYXdpbmdBcmVh UHJveHkgaXMgYWJvdXQgdG8gYmUgZGVwcmVjYXRlZCBieSB1c2luZyBEcmF3aW5nQXJlYVByb3h5 SW1wbAorICAgICAgICBhcyB0aGUgVUkgcHJvY2VzcyBkcmF3aW5nIGFyZWEgcHJveHkgZm9yIHRp bGVkIGJhc2VkIHJlbmRlcmluZy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5jcHA6CisgICAg ICAgIChRVG91Y2hXZWJQYWdlOjpRVG91Y2hXZWJQYWdlKToKKyAgICAgICAgKFFUb3VjaFdlYlBh Z2VQcml2YXRlOjpzZXRQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdl YnBhZ2UuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwOgor ICAgICAgICAoUVRvdWNoV2ViVmlldzo6UVRvdWNoV2ViVmlldyk6CisgICAgICAgIChRVG91Y2hX ZWJWaWV3Ojp0b3VjaEV2ZW50KToKKyAgICAgICAgKFFUb3VjaFdlYlZpZXc6Om9uVmlzaWJsZUNo YW5nZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNz L0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eUltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYVByb3h5OjpUaWxlZERyYXdp bmdBcmVhUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZERyYXdpbmdBcmVhUHJveHk6OmRl dmljZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvVGlsZWREcmF3 aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dmlld1N0YXRlRGlkQ2hhbmdlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAqIFVJUHJvY2Vz cy9xdC9RdFdlYlBhZ2VQcm94eS5oOgorCiAyMDExLTEwLTI0ICBaZW5vIEFsYmlzc2VyICA8emVu by5hbGJpc3NlckBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XVtXSzJdIFdlYlZpZXcgZG9lcyBu b3QgZ2V0IGZvY3VzIHdoZW4gYmVpbmcgY2xpY2tlZCAvIHRvdWNoZWQgaW4gTWluaUJyb3dzZXIu CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgJKHJl dmlzaW9uIDk4MjM1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzcsOCArNzcsNiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0 dWFsIHZvaWQgd2FpdEZvckJhY2tpbmdTdG9yZVVwZGF0ZU9uTmV4dFBhaW50KCkgeyB9CiAKLSAg ICB2aXJ0dWFsIHZvaWQgc2V0UGFnZUlzVmlzaWJsZShib29sIGlzVmlzaWJsZSkgPSAwOwotCiAg ICAgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsg fQogICAgIHZvaWQgc2V0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgY29uc3QgV2ViQ29y ZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCShyZXZpc2lvbiA5ODIzNSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEzOSwxMCArMTM5LDYgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6 dmlzaWJpbGl0eURpZAogI2VuZGlmCiB9CiAKLXZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnNl dFBhZ2VJc1Zpc2libGUoYm9vbCkKLXsKLX0KLQogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6 c2V0QmFja2luZ1N0b3JlSXNEaXNjYXJkYWJsZShib29sIGlzQmFja2luZ1N0b3JlRGlzY2FyZGFi bGUpCiB7CiAgICAgaWYgKG1faXNCYWNraW5nU3RvcmVEaXNjYXJkYWJsZSA9PSBpc0JhY2tpbmdT dG9yZURpc2NhcmRhYmxlKQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdB cmVhUHJveHlJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Ry YXdpbmdBcmVhUHJveHlJbXBsLmgJKHJldmlzaW9uIDk4MjM1KQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDcg KzU1LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2l6ZURpZENoYW5nZSgpOwogICAg IHZpcnR1YWwgdm9pZCBkZXZpY2VTY2FsZUZhY3RvckRpZENoYW5nZSgpOwogICAgIHZpcnR1YWwg dm9pZCB2aXNpYmlsaXR5RGlkQ2hhbmdlKCk7Ci0gICAgdmlydHVhbCB2b2lkIHNldFBhZ2VJc1Zp c2libGUoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHNldEJhY2tpbmdTdG9yZUlzRGlzY2FyZGFi bGUoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHdhaXRGb3JCYWNraW5nU3RvcmVVcGRhdGVPbk5l eHRQYWludCgpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5n QXJlYVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGls ZWREcmF3aW5nQXJlYVByb3h5LmNwcAkocmV2aXNpb24gOTgyMzUpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDcsNyArNDcsNiBAQCBQYXNzT3duUHRyPFRpbGVkRHJhd2luZ0FyZWFQcm94eT4gVGlsZWRECiBU aWxlZERyYXdpbmdBcmVhUHJveHk6OlRpbGVkRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9ybVdlYlZp ZXcqIHdlYlZpZXcsIFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5KQogICAgIDogRHJhd2luZ0Fy ZWFQcm94eShEcmF3aW5nQXJlYVR5cGVUaWxlZCwgd2ViUGFnZVByb3h5KQogICAgICwgbV9pc1dh aXRpbmdGb3JEaWRTZXRGcmFtZU5vdGlmaWNhdGlvbihmYWxzZSkKLSAgICAsIG1faXNWaXNpYmxl KHRydWUpCiAgICAgLCBtX3dlYlZpZXcod2ViVmlldykKIHsKIH0KQEAgLTkzLDI5ICs5Miw2IEBA IHZvaWQgVGlsZWREcmF3aW5nQXJlYVByb3h5OjpkZXZpY2VTY2FsZUYKICAgICBub3RJbXBsZW1l bnRlZCgpOwogfQogCi12b2lkIFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6c2V0UGFnZUlzVmlzaWJs ZShib29sIGlzVmlzaWJsZSkKLXsKLSAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB0aGlzLT5wYWdl KCk7Ci0KLSAgICBpZiAoaXNWaXNpYmxlID09IG1faXNWaXNpYmxlKQotICAgICAgICByZXR1cm47 Ci0KLSAgICBtX2lzVmlzaWJsZSA9IGlzVmlzaWJsZTsKLSAgICBpZiAoIXBhZ2UgfHwgIXBhZ2Ut PmlzVmFsaWQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKCFtX2lzVmlzaWJsZSkgewot ICAgICAgICAvLyBUZWxsIHRoZSB3ZWIgcHJvY2VzcyB0aGF0IGl0IGRvZXNuJ3QgbmVlZCB0byBw YWludCBhbnl0aGluZyBmb3Igbm93LgotICAgICAgICBwYWdlLT5wcm9jZXNzKCktPnNlbmQoTWVz c2FnZXM6OkRyYXdpbmdBcmVhOjpTdXNwZW5kUGFpbnRpbmcoKSwgcGFnZS0+cGFnZUlEKCkpOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgLy8gVGhlIHBhZ2UgaXMgbm93IHZpc2libGUu Ci0gICAgcGFnZS0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6UmVzdW1l UGFpbnRpbmcoKSwgcGFnZS0+cGFnZUlEKCkpOwotCi0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBy ZXF1ZXN0IGEgZnVsbCByZXBhaW50IGhlcmUgaWYgbmVlZGVkLgotfQotCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKIAogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVGlsZWRE cmF3aW5nQXJlYVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1RpbGVkRHJhd2luZ0FyZWFQcm94eS5oCShyZXZpc2lvbiA5ODIzNSkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAt ODcsNyArODcsNiBAQCBwcml2YXRlOgogICAgIC8vIERyYXdpbmdBcmVhUHJveHkKICAgICB2aXJ0 dWFsIHZvaWQgc2l6ZURpZENoYW5nZSgpOwogICAgIHZpcnR1YWwgdm9pZCBkZXZpY2VTY2FsZUZh Y3RvckRpZENoYW5nZSgpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlSXNWaXNpYmxlKGJvb2wg aXNWaXNpYmxlKTsKIAogICAgIHZpcnR1YWwgdm9pZCBjcmVhdGVUaWxlKGludCB0aWxlSUQsIGNv bnN0IFVwZGF0ZUluZm8mKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGlsZShpbnQgdGlsZUlE LCBjb25zdCBVcGRhdGVJbmZvJik7CkBAIC05Nyw3ICs5Niw2IEBAIHByaXZhdGU6CiAKIHByaXZh dGU6CiAgICAgYm9vbCBtX2lzV2FpdGluZ0ZvckRpZFNldEZyYW1lTm90aWZpY2F0aW9uOwotICAg IGJvb2wgbV9pc1Zpc2libGU7CiAKICAgICBQbGF0Zm9ybVdlYlZpZXcqIG1fd2ViVmlldzsKICNp ZiBQTEFURk9STShRVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCShyZXZpc2lvbiA5ODIzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02ODAsNyArNjgwLDYgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnZpZXdTdGF0ZURpZENoYW5nZShWaQogICAgICAgICBpZiAoaXNWaXNpYmxlICE9 IG1faXNWaXNpYmxlKSB7CiAgICAgICAgICAgICBtX2lzVmlzaWJsZSA9IGlzVmlzaWJsZTsKICAg ICAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnZpc2liaWxpdHlEaWRDaGFuZ2UoKTsKLSAgICAgICAg ICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhZ2VJc1Zpc2libGUoaXNWaXNpYmxlKTsKIAogICAgICAg ICAgICAgaWYgKCFtX2lzVmlzaWJsZSkgewogICAgICAgICAgICAgICAgIC8vIElmIHdlJ3ZlIHN0 YXJ0ZWQgdGhlIHJlc3BvbnNpdmVuZXNzIHRpbWVyIGFzIHBhcnQgb2YgdGVsbGluZyB0aGUgd2Vi IHByb2Nlc3MgdG8gdXBkYXRlIHRoZSBiYWNraW5nIHN0b3JlCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5jcHAJKHJldmlzaW9uIDk4 MjM1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJwYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNiBAQCBRVG91Y2hXZWJQYWdlOjpRVG91Y2hX ZWJQYWdlKFFTR0l0ZW0qIHBhCiAgICAgLy8gV2UgZG8gdGhlIHRyYW5zZm9ybSBmcm9tIHRoZSB0 b3AgbGVmdCBzbyB0aGUgdmlld3BvcnQgY2FuIGFzc3VtZSB0aGUgcG9zaXRpb24gMCwgMAogICAg IC8vIGlzIGFsd2F5cyB3aGVyZSByZW5kZXJpbmcgc3RhcnRzLgogICAgIHNldFRyYW5zZm9ybU9y aWdpbihUb3BMZWZ0KTsKLSAgICBjb25uZWN0KHRoaXMsIFNJR05BTCh2aXNpYmxlQ2hhbmdlZCgp KSwgU0xPVChvblZpc2libGVDaGFuZ2VkKCkpKTsKIH0KIAogUVRvdWNoV2ViUGFnZTo6flFUb3Vj aFdlYlBhZ2UoKQpAQCAtMTYxLDkgKzE2MCw0IEBAIHZvaWQgUVRvdWNoV2ViUGFnZVByaXZhdGU6 OnNldFBhZ2UoUXRUb3UKICAgICB0aGlzLT5wYWdlID0gcGFnZTsKIH0KIAotdm9pZCBRVG91Y2hX ZWJQYWdlOjpvblZpc2libGVDaGFuZ2VkKCkKLXsKLSAgICBkLT5wYWdlLT5zZXRQYWdlSXNWaXNp YmxlKGlzVmlzaWJsZSgpKTsKLX0KLQogI2luY2x1ZGUgIm1vY19xdG91Y2h3ZWJwYWdlLmNwcCIK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFnZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2VicGFn ZS5oCShyZXZpc2lvbiA5ODIzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXRvdWNod2VicGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03NSw5ICs3NSw2IEBAIFFfU0lHTkFM UzoKICAgICB2b2lkIGxvYWRGYWlsZWQoUVRvdWNoV2ViUGFnZTo6RXJyb3JUeXBlIGVycm9yVHlw ZSwgaW50IGVycm9yQ29kZSwgY29uc3QgUVVybCYgdXJsKTsKICAgICB2b2lkIGxvYWRQcm9ncmVz c0NoYW5nZWQoaW50IHByb2dyZXNzKTsKIAotcHJvdGVjdGVkIFFfU0xPVFM6Ci0gICAgdm9pZCBv blZpc2libGVDaGFuZ2VkKCk7Ci0KIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQga2V5UHJl c3NFdmVudChRS2V5RXZlbnQqKTsKICAgICB2aXJ0dWFsIHZvaWQga2V5UmVsZWFzZUV2ZW50KFFL ZXlFdmVudCopOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3 ZWJ2aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3F0b3VjaHdlYnZpZXcuY3BwCShyZXZpc2lvbiA5ODIzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3LDYg Kzk3LDcgQEAgUVRvdWNoV2ViVmlldzo6UVRvdWNoV2ViVmlldyhRU0dJdGVtKiBwYQogICAgICwg ZChuZXcgUVRvdWNoV2ViVmlld1ByaXZhdGUodGhpcykpCiB7CiAgICAgc2V0RmxhZ3MoUVNHSXRl bTo6SXRlbUNsaXBzQ2hpbGRyZW5Ub1NoYXBlKTsKKyAgICBjb25uZWN0KHRoaXMsIFNJR05BTCh2 aXNpYmxlQ2hhbmdlZCgpKSwgU0xPVChvblZpc2libGVDaGFuZ2VkKCkpKTsKIH0KIAogUVRvdWNo V2ViVmlldzo6flFUb3VjaFdlYlZpZXcoKQpAQCAtMTI0LDQgKzEyNSwxMSBAQCB2b2lkIFFUb3Vj aFdlYlZpZXc6OnRvdWNoRXZlbnQoUVRvdWNoRXZlCiAgICAgUVNHSXRlbTo6dG91Y2hFdmVudChl dmVudCk7CiB9CiAKK3ZvaWQgUVRvdWNoV2ViVmlldzo6b25WaXNpYmxlQ2hhbmdlZCgpCit7Cisg ICAgV2ViUGFnZVByb3h5KiBwYWdlUHJveHkgPSB0b0ltcGwoZC0+cGFnZS5wYWdlUmVmKCkpOwor CisgICAgcGFnZVByb3h5LT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3SXNW aXNpYmxlKTsKK30KKwogI2luY2x1ZGUgIm1vY19xdG91Y2h3ZWJ2aWV3LmNwcCIKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5oCShyZXZp c2lvbiA5ODIzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vi dmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0NCw5IEBAIHB1YmxpYzoKIAogICAgIFFU b3VjaFdlYlBhZ2UgKnBhZ2UoKTsKIAorcHJvdGVjdGVkIFFfU0xPVFM6CisgICAgdm9pZCBvblZp c2libGVDaGFuZ2VkKCk7CisKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgZ2VvbWV0cnlD aGFuZ2VkKGNvbnN0IFFSZWN0RiYsIGNvbnN0IFFSZWN0RiYpOwogICAgIHZpcnR1YWwgdm9pZCB0 b3VjaEV2ZW50KFFUb3VjaEV2ZW50KiBldmVudCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDk4MjM1KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNjk2LDkgKzY5Niw0IEBAIHZvaWQgUXRXZWJQYWdlUHJveHk6OnNldFZpZXdwb3J0QXJn dW1lbnQKICAgICBtX3ZpZXdJbnRlcmZhY2UtPmRpZFJlY2VpdmVWaWV3cG9ydEFyZ3VtZW50cyhh cmdzKTsKIH0KIAotdm9pZCBRdFdlYlBhZ2VQcm94eTo6c2V0UGFnZUlzVmlzaWJsZShib29sIGlz VmlzaWJsZSkKLXsKLSAgICBtX3dlYlBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKS0+c2V0UGFnZUlz VmlzaWJsZShpc1Zpc2libGUpOwotfQotCiAjaW5jbHVkZSAibW9jX1F0V2ViUGFnZVByb3h5LmNw cCIKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5o CShyZXZpc2lvbiA5ODIzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzAsOCArMTcwLDYgQEAgcHVibGljOgogCiAg ICAgUVdLSGlzdG9yeSogaGlzdG9yeSgpIGNvbnN0OwogCi0gICAgdm9pZCBzZXRQYWdlSXNWaXNp YmxlKGJvb2wpOwotCiBwdWJsaWMgUV9TTE9UUzoKICAgICB2b2lkIHdlYkFjdGlvblRyaWdnZXJl ZChib29sIGNoZWNrZWQpOwogCg==