30370 2009-10-14 18:45:12 -0700 Move scrolling code from FrameLoader to FrameView 2009-10-14 22:16:09 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 29947 1 abarth webkit-unassigned commit-queue oldest_to_newest 154682 0 abarth 2009-10-14 18:45:12 -0700 As discussed on webkit-dev. 154684 1 41198 abarth 2009-10-14 18:46:27 -0700 Created attachment 41198 Patch v1 154685 2 41198 abarth 2009-10-14 18:48:02 -0700 Comment on attachment 41198 Patch v1 Oops. Somehow deleted the FrameView destructor! 154689 3 41200 abarth 2009-10-14 19:12:24 -0700 Created attachment 41200 Patch v1 154707 4 41200 abarth 2009-10-14 21:55:35 -0700 Comment on attachment 41200 Patch v1 Having the commit-queue land this because I'm working on the next patch in the sequence. 154708 5 41200 commit-queue 2009-10-14 22:16:05 -0700 Comment on attachment 41200 Patch v1 Clearing flags on attachment: 41200 Committed r49608: <http://trac.webkit.org/changeset/49608> 154709 6 commit-queue 2009-10-14 22:16:09 -0700 All reviewed patches have been landed. Closing bug. 41198 2009-10-14 18:46:27 -0700 2009-10-14 19:12:16 -0700 Patch v1 bug-30370-20091014184624.patch text/plain 9169 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzUxYTlhMy4uNzJhZTMzNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAwOS0xMC0xNCAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1vdmUgc2Nyb2xsaW5nIGNvZGUgZnJvbSBGcmFtZUxvYWRlciB0byBGcmFt ZVZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMw MzcwCisKKyAgICAgICAgVGhpcyBjb2RlIGlzIGFib3V0IGNvbnRyb2xsaW5nIHRoZSBGcmFtZSdz IHZpZXcsIG5vdCBhYm91dCBsb2FkaW5nCisgICAgICAgIHN0dWZmIGludG8gdGhlIGZyYW1lLgor CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyOjpmaW5pc2hlZFBhcnNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OnNjcm9sbFRvQW5jaG9yKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNjcm9sbFRvRnJhZ21lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVWaWV3OjpzY3JvbGxUb0FuY2hvcik6CisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuaDoKKwogMjAwOS0xMC0xNCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5Acmlt LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9yZ2UgU3RhaWtvcy4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAppbmRleCBjZWQxMjlkLi5jMTgyOGNiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBA IC0xMDE5LDI0ICsxMDE5LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29tbWl0SWNvblVSTFRvSWNv bkRhdGFiYXNlKGNvbnN0IEtVUkwmIGljb24pCiAgICAgaWNvbkRhdGFiYXNlKCktPnNldEljb25V UkxGb3JQYWdlVVJMKGljb24uc3RyaW5nKCksIG9yaWdpbmFsUmVxdWVzdFVSTCgpLnN0cmluZygp KTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6Z290b0FuY2hvcigpCi17Ci0gICAgLy8gSWYgb3Vy IFVSTCBoYXMgbm8gcmVmLCB0aGVuIHdlIGhhdmUgbm8gcGxhY2Ugd2UgbmVlZCB0byBqdW1wIHRv LgotICAgIC8vIE9UT0ggSWYgQ1NTIHRhcmdldCB3YXMgc2V0IHByZXZpb3VzbHksIHdlIHdhbnQg dG8gc2V0IGl0IHRvIDAsIHJlY2FsYwotICAgIC8vIGFuZCBwb3NzaWJseSByZXBhaW50IGJlY2F1 c2UgOnRhcmdldCBwc2V1ZG8gY2xhc3MgbWF5IGhhdmUgYmVlbgotICAgIC8vIHNldCAoc2VlIGJ1 ZyAxMTMyMSkuCi0gICAgaWYgKCFtX1VSTC5oYXNGcmFnbWVudElkZW50aWZpZXIoKSAmJiAhbV9m cmFtZS0+ZG9jdW1lbnQoKS0+Y3NzVGFyZ2V0KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIFN0 cmluZyBmcmFnbWVudElkZW50aWZpZXIgPSBtX1VSTC5mcmFnbWVudElkZW50aWZpZXIoKTsKLSAg ICBpZiAoZ290b0FuY2hvcihmcmFnbWVudElkZW50aWZpZXIpKQotICAgICAgICByZXR1cm47Ci0K LSAgICAvLyBUcnkgYWdhaW4gYWZ0ZXIgZGVjb2RpbmcgdGhlIHJlZiwgYmFzZWQgb24gdGhlIGRv Y3VtZW50J3MgZW5jb2RpbmcuCi0gICAgaWYgKG1fZGVjb2RlcikKLSAgICAgICAgZ290b0FuY2hv cihkZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMoZnJhZ21lbnRJZGVudGlmaWVyLCBtX2RlY29kZXIt PmVuY29kaW5nKCkpKTsKLX0KLQogdm9pZCBGcmFtZUxvYWRlcjo6ZmluaXNoZWRQYXJzaW5nKCkK IHsKICAgICBpZiAobV9jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50KQpAQCAtMTA1OSw4ICsx MDQxLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6ZmluaXNoZWRQYXJzaW5nKCkKICAgICAvLyBDaGVj ayBpZiB0aGUgc2Nyb2xsYmFycyBhcmUgcmVhbGx5IG5lZWRlZCBmb3IgdGhlIGNvbnRlbnQuCiAg ICAgLy8gSWYgbm90LCByZW1vdmUgdGhlbSwgcmVsYXlvdXQsIGFuZCByZXBhaW50LgogICAgIG1f ZnJhbWUtPnZpZXcoKS0+cmVzdG9yZVNjcm9sbGJhcigpOwotCi0gICAgZ290b0FuY2hvcigpOwor ICAgIG1fZnJhbWUtPnZpZXcoKS0+c2Nyb2xsVG9GcmFnbWVudChtX1VSTCk7CiB9CiAKIHZvaWQg RnJhbWVMb2FkZXI6OmxvYWREb25lKCkKQEAgLTEyNDMsNTQgKzEyMjQsNiBAQCBTdHJpbmcgRnJh bWVMb2FkZXI6OmVuY29kaW5nKCkgY29uc3QKICAgICByZXR1cm4gc2V0dGluZ3MgPyBzZXR0aW5n cy0+ZGVmYXVsdFRleHRFbmNvZGluZ05hbWUoKSA6IFN0cmluZygpOwogfQogCi1ib29sIEZyYW1l TG9hZGVyOjpnb3RvQW5jaG9yKGNvbnN0IFN0cmluZyYgbmFtZSkKLXsKLSAgICBBU1NFUlQobV9m cmFtZS0+ZG9jdW1lbnQoKSk7Ci0KLSAgICBpZiAoIW1fZnJhbWUtPmRvY3VtZW50KCktPmhhdmVT dHlsZXNoZWV0c0xvYWRlZCgpKSB7Ci0gICAgICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPnNldEdv dG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZCh0cnVlKTsKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIH0KLQotICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPnNldEdvdG9BbmNob3JO ZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZChmYWxzZSk7Ci0KLSAgICBFbGVtZW50KiBhbmNob3JO b2RlID0gbV9mcmFtZS0+ZG9jdW1lbnQoKS0+ZmluZEFuY2hvcihuYW1lKTsKLQotI2lmIEVOQUJM RShTVkcpCi0gICAgaWYgKG1fZnJhbWUtPmRvY3VtZW50KCktPmlzU1ZHRG9jdW1lbnQoKSkgewot ICAgICAgICBpZiAobmFtZS5zdGFydHNXaXRoKCJ4cG9pbnRlcigiKSkgewotICAgICAgICAgICAg Ly8gV2UgbmVlZCB0byBwYXJzZSB0aGUgeHBvaW50ZXIgcmVmZXJlbmNlIGhlcmUKLSAgICAgICAg fSBlbHNlIGlmIChuYW1lLnN0YXJ0c1dpdGgoInN2Z1ZpZXcoIikpIHsKLSAgICAgICAgICAgIFJl ZlB0cjxTVkdTVkdFbGVtZW50PiBzdmcgPSBzdGF0aWNfY2FzdDxTVkdEb2N1bWVudCo+KG1fZnJh bWUtPmRvY3VtZW50KCkpLT5yb290RWxlbWVudCgpOwotICAgICAgICAgICAgaWYgKCFzdmctPmN1 cnJlbnRWaWV3KCktPnBhcnNlVmlld1NwZWMobmFtZSkpCi0gICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgICAgICAgICAgc3ZnLT5zZXRVc2VDdXJyZW50Vmlldyh0cnVlKTsKLSAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGlmIChhbmNob3JOb2RlICYmIGFuY2hvck5vZGUtPmhh c1RhZ05hbWUoU1ZHTmFtZXM6OnZpZXdUYWcpKSB7Ci0gICAgICAgICAgICAgICAgUmVmUHRyPFNW R1ZpZXdFbGVtZW50PiB2aWV3RWxlbWVudCA9IGFuY2hvck5vZGUtPmhhc1RhZ05hbWUoU1ZHTmFt ZXM6OnZpZXdUYWcpID8gc3RhdGljX2Nhc3Q8U1ZHVmlld0VsZW1lbnQqPihhbmNob3JOb2RlKSA6 IDA7Ci0gICAgICAgICAgICAgICAgaWYgKHZpZXdFbGVtZW50LmdldCgpKSB7Ci0gICAgICAgICAg ICAgICAgICAgIFJlZlB0cjxTVkdTVkdFbGVtZW50PiBzdmcgPSBzdGF0aWNfY2FzdDxTVkdTVkdF bGVtZW50Kj4oU1ZHTG9jYXRhYmxlOjpuZWFyZXN0Vmlld3BvcnRFbGVtZW50KHZpZXdFbGVtZW50 LmdldCgpKSk7Ci0gICAgICAgICAgICAgICAgICAgIHN2Zy0+aW5oZXJpdFZpZXdBdHRyaWJ1dGVz KHZpZXdFbGVtZW50LmdldCgpKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0KLSAgICAgICAgLy8gRklYTUU6IG5lZWQgdG8gZGVjaWRlIHdoaWNoIDxzdmc+IHRv IGZvY3VzIG9uLCBhbmQgem9vbSB0byB0aGF0IG9uZQotICAgICAgICAvLyBGSVhNRTogbmVlZCB0 byBhY3R1YWxseSAiaGlnaGxpZ2h0IiB0aGUgdmlld1RhcmdldChzKQotICAgIH0KLSNlbmRpZgot Ci0gICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2V0Q1NTVGFyZ2V0KGFuY2hvck5vZGUpOyAvLyBT ZXR0aW5nIHRvIG51bGwgd2lsbCBjbGVhciB0aGUgY3VycmVudCB0YXJnZXQuCi0gIAotICAgIC8v IEltcGxlbWVudCB0aGUgcnVsZSB0aGF0ICIiIGFuZCAidG9wIiBib3RoIG1lYW4gdG9wIG9mIHBh Z2UgYXMgaW4gb3RoZXIgYnJvd3NlcnMuCi0gICAgaWYgKCFhbmNob3JOb2RlICYmICEobmFtZS5p c0VtcHR5KCkgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgInRvcCIpKSkKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotCi0gICAgaWYgKEZyYW1lVmlldyogdmlldyA9IG1fZnJhbWUtPnZpZXcoKSkK LSAgICAgICAgdmlldy0+bWFpbnRhaW5TY3JvbGxQb3NpdGlvbkF0QW5jaG9yKGFuY2hvck5vZGUg PyBzdGF0aWNfY2FzdDxOb2RlKj4oYW5jaG9yTm9kZSkgOiBtX2ZyYW1lLT5kb2N1bWVudCgpKTsK LQotICAgIHJldHVybiB0cnVlOwotfQotCiBib29sIEZyYW1lTG9hZGVyOjpyZXF1ZXN0T2JqZWN0 KFJlbmRlclBhcnQqIHJlbmRlcmVyLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgQXRvbWljU3Ry aW5nJiBmcmFtZU5hbWUsCiAgICAgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgVmVjdG9y PFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcykK IHsKQEAgLTE3NjYsNyArMTY5OSw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnNjcm9sbFRvQW5jaG9y KGNvbnN0IEtVUkwmIHVybCkKICAgICAvLyBJZiB3ZSB3ZXJlIGluIHRoZSBhdXRvc2Nyb2xsL3Bh blNjcm9sbCBtb2RlIHdlIHdhbnQgdG8gc3RvcCBpdCBiZWZvcmUgZm9sbG93aW5nIHRoZSBsaW5r IHRvIHRoZSBhbmNob3IKICAgICBtX2ZyYW1lLT5ldmVudEhhbmRsZXIoKS0+c3RvcEF1dG9zY3Jv bGxUaW1lcigpOwogICAgIHN0YXJ0ZWQoKTsKLSAgICBnb3RvQW5jaG9yKCk7CisgICAgaWYgKEZy YW1lVmlldyogdmlldyA9IG1fZnJhbWUtPnZpZXcoKSkKKyAgICAgICAgdmlldy0+c2Nyb2xsVG9G cmFnbWVudChtX1VSTCk7CiAKICAgICAvLyBJdCdzIGltcG9ydGFudCB0byBtb2RlbCB0aGlzIGFz IGEgbG9hZCB0aGF0IHN0YXJ0cyBhbmQgaW1tZWRpYXRlbHkgZmluaXNoZXMuCiAgICAgLy8gT3Ro ZXJ3aXNlLCB0aGUgcGFyZW50IGZyYW1lIG1heSB0aGluayB3ZSBuZXZlciBmaW5pc2hlZCBsb2Fk aW5nLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAppbmRleCA2NzVjYmExLi43NWQyMTcxIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApA QCAtNzY5LDYgKzc2OSw3MiBAQCB2b2lkIEZyYW1lVmlldzo6cmVzdG9yZVNjcm9sbGJhcigpCiAg ICAgc2V0U2Nyb2xsYmFyc1N1cHByZXNzZWQoZmFsc2UpOwogfQogCitib29sIEZyYW1lVmlldzo6 c2Nyb2xsVG9GcmFnbWVudChjb25zdCBLVVJMJiB1cmwpCit7CisgICAgLy8gSWYgb3VyIFVSTCBo YXMgbm8gcmVmLCB0aGVuIHdlIGhhdmUgbm8gcGxhY2Ugd2UgbmVlZCB0byBqdW1wIHRvLgorICAg IC8vIE9UT0ggSWYgQ1NTIHRhcmdldCB3YXMgc2V0IHByZXZpb3VzbHksIHdlIHdhbnQgdG8gc2V0 IGl0IHRvIDAsIHJlY2FsYworICAgIC8vIGFuZCBwb3NzaWJseSByZXBhaW50IGJlY2F1c2UgOnRh cmdldCBwc2V1ZG8gY2xhc3MgbWF5IGhhdmUgYmVlbgorICAgIC8vIHNldCAoc2VlIGJ1ZyAxMTMy MSkuCisgICAgaWYgKCF1cmwuaGFzRnJhZ21lbnRJZGVudGlmaWVyKCkgJiYgIW1fZnJhbWUtPmRv Y3VtZW50KCktPmNzc1RhcmdldCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBTdHJp bmcgZnJhZ21lbnRJZGVudGlmaWVyID0gbV9VUkwuZnJhZ21lbnRJZGVudGlmaWVyKCk7CisgICAg aWYgKHNjcm9sbFRvQW5jaG9yKGZyYWdtZW50SWRlbnRpZmllcikpCisgICAgICAgIHJldHVybiB0 cnVlOworCisgICAgLy8gVHJ5IGFnYWluIGFmdGVyIGRlY29kaW5nIHRoZSByZWYsIGJhc2VkIG9u IHRoZSBkb2N1bWVudCdzIGVuY29kaW5nLgorICAgIGlmIChUZXh0UmVzb3VyY2VEZWNvZGVyKiBk ZWNvZGVyID0gbV9mcmFtZS0+ZG9jdW1lbnQoKS0+ZGVjb2RlcigpKQorICAgICAgICByZXR1cm4g c2Nyb2xsVG9BbmNob3IoZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKGZyYWdtZW50SWRlbnRpZmll ciwgZGVjb2Rlci0+ZW5jb2RpbmcoKSkpOworCisgICAgcmV0dXJuIGZhbHNlOworfQorCitib29s IEZyYW1lVmlldzo6c2Nyb2xsVG9BbmNob3IoY29uc3QgU3RyaW5nJiBuYW1lKQoreworICAgIEFT U0VSVChtX2ZyYW1lLT5kb2N1bWVudCgpKTsKKworICAgIGlmICghbV9mcmFtZS0+ZG9jdW1lbnQo KS0+aGF2ZVN0eWxlc2hlZXRzTG9hZGVkKCkpIHsKKyAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQo KS0+c2V0R290b0FuY2hvck5lZWRlZEFmdGVyU3R5bGVzaGVldHNMb2FkKHRydWUpOworICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2V0R290 b0FuY2hvck5lZWRlZEFmdGVyU3R5bGVzaGVldHNMb2FkKGZhbHNlKTsKKworICAgIEVsZW1lbnQq IGFuY2hvck5vZGUgPSBtX2ZyYW1lLT5kb2N1bWVudCgpLT5maW5kQW5jaG9yKG5hbWUpOworCisj aWYgRU5BQkxFKFNWRykKKyAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKS0+aXNTVkdEb2N1bWVu dCgpKSB7CisgICAgICAgIGlmIChuYW1lLnN0YXJ0c1dpdGgoInhwb2ludGVyKCIpKSB7CisgICAg ICAgICAgICAvLyBXZSBuZWVkIHRvIHBhcnNlIHRoZSB4cG9pbnRlciByZWZlcmVuY2UgaGVyZQor ICAgICAgICB9IGVsc2UgaWYgKG5hbWUuc3RhcnRzV2l0aCgic3ZnVmlldygiKSkgeworICAgICAg ICAgICAgUmVmUHRyPFNWR1NWR0VsZW1lbnQ+IHN2ZyA9IHN0YXRpY19jYXN0PFNWR0RvY3VtZW50 Kj4obV9mcmFtZS0+ZG9jdW1lbnQoKSktPnJvb3RFbGVtZW50KCk7CisgICAgICAgICAgICBpZiAo IXN2Zy0+Y3VycmVudFZpZXcoKS0+cGFyc2VWaWV3U3BlYyhuYW1lKSkKKyAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBzdmctPnNldFVzZUN1cnJlbnRWaWV3KHRydWUp OworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaWYgKGFuY2hvck5vZGUgJiYgYW5jaG9y Tm9kZS0+aGFzVGFnTmFtZShTVkdOYW1lczo6dmlld1RhZykpIHsKKyAgICAgICAgICAgICAgICBS ZWZQdHI8U1ZHVmlld0VsZW1lbnQ+IHZpZXdFbGVtZW50ID0gYW5jaG9yTm9kZS0+aGFzVGFnTmFt ZShTVkdOYW1lczo6dmlld1RhZykgPyBzdGF0aWNfY2FzdDxTVkdWaWV3RWxlbWVudCo+KGFuY2hv ck5vZGUpIDogMDsKKyAgICAgICAgICAgICAgICBpZiAodmlld0VsZW1lbnQuZ2V0KCkpIHsKKyAg ICAgICAgICAgICAgICAgICAgUmVmUHRyPFNWR1NWR0VsZW1lbnQ+IHN2ZyA9IHN0YXRpY19jYXN0 PFNWR1NWR0VsZW1lbnQqPihTVkdMb2NhdGFibGU6Om5lYXJlc3RWaWV3cG9ydEVsZW1lbnQodmll d0VsZW1lbnQuZ2V0KCkpKTsKKyAgICAgICAgICAgICAgICAgICAgc3ZnLT5pbmhlcml0Vmlld0F0 dHJpYnV0ZXModmlld0VsZW1lbnQuZ2V0KCkpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorICAgICAgICAvLyBGSVhNRTogbmVlZCB0byBkZWNpZGUgd2hpY2gg PHN2Zz4gdG8gZm9jdXMgb24sIGFuZCB6b29tIHRvIHRoYXQgb25lCisgICAgICAgIC8vIEZJWE1F OiBuZWVkIHRvIGFjdHVhbGx5ICJoaWdobGlnaHQiIHRoZSB2aWV3VGFyZ2V0KHMpCisgICAgfQor I2VuZGlmCisKKyAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5zZXRDU1NUYXJnZXQoYW5jaG9yTm9k ZSk7IC8vIFNldHRpbmcgdG8gbnVsbCB3aWxsIGNsZWFyIHRoZSBjdXJyZW50IHRhcmdldC4KKyAg CisgICAgLy8gSW1wbGVtZW50IHRoZSBydWxlIHRoYXQgIiIgYW5kICJ0b3AiIGJvdGggbWVhbiB0 b3Agb2YgcGFnZSBhcyBpbiBvdGhlciBicm93c2Vycy4KKyAgICBpZiAoIWFuY2hvck5vZGUgJiYg IShuYW1lLmlzRW1wdHkoKSB8fCBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAidG9wIikpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBtYWludGFpblNjcm9sbFBvc2l0aW9uQXRBbmNob3Io YW5jaG9yTm9kZSA/IHN0YXRpY19jYXN0PE5vZGUqPihhbmNob3JOb2RlKSA6IG1fZnJhbWUtPmRv Y3VtZW50KCkpOworICAgIHJldHVybiB0cnVlOworfQorCiB2b2lkIEZyYW1lVmlldzo6bWFpbnRh aW5TY3JvbGxQb3NpdGlvbkF0QW5jaG9yKE5vZGUqIGFuY2hvck5vZGUpCiB7CiAgICAgbV9tYWlu dGFpblNjcm9sbFBvc2l0aW9uQW5jaG9yID0gYW5jaG9yTm9kZTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuaCBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA0Yzkw MGFlLi5hMzE2NWNjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKKysrIGIv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC01OCw4ICs1OCw2IEBAIHB1YmxpYzoKICAgICBz dGF0aWMgUGFzc1JlZlB0cjxGcmFtZVZpZXc+IGNyZWF0ZShGcmFtZSopOwogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPEZyYW1lVmlldz4gY3JlYXRlKEZyYW1lKiwgY29uc3QgSW50U2l6ZSYgaW5pdGlh bFNpemUpOwogCi0gICAgdmlydHVhbCB+RnJhbWVWaWV3KCk7Ci0KICAgICB2aXJ0dWFsIEhvc3RX aW5kb3cqIGhvc3RXaW5kb3coKSBjb25zdDsKICAgICAKICAgICB2aXJ0dWFsIHZvaWQgaW52YWxp ZGF0ZVJlY3QoY29uc3QgSW50UmVjdCYpOwpAQCAtMTgzLDYgKzE4MSw4IEBAIHB1YmxpYzoKIAog ICAgIHZvaWQgYWRqdXN0UGFnZUhlaWdodChmbG9hdCogbmV3Qm90dG9tLCBmbG9hdCBvbGRUb3As IGZsb2F0IG9sZEJvdHRvbSwgZmxvYXQgYm90dG9tTGltaXQpOwogCisgICAgYm9vbCBzY3JvbGxU b0ZyYWdtZW50KGNvbnN0IEtVUkwmKTsKKyAgICBib29sIHNjcm9sbFRvQW5jaG9yKGNvbnN0IFN0 cmluZyYpOwogICAgIHZvaWQgbWFpbnRhaW5TY3JvbGxQb3NpdGlvbkF0QW5jaG9yKE5vZGUqKTsK IAogICAgIC8vIE1ldGhvZHMgdG8gY29udmVydCBwb2ludHMgYW5kIHJlY3RzIGJldHdlZW4gdGhl IGNvb3JkaW5hdGUgc3BhY2Ugb2YgdGhlIHJlbmRlcmVyLCBhbmQgdGhpcyB2aWV3Lg== 41200 2009-10-14 19:12:24 -0700 2009-10-14 22:16:04 -0700 Patch v1 bug-30370-20091014191222.patch text/plain 10789 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzUxYTlhMy4uNzJhZTMzNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAwOS0xMC0xNCAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1vdmUgc2Nyb2xsaW5nIGNvZGUgZnJvbSBGcmFtZUxvYWRlciB0byBGcmFt ZVZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMw MzcwCisKKyAgICAgICAgVGhpcyBjb2RlIGlzIGFib3V0IGNvbnRyb2xsaW5nIHRoZSBGcmFtZSdz IHZpZXcsIG5vdCBhYm91dCBsb2FkaW5nCisgICAgICAgIHN0dWZmIGludG8gdGhlIGZyYW1lLgor CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyOjpmaW5pc2hlZFBhcnNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OnNjcm9sbFRvQW5jaG9yKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNjcm9sbFRvRnJhZ21lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVWaWV3OjpzY3JvbGxUb0FuY2hvcik6CisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuaDoKKwogMjAwOS0xMC0xNCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5Acmlt LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9yZ2UgU3RhaWtvcy4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRl eCBiMmMxNmZjLi45MGMyMmI2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK KysrIGIvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0yMzU0LDggKzIzNTQsOCBAQCB2b2lk IERvY3VtZW50OjpyZW1vdmVQZW5kaW5nU2hlZXQoKQogICAgIGlmICghbV9wZW5kaW5nU3R5bGVz aGVldHMgJiYgbV90b2tlbml6ZXIpCiAgICAgICAgIG1fdG9rZW5pemVyLT5leGVjdXRlU2NyaXB0 c1dhaXRpbmdGb3JTdHlsZXNoZWV0cygpOwogCi0gICAgaWYgKCFtX3BlbmRpbmdTdHlsZXNoZWV0 cyAmJiBtX2dvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZCAmJiBtX2ZyYW1lKQot ICAgICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+Z290b0FuY2hvcigpOworICAgIGlmICghbV9wZW5k aW5nU3R5bGVzaGVldHMgJiYgbV9nb3RvQW5jaG9yTmVlZGVkQWZ0ZXJTdHlsZXNoZWV0c0xvYWQg JiYgdmlldygpKQorICAgICAgICB2aWV3KCktPnNjcm9sbFRvRnJhZ21lbnQobV9mcmFtZS0+bG9h ZGVyKCktPnVybCgpKTsKIH0KIAogdm9pZCBEb2N1bWVudDo6dXBkYXRlU3R5bGVTZWxlY3Rvcigp CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggY2VkMTI5ZC4uYzE4MjhjYiAxMDA2NDQKLS0tIGEv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcApAQCAtMTAxOSwyNCArMTAxOSw2IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNvbW1p dEljb25VUkxUb0ljb25EYXRhYmFzZShjb25zdCBLVVJMJiBpY29uKQogICAgIGljb25EYXRhYmFz ZSgpLT5zZXRJY29uVVJMRm9yUGFnZVVSTChpY29uLnN0cmluZygpLCBvcmlnaW5hbFJlcXVlc3RV UkwoKS5zdHJpbmcoKSk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXI6OmdvdG9BbmNob3IoKQotewot ICAgIC8vIElmIG91ciBVUkwgaGFzIG5vIHJlZiwgdGhlbiB3ZSBoYXZlIG5vIHBsYWNlIHdlIG5l ZWQgdG8ganVtcCB0by4KLSAgICAvLyBPVE9IIElmIENTUyB0YXJnZXQgd2FzIHNldCBwcmV2aW91 c2x5LCB3ZSB3YW50IHRvIHNldCBpdCB0byAwLCByZWNhbGMKLSAgICAvLyBhbmQgcG9zc2libHkg cmVwYWludCBiZWNhdXNlIDp0YXJnZXQgcHNldWRvIGNsYXNzIG1heSBoYXZlIGJlZW4KLSAgICAv LyBzZXQgKHNlZSBidWcgMTEzMjEpLgotICAgIGlmICghbV9VUkwuaGFzRnJhZ21lbnRJZGVudGlm aWVyKCkgJiYgIW1fZnJhbWUtPmRvY3VtZW50KCktPmNzc1RhcmdldCgpKQotICAgICAgICByZXR1 cm47Ci0KLSAgICBTdHJpbmcgZnJhZ21lbnRJZGVudGlmaWVyID0gbV9VUkwuZnJhZ21lbnRJZGVu dGlmaWVyKCk7Ci0gICAgaWYgKGdvdG9BbmNob3IoZnJhZ21lbnRJZGVudGlmaWVyKSkKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgLy8gVHJ5IGFnYWluIGFmdGVyIGRlY29kaW5nIHRoZSByZWYsIGJh c2VkIG9uIHRoZSBkb2N1bWVudCdzIGVuY29kaW5nLgotICAgIGlmIChtX2RlY29kZXIpCi0gICAg ICAgIGdvdG9BbmNob3IoZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKGZyYWdtZW50SWRlbnRpZmll ciwgbV9kZWNvZGVyLT5lbmNvZGluZygpKSk7Ci19Ci0KIHZvaWQgRnJhbWVMb2FkZXI6OmZpbmlz aGVkUGFyc2luZygpCiB7CiAgICAgaWYgKG1fY3JlYXRpbmdJbml0aWFsRW1wdHlEb2N1bWVudCkK QEAgLTEwNTksOCArMTA0MSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmZpbmlzaGVkUGFyc2luZygp CiAgICAgLy8gQ2hlY2sgaWYgdGhlIHNjcm9sbGJhcnMgYXJlIHJlYWxseSBuZWVkZWQgZm9yIHRo ZSBjb250ZW50LgogICAgIC8vIElmIG5vdCwgcmVtb3ZlIHRoZW0sIHJlbGF5b3V0LCBhbmQgcmVw YWludC4KICAgICBtX2ZyYW1lLT52aWV3KCktPnJlc3RvcmVTY3JvbGxiYXIoKTsKLQotICAgIGdv dG9BbmNob3IoKTsKKyAgICBtX2ZyYW1lLT52aWV3KCktPnNjcm9sbFRvRnJhZ21lbnQobV9VUkwp OwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkRG9uZSgpCkBAIC0xMjQzLDU0ICsxMjI0LDYg QEAgU3RyaW5nIEZyYW1lTG9hZGVyOjplbmNvZGluZygpIGNvbnN0CiAgICAgcmV0dXJuIHNldHRp bmdzID8gc2V0dGluZ3MtPmRlZmF1bHRUZXh0RW5jb2RpbmdOYW1lKCkgOiBTdHJpbmcoKTsKIH0K IAotYm9vbCBGcmFtZUxvYWRlcjo6Z290b0FuY2hvcihjb25zdCBTdHJpbmcmIG5hbWUpCi17Ci0g ICAgQVNTRVJUKG1fZnJhbWUtPmRvY3VtZW50KCkpOwotCi0gICAgaWYgKCFtX2ZyYW1lLT5kb2N1 bWVudCgpLT5oYXZlU3R5bGVzaGVldHNMb2FkZWQoKSkgewotICAgICAgICBtX2ZyYW1lLT5kb2N1 bWVudCgpLT5zZXRHb3RvQW5jaG9yTmVlZGVkQWZ0ZXJTdHlsZXNoZWV0c0xvYWQodHJ1ZSk7Ci0g ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KLSAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5z ZXRHb3RvQW5jaG9yTmVlZGVkQWZ0ZXJTdHlsZXNoZWV0c0xvYWQoZmFsc2UpOwotCi0gICAgRWxl bWVudCogYW5jaG9yTm9kZSA9IG1fZnJhbWUtPmRvY3VtZW50KCktPmZpbmRBbmNob3IobmFtZSk7 Ci0KLSNpZiBFTkFCTEUoU1ZHKQotICAgIGlmIChtX2ZyYW1lLT5kb2N1bWVudCgpLT5pc1NWR0Rv Y3VtZW50KCkpIHsKLSAgICAgICAgaWYgKG5hbWUuc3RhcnRzV2l0aCgieHBvaW50ZXIoIikpIHsK LSAgICAgICAgICAgIC8vIFdlIG5lZWQgdG8gcGFyc2UgdGhlIHhwb2ludGVyIHJlZmVyZW5jZSBo ZXJlCi0gICAgICAgIH0gZWxzZSBpZiAobmFtZS5zdGFydHNXaXRoKCJzdmdWaWV3KCIpKSB7Ci0g ICAgICAgICAgICBSZWZQdHI8U1ZHU1ZHRWxlbWVudD4gc3ZnID0gc3RhdGljX2Nhc3Q8U1ZHRG9j dW1lbnQqPihtX2ZyYW1lLT5kb2N1bWVudCgpKS0+cm9vdEVsZW1lbnQoKTsKLSAgICAgICAgICAg IGlmICghc3ZnLT5jdXJyZW50VmlldygpLT5wYXJzZVZpZXdTcGVjKG5hbWUpKQotICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIHN2Zy0+c2V0VXNlQ3VycmVudFZpZXco dHJ1ZSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpZiAoYW5jaG9yTm9kZSAmJiBh bmNob3JOb2RlLT5oYXNUYWdOYW1lKFNWR05hbWVzOjp2aWV3VGFnKSkgewotICAgICAgICAgICAg ICAgIFJlZlB0cjxTVkdWaWV3RWxlbWVudD4gdmlld0VsZW1lbnQgPSBhbmNob3JOb2RlLT5oYXNU YWdOYW1lKFNWR05hbWVzOjp2aWV3VGFnKSA/IHN0YXRpY19jYXN0PFNWR1ZpZXdFbGVtZW50Kj4o YW5jaG9yTm9kZSkgOiAwOwotICAgICAgICAgICAgICAgIGlmICh2aWV3RWxlbWVudC5nZXQoKSkg ewotICAgICAgICAgICAgICAgICAgICBSZWZQdHI8U1ZHU1ZHRWxlbWVudD4gc3ZnID0gc3RhdGlj X2Nhc3Q8U1ZHU1ZHRWxlbWVudCo+KFNWR0xvY2F0YWJsZTo6bmVhcmVzdFZpZXdwb3J0RWxlbWVu dCh2aWV3RWxlbWVudC5nZXQoKSkpOwotICAgICAgICAgICAgICAgICAgICBzdmctPmluaGVyaXRW aWV3QXR0cmlidXRlcyh2aWV3RWxlbWVudC5nZXQoKSk7Ci0gICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIC8vIEZJWE1FOiBuZWVkIHRvIGRlY2lkZSB3 aGljaCA8c3ZnPiB0byBmb2N1cyBvbiwgYW5kIHpvb20gdG8gdGhhdCBvbmUKLSAgICAgICAgLy8g RklYTUU6IG5lZWQgdG8gYWN0dWFsbHkgImhpZ2hsaWdodCIgdGhlIHZpZXdUYXJnZXQocykKLSAg ICB9Ci0jZW5kaWYKLQotICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPnNldENTU1RhcmdldChhbmNo b3JOb2RlKTsgLy8gU2V0dGluZyB0byBudWxsIHdpbGwgY2xlYXIgdGhlIGN1cnJlbnQgdGFyZ2V0 LgotICAKLSAgICAvLyBJbXBsZW1lbnQgdGhlIHJ1bGUgdGhhdCAiIiBhbmQgInRvcCIgYm90aCBt ZWFuIHRvcCBvZiBwYWdlIGFzIGluIG90aGVyIGJyb3dzZXJzLgotICAgIGlmICghYW5jaG9yTm9k ZSAmJiAhKG5hbWUuaXNFbXB0eSgpIHx8IGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsICJ0b3AiKSkp Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBtX2Zy YW1lLT52aWV3KCkpCi0gICAgICAgIHZpZXctPm1haW50YWluU2Nyb2xsUG9zaXRpb25BdEFuY2hv cihhbmNob3JOb2RlID8gc3RhdGljX2Nhc3Q8Tm9kZSo+KGFuY2hvck5vZGUpIDogbV9mcmFtZS0+ ZG9jdW1lbnQoKSk7Ci0KLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogYm9vbCBGcmFtZUxvYWRlcjo6 cmVxdWVzdE9iamVjdChSZW5kZXJQYXJ0KiByZW5kZXJlciwgY29uc3QgU3RyaW5nJiB1cmwsIGNv bnN0IEF0b21pY1N0cmluZyYgZnJhbWVOYW1lLAogICAgIGNvbnN0IFN0cmluZyYgbWltZVR5cGUs IGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYg cGFyYW1WYWx1ZXMpCiB7CkBAIC0xNzY2LDcgKzE2OTksOCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpz Y3JvbGxUb0FuY2hvcihjb25zdCBLVVJMJiB1cmwpCiAgICAgLy8gSWYgd2Ugd2VyZSBpbiB0aGUg YXV0b3Njcm9sbC9wYW5TY3JvbGwgbW9kZSB3ZSB3YW50IHRvIHN0b3AgaXQgYmVmb3JlIGZvbGxv d2luZyB0aGUgbGluayB0byB0aGUgYW5jaG9yCiAgICAgbV9mcmFtZS0+ZXZlbnRIYW5kbGVyKCkt PnN0b3BBdXRvc2Nyb2xsVGltZXIoKTsKICAgICBzdGFydGVkKCk7Ci0gICAgZ290b0FuY2hvcigp OworICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBtX2ZyYW1lLT52aWV3KCkpCisgICAgICAgIHZp ZXctPnNjcm9sbFRvRnJhZ21lbnQobV9VUkwpOwogCiAgICAgLy8gSXQncyBpbXBvcnRhbnQgdG8g bW9kZWwgdGhpcyBhcyBhIGxvYWQgdGhhdCBzdGFydHMgYW5kIGltbWVkaWF0ZWx5IGZpbmlzaGVz LgogICAgIC8vIE90aGVyd2lzZSwgdGhlIHBhcmVudCBmcmFtZSBtYXkgdGhpbmsgd2UgbmV2ZXIg ZmluaXNoZWQgbG9hZGluZy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmggYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IDIyMzhiNzQuLjc1MDE3ZDQg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuaApAQCAtMjQ2LDggKzI0Niw2IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgdm9pZCBzZXRFbmNvZGluZyhjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBib29s IHVzZXJDaG9zZW4pOwogICAgICAgICBTdHJpbmcgZW5jb2RpbmcoKSBjb25zdDsKIAotICAgICAg ICB2b2lkIGdvdG9BbmNob3IoKTsKLQogICAgICAgICB2b2lkIHRva2VuaXplclByb2Nlc3NlZERh dGEoKTsKIAogICAgICAgICB2b2lkIGhhbmRsZWRPbmxvYWRFdmVudHMoKTsKQEAgLTQyOCw3ICs0 MjYsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgRnJhbWUqIGxvYWRTdWJmcmFt ZShIVE1MRnJhbWVPd25lckVsZW1lbnQqLCBjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5nJiBuYW1l LCBjb25zdCBTdHJpbmcmIHJlZmVycmVyKTsKIAotICAgICAgICBib29sIGdvdG9BbmNob3IoY29u c3QgU3RyaW5nJiBuYW1lKTsgLy8gcmV0dXJucyB0cnVlIGlmIHRoZSBhbmNob3Igd2FzIGZvdW5k CiAgICAgICAgIHZvaWQgc2Nyb2xsVG9BbmNob3IoY29uc3QgS1VSTCYpOwogCiAgICAgICAgIHZv aWQgcHJvdmlzaW9uYWxMb2FkU3RhcnRlZCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA2NzVjYmExLi4x OTkzNTEzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNTIsMTIgKzUyLDI0IEBACiAjaW5jbHVkZSAiUmVu ZGVyVGhlbWUuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCiAjaW5jbHVkZSAiU2V0dGluZ3Mu aCIKKyNpbmNsdWRlICJUZXh0UmVzb3VyY2VEZWNvZGVyLmgiCiAjaW5jbHVkZSA8d3RmL0N1cnJl bnRUaW1lLmg+CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAjaW5jbHVkZSAi UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgiCiAjZW5kaWYKIAorI2lmIEVOQUJMRShTVkcpCisjaW5j bHVkZSAiU1ZHRG9jdW1lbnQuaCIKKyNpbmNsdWRlICJTVkdMb2NhdGFibGUuaCIKKyNpbmNsdWRl ICJTVkdOYW1lcy5oIgorI2luY2x1ZGUgIlNWR1ByZXNlcnZlQXNwZWN0UmF0aW8uaCIKKyNpbmNs dWRlICJTVkdTVkdFbGVtZW50LmgiCisjaW5jbHVkZSAiU1ZHVmlld0VsZW1lbnQuaCIKKyNpbmNs dWRlICJTVkdWaWV3U3BlYy5oIgorI2VuZGlmCisKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1 c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwpAQCAtNzY5LDYgKzc4MSw3MiBAQCB2b2lkIEZyYW1l Vmlldzo6cmVzdG9yZVNjcm9sbGJhcigpCiAgICAgc2V0U2Nyb2xsYmFyc1N1cHByZXNzZWQoZmFs c2UpOwogfQogCitib29sIEZyYW1lVmlldzo6c2Nyb2xsVG9GcmFnbWVudChjb25zdCBLVVJMJiB1 cmwpCit7CisgICAgLy8gSWYgb3VyIFVSTCBoYXMgbm8gcmVmLCB0aGVuIHdlIGhhdmUgbm8gcGxh Y2Ugd2UgbmVlZCB0byBqdW1wIHRvLgorICAgIC8vIE9UT0ggSWYgQ1NTIHRhcmdldCB3YXMgc2V0 IHByZXZpb3VzbHksIHdlIHdhbnQgdG8gc2V0IGl0IHRvIDAsIHJlY2FsYworICAgIC8vIGFuZCBw b3NzaWJseSByZXBhaW50IGJlY2F1c2UgOnRhcmdldCBwc2V1ZG8gY2xhc3MgbWF5IGhhdmUgYmVl bgorICAgIC8vIHNldCAoc2VlIGJ1ZyAxMTMyMSkuCisgICAgaWYgKCF1cmwuaGFzRnJhZ21lbnRJ ZGVudGlmaWVyKCkgJiYgIW1fZnJhbWUtPmRvY3VtZW50KCktPmNzc1RhcmdldCgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBTdHJpbmcgZnJhZ21lbnRJZGVudGlmaWVyID0gdXJsLmZy YWdtZW50SWRlbnRpZmllcigpOworICAgIGlmIChzY3JvbGxUb0FuY2hvcihmcmFnbWVudElkZW50 aWZpZXIpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIC8vIFRyeSBhZ2FpbiBhZnRlciBk ZWNvZGluZyB0aGUgcmVmLCBiYXNlZCBvbiB0aGUgZG9jdW1lbnQncyBlbmNvZGluZy4KKyAgICBp ZiAoVGV4dFJlc291cmNlRGVjb2RlciogZGVjb2RlciA9IG1fZnJhbWUtPmRvY3VtZW50KCktPmRl Y29kZXIoKSkKKyAgICAgICAgcmV0dXJuIHNjcm9sbFRvQW5jaG9yKGRlY29kZVVSTEVzY2FwZVNl cXVlbmNlcyhmcmFnbWVudElkZW50aWZpZXIsIGRlY29kZXItPmVuY29kaW5nKCkpKTsKKworICAg IHJldHVybiBmYWxzZTsKK30KKworYm9vbCBGcmFtZVZpZXc6OnNjcm9sbFRvQW5jaG9yKGNvbnN0 IFN0cmluZyYgbmFtZSkKK3sKKyAgICBBU1NFUlQobV9mcmFtZS0+ZG9jdW1lbnQoKSk7CisKKyAg ICBpZiAoIW1fZnJhbWUtPmRvY3VtZW50KCktPmhhdmVTdHlsZXNoZWV0c0xvYWRlZCgpKSB7Cisg ICAgICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPnNldEdvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxl c2hlZXRzTG9hZCh0cnVlKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIG1f ZnJhbWUtPmRvY3VtZW50KCktPnNldEdvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9h ZChmYWxzZSk7CisKKyAgICBFbGVtZW50KiBhbmNob3JOb2RlID0gbV9mcmFtZS0+ZG9jdW1lbnQo KS0+ZmluZEFuY2hvcihuYW1lKTsKKworI2lmIEVOQUJMRShTVkcpCisgICAgaWYgKG1fZnJhbWUt PmRvY3VtZW50KCktPmlzU1ZHRG9jdW1lbnQoKSkgeworICAgICAgICBpZiAobmFtZS5zdGFydHNX aXRoKCJ4cG9pbnRlcigiKSkgeworICAgICAgICAgICAgLy8gV2UgbmVlZCB0byBwYXJzZSB0aGUg eHBvaW50ZXIgcmVmZXJlbmNlIGhlcmUKKyAgICAgICAgfSBlbHNlIGlmIChuYW1lLnN0YXJ0c1dp dGgoInN2Z1ZpZXcoIikpIHsKKyAgICAgICAgICAgIFJlZlB0cjxTVkdTVkdFbGVtZW50PiBzdmcg PSBzdGF0aWNfY2FzdDxTVkdEb2N1bWVudCo+KG1fZnJhbWUtPmRvY3VtZW50KCkpLT5yb290RWxl bWVudCgpOworICAgICAgICAgICAgaWYgKCFzdmctPmN1cnJlbnRWaWV3KCktPnBhcnNlVmlld1Nw ZWMobmFtZSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgc3Zn LT5zZXRVc2VDdXJyZW50Vmlldyh0cnVlKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAg IGlmIChhbmNob3JOb2RlICYmIGFuY2hvck5vZGUtPmhhc1RhZ05hbWUoU1ZHTmFtZXM6OnZpZXdU YWcpKSB7CisgICAgICAgICAgICAgICAgUmVmUHRyPFNWR1ZpZXdFbGVtZW50PiB2aWV3RWxlbWVu dCA9IGFuY2hvck5vZGUtPmhhc1RhZ05hbWUoU1ZHTmFtZXM6OnZpZXdUYWcpID8gc3RhdGljX2Nh c3Q8U1ZHVmlld0VsZW1lbnQqPihhbmNob3JOb2RlKSA6IDA7CisgICAgICAgICAgICAgICAgaWYg KHZpZXdFbGVtZW50LmdldCgpKSB7CisgICAgICAgICAgICAgICAgICAgIFJlZlB0cjxTVkdTVkdF bGVtZW50PiBzdmcgPSBzdGF0aWNfY2FzdDxTVkdTVkdFbGVtZW50Kj4oU1ZHTG9jYXRhYmxlOjpu ZWFyZXN0Vmlld3BvcnRFbGVtZW50KHZpZXdFbGVtZW50LmdldCgpKSk7CisgICAgICAgICAgICAg ICAgICAgIHN2Zy0+aW5oZXJpdFZpZXdBdHRyaWJ1dGVzKHZpZXdFbGVtZW50LmdldCgpKTsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgLy8gRklY TUU6IG5lZWQgdG8gZGVjaWRlIHdoaWNoIDxzdmc+IHRvIGZvY3VzIG9uLCBhbmQgem9vbSB0byB0 aGF0IG9uZQorICAgICAgICAvLyBGSVhNRTogbmVlZCB0byBhY3R1YWxseSAiaGlnaGxpZ2h0IiB0 aGUgdmlld1RhcmdldChzKQorICAgIH0KKyNlbmRpZgorCisgICAgbV9mcmFtZS0+ZG9jdW1lbnQo KS0+c2V0Q1NTVGFyZ2V0KGFuY2hvck5vZGUpOyAvLyBTZXR0aW5nIHRvIG51bGwgd2lsbCBjbGVh ciB0aGUgY3VycmVudCB0YXJnZXQuCisgIAorICAgIC8vIEltcGxlbWVudCB0aGUgcnVsZSB0aGF0 ICIiIGFuZCAidG9wIiBib3RoIG1lYW4gdG9wIG9mIHBhZ2UgYXMgaW4gb3RoZXIgYnJvd3NlcnMu CisgICAgaWYgKCFhbmNob3JOb2RlICYmICEobmFtZS5pc0VtcHR5KCkgfHwgZXF1YWxJZ25vcmlu Z0Nhc2UobmFtZSwgInRvcCIpKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgbWFpbnRh aW5TY3JvbGxQb3NpdGlvbkF0QW5jaG9yKGFuY2hvck5vZGUgPyBzdGF0aWNfY2FzdDxOb2RlKj4o YW5jaG9yTm9kZSkgOiBtX2ZyYW1lLT5kb2N1bWVudCgpKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30K Kwogdm9pZCBGcmFtZVZpZXc6Om1haW50YWluU2Nyb2xsUG9zaXRpb25BdEFuY2hvcihOb2RlKiBh bmNob3JOb2RlKQogewogICAgIG1fbWFpbnRhaW5TY3JvbGxQb3NpdGlvbkFuY2hvciA9IGFuY2hv ck5vZGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKaW5kZXggNGM5MDBhZS4uM2QxN2QyYyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMTgz LDYgKzE4Myw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWRqdXN0UGFnZUhlaWdodChmbG9hdCog bmV3Qm90dG9tLCBmbG9hdCBvbGRUb3AsIGZsb2F0IG9sZEJvdHRvbSwgZmxvYXQgYm90dG9tTGlt aXQpOwogCisgICAgYm9vbCBzY3JvbGxUb0ZyYWdtZW50KGNvbnN0IEtVUkwmKTsKKyAgICBib29s IHNjcm9sbFRvQW5jaG9yKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgbWFpbnRhaW5TY3JvbGxQ b3NpdGlvbkF0QW5jaG9yKE5vZGUqKTsKIAogICAgIC8vIE1ldGhvZHMgdG8gY29udmVydCBwb2lu dHMgYW5kIHJlY3RzIGJldHdlZW4gdGhlIGNvb3JkaW5hdGUgc3BhY2Ugb2YgdGhlIHJlbmRlcmVy LCBhbmQgdGhpcyB2aWV3Lg==