53937 2011-02-07 13:05:11 -0800 Some content is not covered by Find-on-page overlay 2011-02-07 13:42:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 346749 0 andersca 2011-02-07 13:05:11 -0800 Some content is not covered by Find-on-page overlay 346754 1 81513 andersca 2011-02-07 13:10:59 -0800 Created attachment 81513 Patch 346775 2 andersca 2011-02-07 13:42:12 -0800 Committed r77842: <http://trac.webkit.org/changeset/77842> 81513 2011-02-07 13:10:59 -0800 2011-02-07 13:38:40 -0800 Patch bug-53937-20110207131102.patch text/plain 11431 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3ODM3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNjcgQEAKKzIwMTEtMDItMDcgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIGNvbnRlbnQgaXMgbm90IGNvdmVyZWQgYnkgRmlu ZC1vbi1wYWdlIG92ZXJsYXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUzOTM3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NzExMzUzPgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6ZGlkSW5zdGFsbFBhZ2VPdmVybGF5KToKKyAgICAgICAg Q2FsbCBMYXllclRyZWVIb3N0OjpkaWRJbnN0YWxsUGFnZU92ZXJsYXkuCisKKyAgICAgICAgKFdl YktpdDo6RHJhd2luZ0FyZWFJbXBsOjpkaWRVbmluc3RhbGxQYWdlT3ZlcmxheSk6CisgICAgICAg IENhbGwgTGF5ZXJUcmVlSG9zdDo6ZGlkVW5pbnN0YWxsUGFnZU92ZXJsYXkuCisKKyAgICAgICAg KFdlYktpdDo6RHJhd2luZ0FyZWFJbXBsOjpzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheSk6Cisg ICAgICAgIENhbGwgTGF5ZXJUcmVlSG9zdDo6c2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6ZHJhd1JlY3QpOgorICAgICAgICBSZW1vdmUgYSBi b2d1cyBhc3NlcnRpb24uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVl SG9zdC5oOgorICAgICAgICBBZGQgbmV3IHB1cmUgdmlydHVhbCBtZW1iZXIgZnVuY3Rpb25zLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6UGFnZU92ZXJsYXk6OnNldE5lZWRzRGlzcGxheSk6CisgICAgICAgIENhbGwgRHJh d2luZ0FyZWE6OnNldFBhZ2VPdmVybGF5TmVlZHNEaXNwbGF5LgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjppbnN0 YWxsUGFnZU92ZXJsYXkpOgorICAgICAgICBNYWtlIHN1cmUgdG8gY2FsbCBQYWdlT3ZlcmxheTo6 c2V0TmVlZHNEaXNwbGF5IGFmdGVyIHRoZSBwYWdlIG92ZXJsYXkgaGFzIGJlZW4gaW5zdGFsbGVk LgorICAgIAorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1h Yy5tbToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdE1hYzo6TGF5ZXJUcmVlSG9zdE1h Yyk6CisgICAgICAgIENyZWF0ZSB0aGUgcGFnZSBvdmVybGF5IGxheWVyIGlmIG5lZWRlZC4KKwor ICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0TWFjOjpzZXROb25Db21wb3NpdGVkQ29udGVu dHNOZWVkRGlzcGxheSk6CisgICAgICAgIEludmFsaWRhdGUgdGhlIHBhZ2Ugb3ZlcmxheSBsYXll ciBhcyB3ZWxsLgorCisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RNYWM6OnNpemVEaWRD aGFuZ2UpOgorICAgICAgICBSZXNpemUgdGhlIHBhZ2Ugb3ZlcmxheSBsYXllci4KKworICAgICAg ICAoV2ViS2l0OjpMYXllclRyZWVIb3N0TWFjOjpkaWRJbnN0YWxsUGFnZU92ZXJsYXkpOgorICAg ICAgICBDcmVhdGUgdGhlIHBhZ2Ugb3ZlcmxheSBsYXllci4KKworICAgICAgICAoV2ViS2l0OjpM YXllclRyZWVIb3N0TWFjOjpkaWRVbmluc3RhbGxQYWdlT3ZlcmxheSk6CisgICAgICAgIERlc3Ry b3kgdGhlIHBhZ2Ugb3ZlcmxheSBsYXllci4KKworICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVI b3N0TWFjOjpzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheSk6CisgICAgICAgIENhbGwgc2V0TmVl ZHNEaXNwbGF5IG9uIHRoZSBwYWdlIG92ZXJsYXkgbGF5ZXIuCisKKyAgICAgICAgKFdlYktpdDo6 TGF5ZXJUcmVlSG9zdE1hYzo6cGFpbnRDb250ZW50cyk6CisgICAgICAgIEhhbmRsZSBwYWludGlu ZyB0aGUgcGFnZSBvdmVybGF5IGxheWVyLgorCisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhv c3RNYWM6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6CisgICAgICAgIEZsdXNoIHRoZSBwYWdl IG92ZXJsYXkgbGF5ZXIgY2hhbmdlcyBhcyB3ZWxsLgorCisgICAgICAgIChXZWJLaXQ6OkxheWVy VHJlZUhvc3RNYWM6OmNyZWF0ZVBhZ2VPdmVybGF5TGF5ZXIpOgorICAgICAgICBDcmVhdGUgYSBs YXllciBhbmQgYWRkIGl0IGFzIGEgc3VibGF5ZXIgb2YgdGhlIHJvb3QgbGF5ZXIuCisKKyAgICAg ICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdE1hYzo6ZGVzdHJveVBhZ2VPdmVybGF5TGF5ZXIpOgor ICAgICAgICBEZXN0cm95IHRoZSBwYWdlIG92ZXJsYXkgbGF5ZXIuCisKIDIwMTEtMDItMDcgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYW4gQmVybnN0ZWluLgpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L0RyYXdpbmdBcmVhSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAJKHJldmlzaW9uIDc3ODM3KQorKysgU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE0MiwxNSArMTQyLDI1IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpmb3Jj ZVJlcGFpbnQoKQogCiB2b2lkIERyYXdpbmdBcmVhSW1wbDo6ZGlkSW5zdGFsbFBhZ2VPdmVybGF5 KCkKIHsKKyAgICBpZiAobV9sYXllclRyZWVIb3N0KQorICAgICAgICBtX2xheWVyVHJlZUhvc3Qt PmRpZEluc3RhbGxQYWdlT3ZlcmxheSgpOwogfQogCiB2b2lkIERyYXdpbmdBcmVhSW1wbDo6ZGlk VW5pbnN0YWxsUGFnZU92ZXJsYXkoKQogeworICAgIGlmIChtX2xheWVyVHJlZUhvc3QpCisgICAg ICAgIG1fbGF5ZXJUcmVlSG9zdC0+ZGlkVW5pbnN0YWxsUGFnZU92ZXJsYXkoKTsKKwogICAgIHNl dE5lZWRzRGlzcGxheShtX3dlYlBhZ2UtPmJvdW5kcygpKTsKIH0KIAogdm9pZCBEcmF3aW5nQXJl YUltcGw6OnNldFBhZ2VPdmVybGF5TmVlZHNEaXNwbGF5KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7 CisgICAgaWYgKG1fbGF5ZXJUcmVlSG9zdCkgeworICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNl dFBhZ2VPdmVybGF5TmVlZHNEaXNwbGF5KHJlY3QpOworICAgICAgICByZXR1cm47CisgICAgfQor CiAgICAgc2V0TmVlZHNEaXNwbGF5KHJlY3QpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAJKHJldmlzaW9u IDc3ODIxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9s bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYzLDcgKzI2Myw2IEBAIHN0YXRpYyBDb2xvciBv dmVybGF5QmFja2dyb3VuZENvbG9yKCkKIHZvaWQgRmluZENvbnRyb2xsZXI6OmRyYXdSZWN0KFBh Z2VPdmVybGF5KiwgR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIGNvbnN0IEludFJl Y3QmIGRpcnR5UmVjdCkKIHsKICAgICBWZWN0b3I8SW50UmVjdD4gcmVjdHMgPSByZWN0c0ZvclRl eHRNYXRjaGVzKCk7Ci0gICAgQVNTRVJUKCFyZWN0cy5pc0VtcHR5KCkpOwogCiAgICAgLy8gRHJh dyB0aGUgYmFja2dyb3VuZC4KICAgICBncmFwaGljc0NvbnRleHQuZmlsbFJlY3QoZGlydHlSZWN0 LCBvdmVybGF5QmFja2dyb3VuZENvbG9yKCksIENvbG9yU3BhY2VTUkdCKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaAkocmV2 aXNpb24gNzc4MzcpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJU cmVlSG9zdC5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1MiwxMSBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIHNldE5vbkNvbXBvc2l0ZWRDb250ZW50c05lZWREaXNwbGF5KGNvbnN0IFdl YkNvcmU6OkludFJlY3QmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbE5vbkNvbXBvc2l0 ZWRDb250ZW50cyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBXZWJD b3JlOjpJbnRTaXplJiBzY3JvbGxPZmZzZXQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2l6ZURp ZENoYW5nZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBuZXdTaXplKSA9IDA7Ci0gICAgCisKKyAg ICB2aXJ0dWFsIHZvaWQgZGlkSW5zdGFsbFBhZ2VPdmVybGF5KCkgPSAwOworICAgIHZpcnR1YWwg dm9pZCBkaWRVbmluc3RhbGxQYWdlT3ZlcmxheSgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0 UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpID0gMDsKKwog cHJvdGVjdGVkOgogICAgIGV4cGxpY2l0IExheWVyVHJlZUhvc3QoV2ViUGFnZSopOwogCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5j cHAJKHJldmlzaW9uIDc3ODI1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1BhZ2VPdmVybGF5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzUsMTAgKzc1LDEwIEBAIHZvaWQg UGFnZU92ZXJsYXk6OnNldFBhZ2UoV2ViUGFnZSogd2ViUGEKICAgICBtX2NsaWVudC0+ZGlkTW92 ZVRvV2ViUGFnZSh0aGlzLCB3ZWJQYWdlKTsKIH0KIAotdm9pZCBQYWdlT3ZlcmxheTo6c2V0TmVl ZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGRpcnR5UmVjdCkKK3ZvaWQgUGFnZU92 ZXJsYXk6OnNldE5lZWRzRGlzcGxheShjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiB7CiAgICAg aWYgKG1fd2ViUGFnZSkKLSAgICAgICAgbV93ZWJQYWdlLT5kcmF3aW5nQXJlYSgpLT5zZXROZWVk c0Rpc3BsYXkoZGlydHlSZWN0KTsKKyAgICAgICAgbV93ZWJQYWdlLT5kcmF3aW5nQXJlYSgpLT5z ZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheShkaXJ0eVJlY3QpOwogfQogCiB2b2lkIFBhZ2VPdmVy bGF5OjpzZXROZWVkc0Rpc3BsYXkoKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gNzc4MjkpCisrKyBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY5Nyw5 ICs2OTcsMTAgQEAgdm9pZCBXZWJQYWdlOjppbnN0YWxsUGFnZU92ZXJsYXkoUGFzc1JlZgogCiAg ICAgbV9wYWdlT3ZlcmxheSA9IHBhZ2VPdmVybGF5OwogICAgIG1fcGFnZU92ZXJsYXktPnNldFBh Z2UodGhpcyk7Ci0gICAgbV9wYWdlT3ZlcmxheS0+c2V0TmVlZHNEaXNwbGF5KCk7CiAKICAgICBt X2RyYXdpbmdBcmVhLT5kaWRJbnN0YWxsUGFnZU92ZXJsYXkoKTsKKworICAgIG1fcGFnZU92ZXJs YXktPnNldE5lZWRzRGlzcGxheSgpOwogfQogCiB2b2lkIFdlYlBhZ2U6OnVuaW5zdGFsbFBhZ2VP dmVybGF5KFBhZ2VPdmVybGF5KiBwYWdlT3ZlcmxheSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5oCShy ZXZpc2lvbiA3NzgzNykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMv TGF5ZXJUcmVlSG9zdE1hYy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Myw2ICs1MywxMCBAQCBwcml2 YXRlOgogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxOb25Db21wb3NpdGVkQ29udGVudHMoY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Ny b2xsT2Zmc2V0KTsKICAgICB2aXJ0dWFsIHZvaWQgc2l6ZURpZENoYW5nZShjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiBuZXdTaXplKTsKIAorICAgIHZpcnR1YWwgdm9pZCBkaWRJbnN0YWxsUGFnZU92 ZXJsYXkoKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkVW5pbnN0YWxsUGFnZU92ZXJsYXkoKTsKKyAg ICB2aXJ0dWFsIHZvaWQgc2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYpOworCiAgICAgLy8gR3JhcGhpY3NMYXllckNsaWVudAogICAgIHZpcnR1YWwgdm9p ZCBub3RpZnlBbmltYXRpb25TdGFydGVkKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqLCBk b3VibGUgdGltZSk7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeVN5bmNSZXF1aXJlZChjb25zdCBX ZWJDb3JlOjpHcmFwaGljc0xheWVyKik7CkBAIC02NCw2ICs2OCw5IEBAIHByaXZhdGU6CiAgICAg dm9pZCBmbHVzaFBlbmRpbmdMYXllckNoYW5nZXNSdW5Mb29wT2JzZXJ2ZXJDYWxsYmFjaygpOwog ICAgIGJvb2wgZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7CiAKKyAgICB2b2lkIGNyZWF0ZVBh Z2VPdmVybGF5TGF5ZXIoKTsKKyAgICB2b2lkIGRlc3Ryb3lQYWdlT3ZlcmxheUxheWVyKCk7CisK ICAgICAvLyBUaGUgY29udGV4dCBmb3IgdGhpcyBsYXllciB0cmVlLgogICAgIExheWVyVHJlZUNv bnRleHQgbV9sYXllclRyZWVDb250ZXh0OwogCkBAIC03Niw2ICs4Myw5IEBAIHByaXZhdGU6CiAg ICAgLy8gVGhlIGxheWVyIHdoaWNoIGNvbnRhaW5zIGFsbCBub24tY29tcG9zaXRlZCBjb250ZW50 LgogICAgIE93blB0cjxXZWJDb3JlOjpHcmFwaGljc0xheWVyPiBtX25vbkNvbXBvc2l0ZWRDb250 ZW50TGF5ZXI7CiAKKyAgICAvLyBUaGUgcGFnZSBvdmVybGF5IGxheWVyLiBXaWxsIGJlIG51bGwg aWYgdGhlcmUncyBubyBwYWdlIG92ZXJsYXkuCisgICAgT3duUHRyPFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXI+IG1fcGFnZU92ZXJsYXlMYXllcjsKKwogICAgIFJldGFpblB0cjxXS0NBUmVtb3RlTGF5 ZXJDbGllbnRSZWY+IG1fcmVtb3RlTGF5ZXJDbGllbnQ7CiAgICAgUmV0YWluUHRyPENGUnVuTG9v cE9ic2VydmVyUmVmPiBtX2ZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlc1J1bkxvb3BPYnNlcnZlcjsK IH07CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJl ZUhvc3RNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9MYXllclRyZWVIb3N0TWFjLm1tCShyZXZpc2lvbiA3NzgzNykKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtODAsNiArODAsOSBAQCBMYXllclRyZWVIb3N0TWFjOjpMYXllclRyZWVIb3N0 TWFjKFdlYlBhCiAgICAgCiAgICAgV0tDQVJlbW90ZUxheWVyQ2xpZW50U2V0TGF5ZXIobV9yZW1v dGVMYXllckNsaWVudC5nZXQoKSwgbV9yb290TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7CiAKKyAg ICBpZiAobV93ZWJQYWdlLT5oYXNQYWdlT3ZlcmxheSgpKQorICAgICAgICBjcmVhdGVQYWdlT3Zl cmxheUxheWVyKCk7CisKICAgICBzY2hlZHVsZUxheWVyRmx1c2goKTsKIAogICAgIG1fbGF5ZXJU cmVlQ29udGV4dC5jb250ZXh0SUQgPSBXS0NBUmVtb3RlTGF5ZXJDbGllbnRHZXRDbGllbnRJZCht X3JlbW90ZUxheWVyQ2xpZW50LmdldCgpKTsKQEAgLTEzNCw2ICsxMzcsOSBAQCB2b2lkIExheWVy VHJlZUhvc3RNYWM6OmludmFsaWRhdGUoKQogdm9pZCBMYXllclRyZWVIb3N0TWFjOjpzZXROb25D b21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheShjb25zdCBJbnRSZWN0JiByZWN0KQogewogICAg IG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KHJlY3Qp OworICAgIGlmIChtX3BhZ2VPdmVybGF5TGF5ZXIpCisgICAgICAgIG1fcGFnZU92ZXJsYXlMYXll ci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KHJlY3QpOworCiAgICAgc2NoZWR1bGVMYXllckZsdXNo KCk7CiB9CiAKQEAgLTE0Nyw2ICsxNTMsOSBAQCB2b2lkIExheWVyVHJlZUhvc3RNYWM6OnNpemVE aWRDaGFuZ2UoY29uCiAgICAgbV9yb290TGF5ZXItPnNldFNpemUobmV3U2l6ZSk7CiAgICAgbV9u b25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXRTaXplKG5ld1NpemUpOwogCisgICAgaWYgKG1f cGFnZU92ZXJsYXlMYXllcikKKyAgICAgICAgbV9wYWdlT3ZlcmxheUxheWVyLT5zZXRTaXplKG5l d1NpemUpOworCiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiAgICAgZmx1c2hQZW5kaW5nTGF5 ZXJDaGFuZ2VzKCk7CiAKQEAgLTE1NCw2ICsxNjMsMjUgQEAgdm9pZCBMYXllclRyZWVIb3N0TWFj OjpzaXplRGlkQ2hhbmdlKGNvbgogICAgIFtDQVRyYW5zYWN0aW9uIHN5bmNocm9uaXplXTsKIH0K IAordm9pZCBMYXllclRyZWVIb3N0TWFjOjpkaWRJbnN0YWxsUGFnZU92ZXJsYXkoKQoreworICAg IGNyZWF0ZVBhZ2VPdmVybGF5TGF5ZXIoKTsKKyAgICBzY2hlZHVsZUxheWVyRmx1c2goKTsKK30K Kwordm9pZCBMYXllclRyZWVIb3N0TWFjOjpkaWRVbmluc3RhbGxQYWdlT3ZlcmxheSgpCit7Cisg ICAgZGVzdHJveVBhZ2VPdmVybGF5TGF5ZXIoKTsKKyAgICBzY2hlZHVsZUxheWVyRmx1c2goKTsK K30KKwordm9pZCBMYXllclRyZWVIb3N0TWFjOjpzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheShj b25zdCBJbnRSZWN0JiByZWN0KQoreworICAgIEFTU0VSVChtX3BhZ2VPdmVybGF5TGF5ZXIpOwor ICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KHJlY3QpOworICAg IHNjaGVkdWxlTGF5ZXJGbHVzaCgpOworfQorCiB2b2lkIExheWVyVHJlZUhvc3RNYWM6Om5vdGlm eUFuaW1hdGlvblN0YXJ0ZWQoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciosIGRvdWJsZSB0 aW1lKQogewogfQpAQCAtMTY0LDggKzE5MiwxNSBAQCB2b2lkIExheWVyVHJlZUhvc3RNYWM6Om5v dGlmeVN5bmNSZXF1aXJlCiAKIHZvaWQgTGF5ZXJUcmVlSG9zdE1hYzo6cGFpbnRDb250ZW50cyhj b25zdCBHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVyLCBHcmFwaGljc0NvbnRleHQmIGdyYXBo aWNzQ29udGV4dCwgR3JhcGhpY3NMYXllclBhaW50aW5nUGhhc2UsIGNvbnN0IEludFJlY3QmIGNs aXBSZWN0KQogewotICAgIEFTU0VSVChncmFwaGljc0xheWVyID09IG1fbm9uQ29tcG9zaXRlZENv bnRlbnRMYXllcik7Ci0gICAgbV93ZWJQYWdlLT5kcmF3UmVjdChncmFwaGljc0NvbnRleHQsIGNs aXBSZWN0KTsKKyAgICBpZiAoZ3JhcGhpY3NMYXllciA9PSBtX25vbkNvbXBvc2l0ZWRDb250ZW50 TGF5ZXIpIHsKKyAgICAgICAgbV93ZWJQYWdlLT5kcmF3UmVjdChncmFwaGljc0NvbnRleHQsIGNs aXBSZWN0KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChncmFwaGljc0xheWVy ID09IG1fcGFnZU92ZXJsYXlMYXllcikgeworICAgICAgICBtX3dlYlBhZ2UtPmRyYXdQYWdlT3Zl cmxheShncmFwaGljc0NvbnRleHQsIGNsaXBSZWN0KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K IH0KIAogYm9vbCBMYXllclRyZWVIb3N0TWFjOjpzaG93RGVidWdCb3JkZXJzKCkgY29uc3QKQEAg LTIwNiw5ICsyNDEsMzIgQEAgYm9vbCBMYXllclRyZWVIb3N0TWFjOjpmbHVzaFBlbmRpbmdMYXll cgogewogICAgIG1fcm9vdExheWVyLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9u bHkoKTsKICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnN5bmNDb21wb3NpdGluZ1N0 YXRlRm9yVGhpc0xheWVyT25seSgpOworICAgIGlmIChtX3BhZ2VPdmVybGF5TGF5ZXIpCisgICAg ICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJP bmx5KCk7CiAKICAgICByZXR1cm4gbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKS0+ dmlldygpLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOwogfQogCi0g ICAgCit2b2lkIExheWVyVHJlZUhvc3RNYWM6OmNyZWF0ZVBhZ2VPdmVybGF5TGF5ZXIoKQorewor ICAgIEFTU0VSVCghbV9wYWdlT3ZlcmxheUxheWVyKTsKKworICAgIG1fcGFnZU92ZXJsYXlMYXll ciA9IEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZSh0aGlzKTsKKyNpZm5kZWYgTkRFQlVHCisgICAgbV9w YWdlT3ZlcmxheUxheWVyLT5zZXROYW1lKCJMYXllclRyZWVIb3N0IHBhZ2Ugb3ZlcmxheSBjb250 ZW50Iik7CisjZW5kaWYKKworICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0RHJhd3NDb250ZW50 KHRydWUpOworICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0U2l6ZShtX3dlYlBhZ2UtPnNpemUo KSk7CisKKyAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQobV9wYWdlT3ZlcmxheUxheWVyLmdldCgp KTsKK30KKwordm9pZCBMYXllclRyZWVIb3N0TWFjOjpkZXN0cm95UGFnZU92ZXJsYXlMYXllcigp Cit7CisgICAgQVNTRVJUKG1fcGFnZU92ZXJsYXlMYXllcik7CisgICAgbV9wYWdlT3ZlcmxheUxh eWVyLT5yZW1vdmVGcm9tUGFyZW50KCk7CisgICAgbV9wYWdlT3ZlcmxheUxheWVyID0gbnVsbHB0 cjsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==