116057 2013-05-13 13:40:03 -0700 [Mac] update in-band caption attributes 2013-05-13 22:41:35 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson commit-queue dino esprehn+autocc jer.noble oldest_to_newest 888500 0 eric.carlson 2013-05-13 13:40:03 -0700 Update. 888667 1 201670 eric.carlson 2013-05-13 20:09:06 -0700 Created attachment 201670 Proposed patch 888701 2 201670 commit-queue 2013-05-13 22:41:33 -0700 Comment on attachment 201670 Proposed patch Clearing flags on attachment: 201670 Committed r150055: <http://trac.webkit.org/changeset/150055> 888702 3 commit-queue 2013-05-13 22:41:35 -0700 All reviewed patches have been landed. Closing bug. 201670 2013-05-13 20:09:06 -0700 2013-05-13 22:41:33 -0700 Proposed patch patch_3.txt text/plain 8519 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDA1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA1LTEzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIHVwZGF0ZSBp bi1iYW5kIGNhcHRpb24gYXR0cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MDU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBodG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0VHJhY2s6OnVwZGF0ZUN1ZUZyb21DdWVEYXRhKTogQ29w eSBoaWdobGlnaHQgY29sb3IuCisKKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFja0N1ZUdl bmVyaWMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrQ3VlR2VuZXJpY0JveEVsZW1l bnQ6OmFwcGx5Q1NTUHJvcGVydGllcyk6ICJoaWdobGlnaHQiIGNvbG9yIHNldHMgdGhlIGN1ZQor ICAgICAgICAgICAgYmFja2dyb3VuZCwgImJhY2tncm91bmQiIGNvbG9yIHNldHMgdGhlIGN1ZSBj b250YWluZXIgYmFja2dyb3VuZC4KKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFja0N1ZUdl bmVyaWMuaDoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0luYmFuZFRleHRUcmFja1By aXZhdGVDbGllbnQuaDoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFu ZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWVBdHRyaWJ1dGVzKTogUHJvY2VzcyAiaGln aGxpZ2h0IiBjb2xvci4KKwogMjAxMy0wNS0xMyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBw bGUuY29tPgogCiAgICAgICAgIFVwc3RyZWFtIGlPUyBDbGlwYm9hcmQgYW5kIFBhc3RlYm9hcmQg Y2hhbmdlcwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRUZXh0VHJhY2su Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kVGV4dFRy YWNrLmNwcAkocmV2aXNpb24gMTQ5OTcwKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9J bmJhbmRUZXh0VHJhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDQsNiArMjA0LDggQEAgdm9p ZCBJbmJhbmRUZXh0VHJhY2s6OnVwZGF0ZUN1ZUZyb21DdWVEYQogICAgICAgICBjdWUtPnNldEJh Y2tncm91bmRDb2xvcihjdWVEYXRhLT5iYWNrZ3JvdW5kQ29sb3IoKS5yZ2IoKSk7CiAgICAgaWYg KGN1ZURhdGEtPmZvcmVncm91bmRDb2xvcigpLmlzVmFsaWQoKSkKICAgICAgICAgY3VlLT5zZXRG b3JlZ3JvdW5kQ29sb3IoY3VlRGF0YS0+Zm9yZWdyb3VuZENvbG9yKCkucmdiKCkpOworICAgIGlm IChjdWVEYXRhLT5oaWdobGlnaHRDb2xvcigpLmlzVmFsaWQoKSkKKyAgICAgICAgY3VlLT5zZXRI aWdobGlnaHRDb2xvcihjdWVEYXRhLT5oaWdobGlnaHRDb2xvcigpLnJnYigpKTsKIAogICAgIGlm IChjdWVEYXRhLT5hbGlnbigpID09IEdlbmVyaWNDdWVEYXRhOjpTdGFydCkKICAgICAgICAgY3Vl LT5zZXRBbGlnbihBU0NJSUxpdGVyYWwoInN0YXJ0IiksIElHTk9SRV9FWENFUFRJT04pOwpJbmRl eDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMu Y3BwCShyZXZpc2lvbiAxNDk5NzApCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRU cmFja0N1ZUdlbmVyaWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw5ICs4NCw4IEBAIHZvaWQg VGV4dFRyYWNrQ3VlR2VuZXJpY0JveEVsZW1lbnQ6OmFwcGwKIAogICAgIGlmIChjdWUtPmZvcmVn cm91bmRDb2xvcigpLmlzVmFsaWQoKSkKICAgICAgICAgY3VlRWxlbWVudC0+c2V0SW5saW5lU3R5 bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUNvbG9yLCBjdWUtPmZvcmVncm91bmRDb2xvcigpLnNlcmlh bGl6ZWQoKSk7Ci0gICAgCi0gICAgaWYgKGN1ZS0+YmFja2dyb3VuZENvbG9yKCkuaXNWYWxpZCgp KQotICAgICAgICBjdWVFbGVtZW50LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5 QmFja2dyb3VuZENvbG9yLCBjdWUtPmJhY2tncm91bmRDb2xvcigpLnNlcmlhbGl6ZWQoKSk7Cisg ICAgaWYgKGN1ZS0+aGlnaGxpZ2h0Q29sb3IoKS5pc1ZhbGlkKCkpCisgICAgICAgIGN1ZUVsZW1l bnQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IsIGN1 ZS0+aGlnaGxpZ2h0Q29sb3IoKS5zZXJpYWxpemVkKCkpOwogCiAgICAgaWYgKGN1ZS0+Z2V0V3Jp dGluZ0RpcmVjdGlvbigpID09IFRleHRUcmFja0N1ZTo6SG9yaXpvbnRhbCkKICAgICAgICAgc2V0 SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUhlaWdodCwgQ1NTVmFsdWVBdXRvKTsKQEAg LTEwMyw2ICsxMDIsOCBAQCB2b2lkIFRleHRUcmFja0N1ZUdlbmVyaWNCb3hFbGVtZW50OjphcHBs CiAgICAgZWxzZQogICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VGV4 dEFsaWduLCBDU1NWYWx1ZVN0YXJ0KTsKIAorICAgIGlmIChjdWUtPmJhY2tncm91bmRDb2xvcigp LmlzVmFsaWQoKSkKKyAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUJh Y2tncm91bmRDb2xvciwgY3VlLT5iYWNrZ3JvdW5kQ29sb3IoKS5zZXJpYWxpemVkKCkpOwogICAg IHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlXZWJraXRXcml0aW5nTW9kZSwgY3Vl LT5nZXRDU1NXcml0aW5nTW9kZSgpLCBmYWxzZSk7CiAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0 eShDU1NQcm9wZXJ0eVdoaXRlU3BhY2UsIENTU1ZhbHVlUHJlV3JhcCk7CiAgICAgc2V0SW5saW5l U3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdvcmRCcmVhaywgQ1NTVmFsdWVOb3JtYWwpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmgJ KHJldmlzaW9uIDE0OTk3MCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNr Q3VlR2VuZXJpYy5oCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2NywxMCBAQCBwdWJsaWM6CiAg ICAgCiAgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrZ3Jv dW5kQ29sb3I7IH0KICAgICB2b2lkIHNldEJhY2tncm91bmRDb2xvcihSR0JBMzIgY29sb3IpIHsg bV9iYWNrZ3JvdW5kQ29sb3Iuc2V0UkdCKGNvbG9yKTsgfQotCisgICAgCisgICAgQ29sb3IgaGln aGxpZ2h0Q29sb3IoKSBjb25zdCB7IHJldHVybiBtX2hpZ2hsaWdodENvbG9yOyB9CisgICAgdm9p ZCBzZXRIaWdobGlnaHRDb2xvcihSR0JBMzIgY29sb3IpIHsgbV9oaWdobGlnaHRDb2xvci5zZXRS R0IoY29sb3IpOyB9CisgICAgCiAgICAgdmlydHVhbCB2b2lkIHNldEZvbnRTaXplKGludCwgY29u c3QgSW50U2l6ZSYsIGJvb2wgaW1wb3J0YW50KSBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgYm9v bCBpc0VxdWFsKGNvbnN0IFRleHRUcmFja0N1ZSYsIEN1ZU1hdGNoUnVsZXMpIGNvbnN0IE9WRVJS SURFOwpAQCAtNzksNiArODIsNyBAQCBwcml2YXRlOgogICAgIAogICAgIENvbG9yIG1fZm9yZWdy b3VuZENvbG9yOwogICAgIENvbG9yIG1fYmFja2dyb3VuZENvbG9yOworICAgIENvbG9yIG1faGln aGxpZ2h0Q29sb3I7CiAgICAgZG91YmxlIG1fYmFzZUZvbnRTaXplUmVsYXRpdmVUb1ZpZGVvSGVp Z2h0OwogICAgIGRvdWJsZSBtX2ZvbnRTaXplTXVsdGlwbGllcjsKICAgICBTdHJpbmcgbV9mb250 TmFtZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0luYmFuZFRleHRU cmFja1ByaXZhdGVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQ2xpZW50LmgJKHJldmlzaW9uIDE0OTk3 MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0luYmFuZFRleHRUcmFja1By aXZhdGVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODYsNyArODYsMTAgQEAgcHVibGljOgog CiAgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrZ3JvdW5k Q29sb3I7IH0KICAgICB2b2lkIHNldEJhY2tncm91bmRDb2xvcihSR0JBMzIgY29sb3IpIHsgbV9i YWNrZ3JvdW5kQ29sb3Iuc2V0UkdCKGNvbG9yKTsgfQotCisgICAgCisgICAgQ29sb3IgaGlnaGxp Z2h0Q29sb3IoKSBjb25zdCB7IHJldHVybiBtX2hpZ2hsaWdodENvbG9yOyB9CisgICAgdm9pZCBz ZXRIaWdobGlnaHRDb2xvcihSR0JBMzIgY29sb3IpIHsgbV9oaWdobGlnaHRDb2xvci5zZXRSR0Io Y29sb3IpOyB9CisgICAgCiAgICAgZW51bSBTdGF0dXMgewogICAgICAgICBVbmluaXRpYWxpemVk LAogICAgICAgICBQYXJ0aWFsLApAQCAtMTIyLDYgKzEyNSw3IEBAIHByaXZhdGU6CiAgICAgZG91 YmxlIG1fcmVsYXRpdmVGb250U2l6ZTsKICAgICBDb2xvciBtX2ZvcmVncm91bmRDb2xvcjsKICAg ICBDb2xvciBtX2JhY2tncm91bmRDb2xvcjsKKyAgICBDb2xvciBtX2hpZ2hsaWdodENvbG9yOwog ICAgIFN0YXR1cyBtX3N0YXR1czsKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAJKHJldmlzaW9uIDE0OTk3MCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQ cml2YXRlQVZGLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTksNyBAQCBTT0ZUX0xJTktf UE9JTlRFUl9PUFRJT05BTChDb3JlTWVkaWEsIGtDCiBTT0ZUX0xJTktfUE9JTlRFUl9PUFRJT05B TChDb3JlTWVkaWEsIGtDTVRleHRNYXJrdXBBdHRyaWJ1dGVfRm9udEZhbWlseU5hbWUsIENGU3Ry aW5nUmVmKQogU09GVF9MSU5LX1BPSU5URVJfT1BUSU9OQUwoQ29yZU1lZGlhLCBrQ01UZXh0TWFy a3VwQXR0cmlidXRlX0ZvcmVncm91bmRDb2xvckFSR0IsIENGU3RyaW5nUmVmKQogU09GVF9MSU5L X1BPSU5URVJfT1BUSU9OQUwoQ29yZU1lZGlhLCBrQ01UZXh0TWFya3VwQXR0cmlidXRlX0JhY2tn cm91bmRDb2xvckFSR0IsIENGU3RyaW5nUmVmKQorU09GVF9MSU5LX1BPSU5URVJfT1BUSU9OQUwo Q29yZU1lZGlhLCBrQ01UZXh0TWFya3VwQXR0cmlidXRlX0NoYXJhY3RlckJhY2tncm91bmRDb2xv ckFSR0IsIENGU3RyaW5nUmVmKQogCiAjZGVmaW5lIGtDTVRleHRNYXJrdXBBdHRyaWJ1dGVfQWxp Z25tZW50IGdldGtDTVRleHRNYXJrdXBBdHRyaWJ1dGVfQWxpZ25tZW50KCkKICNkZWZpbmUga0NN VGV4dE1hcmt1cEFsaWdubWVudFR5cGVfU3RhcnQgZ2V0a0NNVGV4dE1hcmt1cEFsaWdubWVudFR5 cGVfU3RhcnQoKQpAQCAtNzgsNiArNzksNyBAQCBTT0ZUX0xJTktfUE9JTlRFUl9PUFRJT05BTChD b3JlTWVkaWEsIGtDCiAjZGVmaW5lIGtDTVRleHRNYXJrdXBBdHRyaWJ1dGVfRm9udEZhbWlseU5h bWUgZ2V0a0NNVGV4dE1hcmt1cEF0dHJpYnV0ZV9Gb250RmFtaWx5TmFtZSgpCiAjZGVmaW5lIGtD TVRleHRNYXJrdXBBdHRyaWJ1dGVfRm9yZWdyb3VuZENvbG9yQVJHQiBnZXRrQ01UZXh0TWFya3Vw QXR0cmlidXRlX0ZvcmVncm91bmRDb2xvckFSR0IoKQogI2RlZmluZSBrQ01UZXh0TWFya3VwQXR0 cmlidXRlX0JhY2tncm91bmRDb2xvckFSR0IgZ2V0a0NNVGV4dE1hcmt1cEF0dHJpYnV0ZV9CYWNr Z3JvdW5kQ29sb3JBUkdCKCkKKyNkZWZpbmUga0NNVGV4dE1hcmt1cEF0dHJpYnV0ZV9DaGFyYWN0 ZXJCYWNrZ3JvdW5kQ29sb3JBUkdCIGdldGtDTVRleHRNYXJrdXBBdHRyaWJ1dGVfQ2hhcmFjdGVy QmFja2dyb3VuZENvbG9yQVJHQigpCiAKIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKQEAgLTI2Miw3 ICsyNjQsNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDCiAgICAg ICAgICAgICAgICAgICAgIHRhZ1N0YXJ0LmFwcGVuZChyaWdodFRvTGVmdE1hcmspOwogICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgCisKICAgICAg ICAgICAgIGlmIChDRlN0cmluZ0NvbXBhcmUoa2V5LCBrQ01UZXh0TWFya3VwQXR0cmlidXRlX0Jh c2VGb250U2l6ZVBlcmNlbnRhZ2VSZWxhdGl2ZVRvVmlkZW9IZWlnaHQsIDApID09IGtDRkNvbXBh cmVFcXVhbFRvKSB7CiAgICAgICAgICAgICAgICAgaWYgKENGR2V0VHlwZUlEKHZhbHVlKSAhPSBD Rk51bWJlckdldFR5cGVJRCgpKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKQEAgLTI3 Myw3ICsyNzUsNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDCiAg ICAgICAgICAgICAgICAgY3VlRGF0YS0+c2V0QmFzZUZvbnRTaXplKGJhc2VGb250U2l6ZSk7CiAg ICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAKKwog ICAgICAgICAgICAgaWYgKENGU3RyaW5nQ29tcGFyZShrZXksIGtDTVRleHRNYXJrdXBBdHRyaWJ1 dGVfUmVsYXRpdmVGb250U2l6ZSwgMCkgPT0ga0NGQ29tcGFyZUVxdWFsVG8pIHsKICAgICAgICAg ICAgICAgICBpZiAoQ0ZHZXRUeXBlSUQodmFsdWUpICE9IENGTnVtYmVyR2V0VHlwZUlEKCkpCiAg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMjk2LDcgKzI5OCw3IEBAIHZvaWQgSW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0MKICAgICAgICAgICAgICAgICBjdWVEYXRh LT5zZXRGb250TmFtZSh2YWx1ZVN0cmluZyk7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgaWYgKENGU3RyaW5nQ29t cGFyZShrZXksIGtDTVRleHRNYXJrdXBBdHRyaWJ1dGVfRm9yZWdyb3VuZENvbG9yQVJHQiwgMCkg PT0ga0NGQ29tcGFyZUVxdWFsVG8pIHsKICAgICAgICAgICAgICAgICBDRkFycmF5UmVmIGFycmF5 VmFsdWUgPSBzdGF0aWNfY2FzdDxDRkFycmF5UmVmPih2YWx1ZSk7CiAgICAgICAgICAgICAgICAg aWYgKENGR2V0VHlwZUlEKGFycmF5VmFsdWUpICE9IENGQXJyYXlHZXRUeXBlSUQoKSkKQEAgLTMx OCw2ICszMjAsMTcgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQwog ICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICBjdWVEYXRhLT5z ZXRCYWNrZ3JvdW5kQ29sb3IoY29sb3IpOwogICAgICAgICAgICAgfQorCisgICAgICAgICAgICBp ZiAoQ0ZTdHJpbmdDb21wYXJlKGtleSwga0NNVGV4dE1hcmt1cEF0dHJpYnV0ZV9DaGFyYWN0ZXJC YWNrZ3JvdW5kQ29sb3JBUkdCLCAwKSA9PSBrQ0ZDb21wYXJlRXF1YWxUbykgeworICAgICAgICAg ICAgICAgIENGQXJyYXlSZWYgYXJyYXlWYWx1ZSA9IHN0YXRpY19jYXN0PENGQXJyYXlSZWY+KHZh bHVlKTsKKyAgICAgICAgICAgICAgICBpZiAoQ0ZHZXRUeXBlSUQoYXJyYXlWYWx1ZSkgIT0gQ0ZB cnJheUdldFR5cGVJRCgpKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg ICAgICAgICAKKyAgICAgICAgICAgICAgICBSR0JBMzIgY29sb3I7CisgICAgICAgICAgICAgICAg aWYgKCFtYWtlUkdCQTMyRnJvbUFSR0JDRkFycmF5KGFycmF5VmFsdWUsIGNvbG9yKSkKKyAgICAg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgY3VlRGF0YS0+c2V0SGln aGxpZ2h0Q29sb3IoY29sb3IpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAg Y29udGVudC5hcHBlbmQodGFnU3RhcnQpOwo=