23553 2009-01-26 14:51:57 -0800 Upstream changes from jcampan to fix chromium bugs 6692 and 6694 2009-01-26 15:07:05 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd oldest_to_newest 107088 0 fishd 2009-01-26 14:51:57 -0800 Upstream changes from jcampan to fix chromium bugs 6692 and 6694 Here's the code review details: http://codereview.chromium.org/18466 And the repository revision: http://src.chromium.org/viewvc/chrome?view=rev&revision=8482 107089 1 27049 fishd 2009-01-26 14:52:51 -0800 Created attachment 27049 v1 patch 107094 2 27049 eric 2009-01-26 15:02:40 -0800 Comment on attachment 27049 v1 patch This looks fine. I would have named things differently, but making you make renaming changes just adds needless trouble for the next merge. We need to get off this silly merge branch. 107096 3 fishd 2009-01-26 15:07:05 -0800 http://trac.webkit.org/changeset/40269 I cleaned up some of the "bool value" usage in the header file and fixed a few mistypes in the comments. 27049 2009-01-26 14:52:51 -0800 2009-01-26 15:02:40 -0800 v1 patch jcampan_1.diff text/plain 8766 fishd SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQwMjY2 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDktMDEt MjYgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM1NTMKKyAgICAgICAgVXBzdHJlYW0gY2hhbmdlcyBmcm9tIGpjYW1w YW4gdG8gZml4IGNocm9taXVtIGJ1Z3MgNjY5MiBhbmQgNjY5NC4KKworICAgICAgICAqIHBsYXRm b3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBv cHVwTGlzdEJveDo6c2V0TG9vcFNlbGVjdGlvbk5hdmlnYXRpb24pOgorICAgICAgICAoV2ViQ29y ZTo6UG9wdXBMaXN0Qm94OjpQb3B1cExpc3RCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBD b250YWluZXI6OnNldExvb3BTZWxlY3Rpb25OYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlBvcHVwTGlzdEJveDo6aGFuZGxlS2V5RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBM aXN0Qm94OjpwYWludFJvdyk6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cExpc3RCb3g6OmNsZWFy U2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTGlzdEJveDo6c2VsZWN0TmV4dFJv dyk6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cExpc3RCb3g6OnNlbGVjdFByZXZpb3VzUm93KToK KyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oOgorCiAyMDA5 LTAxLTI2ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIGFi c29sdXRlQ2xpcHBlZE92ZXJmbG93UmVjdCwgbGluZXNCb3VuZGluZ0JveCBhbmQgYm9yZGVyQm91 bmRpbmdCb3ggZnJvbSBSZW5kZXJGbG93IHRvIFJlbmRlcklubGluZS4KSW5kZXg6IHBsYXRmb3Jt L2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9j aHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDQwMjY1KQorKysgcGxhdGZv cm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OSwy NyArODksMjcgQEAgcHVibGljOgogCiAgICAgLy8gUG9wdXBMaXN0Qm94IG1ldGhvZHMKIAotICAg IC8vIFNob3cgdGhlIHBvcHVwCisgICAgLy8gU2hvd3MgdGhlIHBvcHVwCiAgICAgdm9pZCBzaG93 UG9wdXAoKTsKIAotICAgIC8vIEhpZGUgdGhlIHBvcHVwLiAgRG8gbm90IGNhbGwgdGhpcyBkaXJl Y3RseTogdXNlIGNsaWVudC0+aGlkZVBvcHVwKCkuCisgICAgLy8gSGlkZXMgdGhlIHBvcHVwLiAg RG8gbm90IGNhbGwgdGhpcyBkaXJlY3RseTogdXNlIGNsaWVudC0+aGlkZVBvcHVwKCkuCiAgICAg dm9pZCBoaWRlUG9wdXAoKTsKIAotICAgIC8vIFVwZGF0ZSBvdXIgaW50ZXJuYWwgbGlzdCB0byBt YXRjaCB0aGUgY2xpZW50LgorICAgIC8vIFVwZGF0ZXMgb3VyIGludGVybmFsIGxpc3QgdG8gbWF0 Y2ggdGhlIGNsaWVudC4KICAgICB2b2lkIHVwZGF0ZUZyb21FbGVtZW50KCk7CiAKLSAgICAvLyBG cmVlIGFueSBhbGxvY2F0ZWQgcmVzb3VyY2VzIHVzZWQgaW4gYSBwYXJ0aWN1bGFyIHBvcHVwIHNl c3Npb24uIAorICAgIC8vIEZyZWVzIGFueSBhbGxvY2F0ZWQgcmVzb3VyY2VzIHVzZWQgaW4gYSBw YXJ0aWN1bGFyIHBvcHVwIHNlc3Npb24uIAogICAgIHZvaWQgY2xlYXIoKTsKIAotICAgIC8vIFNl dCB0aGUgaW5kZXggb2YgdGhlIG9wdGlvbiB0aGF0IGlzIGRpc3BsYXllZCBpbiB0aGUgPHNlbGVj dD4gd2lkZ2V0IGluIHRoZSBwYWdlCisgICAgLy8gU2V0cyB0aGUgaW5kZXggb2YgdGhlIG9wdGlv biB0aGF0IGlzIGRpc3BsYXllZCBpbiB0aGUgPHNlbGVjdD4gd2lkZ2V0IGluIHRoZSBwYWdlCiAg ICAgdm9pZCBzZXRPcmlnaW5hbEluZGV4KGludCBpbmRleCk7CiAKLSAgICAvLyBHZXQgdGhlIGlu ZGV4IG9mIHRoZSBpdGVtIHRoYXQgdGhlIHVzZXIgaXMgY3VycmVudGx5IG1vdXNlZCBvdmVyIG9y IGhhcyBzZWxlY3RlZCB3aXRoCisgICAgLy8gR2V0cyB0aGUgaW5kZXggb2YgdGhlIGl0ZW0gdGhh dCB0aGUgdXNlciBpcyBjdXJyZW50bHkgbW91c2VkIG92ZXIgb3IgaGFzIHNlbGVjdGVkIHdpdGgK ICAgICAvLyB0aGUga2V5Ym9hcmQuIFRoaXMgaXMgbm90IHRoZSBzYW1lIGFzIHRoZSBvcmlnaW5h bCBpbmRleCwgc2luY2UgdGhlIHVzZXIgaGFzIG5vdCB5ZXQKICAgICAvLyBhY2NlcHRlZCB0aGlz IGlucHV0LgogICAgIGludCBzZWxlY3RlZEluZGV4KCkgY29uc3QgeyByZXR1cm4gbV9zZWxlY3Rl ZEluZGV4OyB9CiAKLSAgICAvLyBNb3ZlIHNlbGVjdGlvbiBkb3duL3VwIHRoZSBnaXZlbiBudW1i ZXIgb2YgaXRlbXMsIHNjcm9sbGluZyBpZiBuZWNlc3NhcnkuCisgICAgLy8gTW92ZXMgc2VsZWN0 aW9uIGRvd24vdXAgdGhlIGdpdmVuIG51bWJlciBvZiBpdGVtcywgc2Nyb2xsaW5nIGlmIG5lY2Vz c2FyeS4KICAgICAvLyBQb3NpdGl2ZSBpcyBkb3duLiAgVGhlIHJlc3VsdGluZyBpbmRleCB3aWxs IGJlIGNsYW1wZWQgdG8gdGhlIHJhbmdlCiAgICAgLy8gWzAsIG51bUl0ZW1zKSwgYW5kIG5vbi1v cHRpb24gaXRlbXMgd2lsbCBiZSBza2lwcGVkLgogICAgIHZvaWQgYWRqdXN0U2VsZWN0ZWRJbmRl eChpbnQgZGVsdGEpOwpAQCAtMTE5LDcgKzExOSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0 QmFzZVdpZHRoKGludCB3aWR0aCkgeyBtX2Jhc2VXaWR0aCA9IHdpZHRoOyB9CiAKLSAgICAvLyBD b21wdXRlIHNpemUgb2Ygd2lkZ2V0IGFuZCBjaGlsZHJlbi4KKyAgICAvLyBDb21wdXRlcyB0aGUg c2l6ZSBvZiB3aWRnZXQgYW5kIGNoaWxkcmVuLgogICAgIHZvaWQgbGF5b3V0KCk7CiAKICAgICAv LyBSZXR1cm5zIHdoZXRoZXIgdGhlIHBvcHVwIHdhbnRzIHRvIHByb2Nlc3MgZXZlbnRzIGZvciB0 aGUgcGFzc2VkIGtleS4KQEAgLTEzMyw2ICsxMzMsMTIgQEAgcHVibGljOgogICAgIC8vIGFiYW5k b25uZWQuCiAgICAgdm9pZCBzZXRBY2NlcHRPbkFiYW5kb24oYm9vbCB2YWx1ZSkgeyBtX3Nob3Vs ZEFjY2VwdE9uQWJhbmRvbiA9IHZhbHVlOyB9CiAKKyAgICAvLyBTZXRzIHdoZXRoZXIgcHJlc3Np bmcgdGhlIGRvd24vdXAgYXJyb3cgd2hlbiB0aGUgbGFzdC9maXJzdCByb3cgaXMKKyAgICAvLyBz ZWxlY3RlZCBjbGVhcnMgdGhlIHNlbGVjdGlvbiBvbiB0aGUgZmlyc3Qga2V5IHByZXNzIGFuZCB0 aGVuIHNlbGVjdHMgdGhlCisgICAgLy8gZmlyc3QvbGFzdCByb3cgb24gdGhlIG5leHQga2V5IHBy ZXNzLiAgSWYgZmFsc2UsIHRoZSBzZWxlY3RlZCByb3cgc3RheXMKKyAgICAvLyB0aGUgbGFzdC9m aXJzdCByb3cuCisgICAgdm9pZCBzZXRMb29wU2VsZWN0aW9uTmF2aWdhdGlvbihib29sIHZhbHVl KSB7IG1fbG9vcFNlbGVjdGlvbk5hdmlnYXRpb24gPSB2YWx1ZTsgfQorCiBwcml2YXRlOgogICAg IGZyaWVuZCBjbGFzcyBQb3B1cENvbnRhaW5lcjsKICAgICBmcmllbmQgY2xhc3MgUmVmQ291bnRl ZDxQb3B1cExpc3RCb3g+OwpAQCAtMTYzLDYgKzE2OSw3IEBAIHByaXZhdGU6CiAgICAgICAgICwg bV9yZXBlYXRpbmdDaGFyKDApCiAgICAgICAgICwgbV9sYXN0Q2hhclRpbWUoMCkKICAgICAgICAg LCBtX3NldFRleHRPbkluZGV4Q2hhbmdlKHRydWUpCisgICAgICAgICwgbV9sb29wU2VsZWN0aW9u TmF2aWdhdGlvbihmYWxzZSkKICAgICB7CiAgICAgICAgIHNldFNjcm9sbGJhck1vZGVzKFNjcm9s bGJhckFsd2F5c09mZiwgU2Nyb2xsYmFyQWx3YXlzT2ZmKTsKICAgICB9CkBAIC0xODYsNiArMTkz LDkgQEAgcHJpdmF0ZToKICAgICAvLyBEaXNhYmxlZCBpdGVtcywgb3IgbGFiZWxzIGNhbm5vdCBi ZSBzZWxlY3RlZC4KICAgICBib29sIGlzU2VsZWN0YWJsZUl0ZW0oaW50IGluZGV4KTsKIAorICAg IC8vIENsZWFycyB0aGUgc2VsZWN0aW9uIChzbyBubyByb3cgYXBwZWFycyBzZWxlY3RlZCkuCisg ICAgdm9pZCBjbGVhclNlbGVjdGlvbigpOworCiAgICAgLy8gU2Nyb2xscyB0byByZXZlYWwgdGhl IGdpdmVuIGluZGV4LgogICAgIHZvaWQgc2Nyb2xsVG9SZXZlYWxSb3coaW50IGluZGV4KTsKICAg ICB2b2lkIHNjcm9sbFRvUmV2ZWFsU2VsZWN0aW9uKCkgeyBzY3JvbGxUb1JldmVhbFJvdyhtX3Nl bGVjdGVkSW5kZXgpOyB9CkBAIC0yMTMsNiArMjIzLDExIEBAIHByaXZhdGU6CiAgICAgLy8gUmV0 dXJucyB0aGUgZm9udCB0byB1c2UgZm9yIHRoZSBnaXZlbiByb3cKICAgICBGb250IGdldFJvd0Zv bnQoaW50IGluZGV4KTsKIAorICAgIC8vIE1vdmVzIHRoZSBzZWxlY3Rpb24gZG93bi91cCBvbmUg aXRlbSwgdGFraW5nIGNhcmUgb2YgbG9vcGluZyBiYWNrIHRvIHRoZQorICAgIC8vIGZpcnN0L2xh c3QgZWxlbWVudCBpZiBtX2xvb3BTZWxlY3Rpb25OYXZpZ2F0aW9uIGlzIHRydWUuCisgICAgdm9p ZCBzZWxlY3RQcmV2aW91c1JvdygpOworICAgIHZvaWQgc2VsZWN0TmV4dFJvdygpOworCiAgICAg Ly8gVGhpcyBpcyB0aGUgaW5kZXggb2YgdGhlIGl0ZW0gbWFya2VkIGFzICJzZWxlY3RlZCIgLSBp LmUuIGRpc3BsYXllZCBpbiB0aGUgd2lkZ2V0IG9uIHRoZQogICAgIC8vIHBhZ2UuIAogICAgIGlu dCBtX29yaWdpbmFsSW5kZXg7CkBAIC0yNjQsNiArMjc5LDggQEAgcHJpdmF0ZToKICAgICBUaW1l U3RhbXAgbV9sYXN0Q2hhclRpbWU7CiAKICAgICBib29sIG1fc2V0VGV4dE9uSW5kZXhDaGFuZ2U7 CisKKyAgICBib29sIG1fbG9vcFNlbGVjdGlvbk5hdmlnYXRpb247CiB9OwogCiBzdGF0aWMgUGxh dGZvcm1Nb3VzZUV2ZW50IGNvbnN0cnVjdFJlbGF0aXZlTW91c2VFdmVudChjb25zdCBQbGF0Zm9y bU1vdXNlRXZlbnQmIGUsCkBAIC00ODgsNiArNTA1LDExIEBAIHZvaWQgUG9wdXBDb250YWluZXI6 OnNldEFjY2VwdE9uQWJhbmRvbigKICAgICBsaXN0Qm94KCktPnNldEFjY2VwdE9uQWJhbmRvbih2 YWx1ZSk7CiB9CiAKK3ZvaWQgUG9wdXBDb250YWluZXI6OnNldExvb3BTZWxlY3Rpb25OYXZpZ2F0 aW9uKGJvb2wgdmFsdWUpCit7CisgICAgbGlzdEJveCgpLT5zZXRMb29wU2VsZWN0aW9uTmF2aWdh dGlvbih2YWx1ZSk7Cit9CisKIHZvaWQgUG9wdXBDb250YWluZXI6OnJlZnJlc2goKQogewogICAg IGxpc3RCb3goKS0+dXBkYXRlRnJvbUVsZW1lbnQoKTsKQEAgLTU5OSwxMyArNjIxLDE4IEBAIGJv b2wgUG9wdXBMaXN0Qm94OjpoYW5kbGVLZXlFdmVudChjb25zdCAKICAgICAgICAgYWJhbmRvbigp OyAgLy8gbWF5IGRlbGV0ZSB0aGlzCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIGNhc2UgVktF WV9SRVRVUk46CisgICAgICAgIGlmIChtX3NlbGVjdGVkSW5kZXggPT0gLTEpICB7CisgICAgICAg ICAgICBtX3BvcHVwQ2xpZW50LT5oaWRlUG9wdXAoKTsKKyAgICAgICAgICAgIC8vIERvbid0IGVh dCB0aGUgZW50ZXIgaWYgbm90aGluZyBpcyBzZWxlY3RlZC4KKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgfQogICAgICAgICBhY2NlcHRJbmRleChtX3NlbGVjdGVkSW5kZXgpOyAg Ly8gbWF5IGRlbGV0ZSB0aGlzCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIGNhc2UgVktFWV9V UDoKLSAgICAgICAgYWRqdXN0U2VsZWN0ZWRJbmRleCgtMSk7CisgICAgICAgIHNlbGVjdFByZXZp b3VzUm93KCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVktFWV9ET1dOOgotICAgICAgICBh ZGp1c3RTZWxlY3RlZEluZGV4KDEpOworICAgICAgICBzZWxlY3ROZXh0Um93KCk7CiAgICAgICAg IGJyZWFrOwogICAgIGNhc2UgVktFWV9QUklPUjoKICAgICAgICAgYWRqdXN0U2VsZWN0ZWRJbmRl eCgtbV92aXNpYmxlUm93cyk7CkBAIC03ODgsOSArODE1LDYgQEAgdm9pZCBQb3B1cExpc3RCb3g6 OnBhaW50Um93KEdyYXBoaWNzQ29udAogICAgIAogICAgIGdjLT5zZXRGaWxsQ29sb3IodGV4dENv bG9yKTsKIAotICAgIEZvbnQgaXRlbUZvbnQgPSBnZXRSb3dGb250KHJvd0luZGV4KTsKLSAgICBn Yy0+c2V0Rm9udChpdGVtRm9udCk7Ci0KICAgICAvLyBCdW5jaCBvZiBzaGl0IHRvIGRlYWwgd2l0 aCBSVEwgdGV4dC4uLgogICAgIFN0cmluZyBpdGVtVGV4dCA9IG1fcG9wdXBDbGllbnQtPml0ZW1U ZXh0KHJvd0luZGV4KTsKICAgICB1bnNpZ25lZCBsZW5ndGggPSBpdGVtVGV4dC5sZW5ndGgoKTsK QEAgLTgwMyw5ICs4MjcsMTAgQEAgdm9pZCBQb3B1cExpc3RCb3g6OnBhaW50Um93KEdyYXBoaWNz Q29udAogCiAgICAgLy8gRHJhdyB0aGUgaXRlbSB0ZXh0CiAgICAgaWYgKHN0eWxlLmlzVmlzaWJs ZSgpKSB7CisgICAgICAgIEZvbnQgaXRlbUZvbnQgPSBnZXRSb3dGb250KHJvd0luZGV4KTsKICAg ICAgICAgaW50IHRleHRYID0gbWF4KDAsIG1fcG9wdXBDbGllbnQtPmNsaWVudFBhZGRpbmdMZWZ0 KCkgLSBtX3BvcHVwQ2xpZW50LT5jbGllbnRJbnNldExlZnQoKSk7CiAgICAgICAgIGludCB0ZXh0 WSA9IHJvd1JlY3QueSgpICsgaXRlbUZvbnQuYXNjZW50KCkgKyAocm93UmVjdC5oZWlnaHQoKSAt IGl0ZW1Gb250LmhlaWdodCgpKSAvIDI7Ci0gICAgICAgIGdjLT5kcmF3QmlkaVRleHQodGV4dFJ1 biwgSW50UG9pbnQodGV4dFgsIHRleHRZKSk7CisgICAgICAgIGdjLT5kcmF3QmlkaVRleHQoaXRl bUZvbnQsIHRleHRSdW4sIEludFBvaW50KHRleHRYLCB0ZXh0WSkpOwogICAgIH0KIH0KIApAQCAt OTM4LDYgKzk2Myw0MyBAQCBib29sIFBvcHVwTGlzdEJveDo6aXNTZWxlY3RhYmxlSXRlbShpbnQg CiAgICAgcmV0dXJuIG1faXRlbXNbaW5kZXhdLT50eXBlID09IFR5cGVPcHRpb24gJiYgbV9wb3B1 cENsaWVudC0+aXRlbUlzRW5hYmxlZChpbmRleCk7CiB9CiAKK3ZvaWQgUG9wdXBMaXN0Qm94Ojpj bGVhclNlbGVjdGlvbigpCit7CisgICAgaWYgKG1fc2VsZWN0ZWRJbmRleCAhPSAtMSkgeworICAg ICAgICBpbnZhbGlkYXRlUm93KG1fc2VsZWN0ZWRJbmRleCk7CisgICAgICAgIG1fc2VsZWN0ZWRJ bmRleCA9IC0xOworICAgIH0KK30KKwordm9pZCBQb3B1cExpc3RCb3g6OnNlbGVjdE5leHRSb3co KQoreworICAgIGlmICghbV9sb29wU2VsZWN0aW9uTmF2aWdhdGlvbiB8fCBtX3NlbGVjdGVkSW5k ZXggIT0gbnVtSXRlbXMoKSAtIDEpIHsKKyAgICAgICAgYWRqdXN0U2VsZWN0ZWRJbmRleCgxKTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIC8vIFdlIGFyZSBtb3ZpbmcgcGFzdCB0aGUg bGFzdCBpdGVtLCBubyByb3cgc2hvdWxkIGJlIHNlbGVjdGVkLgorICAgIGNsZWFyU2VsZWN0aW9u KCk7Cit9CisKK3ZvaWQgUG9wdXBMaXN0Qm94OjpzZWxlY3RQcmV2aW91c1JvdygpCit7CisgICAg aWYgKCFtX2xvb3BTZWxlY3Rpb25OYXZpZ2F0aW9uIHx8IG1fc2VsZWN0ZWRJbmRleCA+IDApIHsK KyAgICAgICAgYWRqdXN0U2VsZWN0ZWRJbmRleCgtMSk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICBpZiAobV9zZWxlY3RlZEluZGV4ID09IDApIHsKKyAgICAgICAgLy8gV2UgYXJlIG1v dmluZyBwYXN0IHRoZSBmaXJzdCBpdGVtLCBjbGVhciB0aGUgc2VsZWN0aW9uLgorICAgICAgICBj bGVhclNlbGVjdGlvbigpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gTm8gcm93 IGFyZSBzZWxlY3RlZCwganVtcCB0byB0aGUgbGFzdCBpdGVtLgorICAgIHNlbGVjdEluZGV4KG51 bUl0ZW1zKCkgLSAxKTsKKyAgICBzY3JvbGxUb1JldmVhbFNlbGVjdGlvbigpOworfQorCiB2b2lk IFBvcHVwTGlzdEJveDo6YWRqdXN0U2VsZWN0ZWRJbmRleChpbnQgZGVsdGEpCiB7CiAgICAgaW50 IHRhcmdldEluZGV4ID0gbV9zZWxlY3RlZEluZGV4ICsgZGVsdGE7CkluZGV4OiBwbGF0Zm9ybS9j aHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRmb3JtL2Nocm9t aXVtL1BvcHVwTWVudUNocm9taXVtLmgJKHJldmlzaW9uIDQwMjY1KQorKysgcGxhdGZvcm0vY2hy b21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaAkod29ya2luZyBjb3B5KQpAQCAtOTUsNiArOTUsMTIg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyByZWdhcmRsZXNzIG9mIHRoaXMgc2V0 dGluZy4KICAgICAgICAgdm9pZCBzZXRBY2NlcHRPbkFiYW5kb24oYm9vbCB2YWx1ZSk7CiAKKyAg ICAgICAgLy8gU2V0cyB3aGV0aGVyIHRoZSB3ZSBzaG91bGQgbW92ZSB0aGUgc2VsZWN0aW9uIHRv IHRoZSBmaXJzdC9sYXN0IGl0ZW0KKyAgICAgICAgLy8gd2hlbiB0aGUgdXNlciBwcmVzc2VzIGRv d24vdXAgYXJyb3cga2V5cyBhbmQgdGhlIGxhc3QvZmlyc3QgaXRlbSBpcworICAgICAgICAvLyBz ZWxlY3RlZC4KKyAgICAgICAgLy8gRGVmYXVsdCBpcyBmYWxzZSwgY2F1c2luZyB0aGUgZmlyc3Qv bGFzdCBpdGVtIHRvIHN0YXkgc2VsZWN0ZWQuCisgICAgICAgIHZvaWQgc2V0TG9vcFNlbGVjdGlv bk5hdmlnYXRpb24oYm9vbCB2YWx1ZSk7CisKICAgICAgICAgUG9wdXBMaXN0Qm94KiBsaXN0Qm94 KCkgY29uc3QgeyByZXR1cm4gbV9saXN0Qm94LmdldCgpOyB9CiAKICAgICAgICAgLy8gUmVmcmVz aCB0aGUgcG9wdXAgdmFsdWVzIGZyb20gdGhlIFBvcHVwTWVudUNsaWVudC4K