108997 2013-02-05 18:38:15 -0800 More updates to Caption user preferences 2013-02-05 21:15:15 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson dino eric feature-media-reviews ojan.autocc webkit-bug-importer webkit.review.bot oldest_to_newest 826005 0 eric.carlson 2013-02-05 18:38:15 -0800 Refine the code the Mac port uses to modify caption and subtitle style. 826007 1 webkit-bug-importer 2013-02-05 18:38:37 -0800 <rdar://problem/13159553> 826014 2 186743 eric.carlson 2013-02-05 18:48:50 -0800 Created attachment 186743 Proposed patch 826049 3 186743 dino 2013-02-05 20:28:58 -0800 Comment on attachment 186743 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=186743&action=review > Source/WebCore/ChangeLog:8 > + No new tests (OOPS!). Remove this line. I guess technically we could test some of these if we toggled captions on, scrubbed the media and then were able to dump the shadow root for the captions. > Source/WebCore/page/CaptionUserPreferencesMac.mm:151 > + builder.append(": .2em"); Does this value come from the spec? It might be better as a defined constant somewhere. > Source/WebCore/page/CaptionUserPreferencesMac.mm:224 > builder.append(':'); > - builder.append(String::format("%.02f", radius)); > + builder.append(String::format("%.02fpx", radius)); Maybe combine the ":" into String::format? 826052 4 186743 buildbot 2013-02-05 20:32:21 -0800 Comment on attachment 186743 Proposed patch Attachment 186743 did not pass win-ews (win): Output: http://queues.webkit.org/results/16388093 826060 5 eric.carlson 2013-02-05 21:01:27 -0800 (In reply to comment #4) > (From update of attachment 186743 [details]) > Attachment 186743 [details] did not pass win-ews (win): > Output: http://queues.webkit.org/results/16388093 I don't think so: 1>####### COMPILING 1 FILES USING AT MOST 8 PARALLEL INSTANCES OF cl.exe ########### 1>ImageDiffCG.cpp 1>..\cg\ImageDiffCG.cpp(37) : fatal error C1083: Cannot open include file: 'wtf/Platform.h': No such file or directory 826061 6 eric.carlson 2013-02-05 21:15:04 -0800 Committed r141966: <http://trac.webkit.org/changeset/141966> 186743 2013-02-05 18:48:50 -0800 2013-02-05 21:15:15 -0800 Proposed patch patch_rendering_2.txt text/plain 13179 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTk2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAyLTA1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1vcmUgdXBkYXRlcyB0 byBDYXB0aW9uIHVzZXIgcHJlZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwODk5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogaHRt bC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQ6OmNhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWQpOiBHaXZlIHRoZSBtZWRpYSBjb250cm9scyBh IGNoYW5jZQorICAgICAgICAgICAgdG8gdXBkYXRlIGZvciB0aGUgcHJlZmVyZW5jZSBjaGFuZ2Uu CisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6dXBkYXRl U2l6ZXMpOiBBZGQgb3B0aW9uYWwgImZvcmNlIHVwZGF0ZSIgCisgICAgICAgICAgICBwYXJhbSB0 byBmb3JjZSBmb250IHNpemUgcmVjYWxjIGV2ZW4gd2hlbiB0aGUgdmlkZW8gc2l6ZSBoYXNuJ3Qg Y2hhbmdlZC4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oOgor CisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9scy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYUNvbnRyb2xzOjp0ZXh0VHJhY2tQcmVmZXJlbmNlc0NoYW5nZWQpOiBOZXcsIGZv cmNlIGEgZm9udCBzaXplIHJlY2FsYy4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xzLmg6CisKKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrQ3VlR2VuZXJpY0JveEVsZW1lbnQ6OmFwcGx5Q1NT UHJvcGVydGllcyk6IERvbid0IHNldCB3aWR0aC9zaXplIG9mIGN1ZXMKKyAgICAgICAgICAgIHRo YXQgdXNlIGRlZmF1bHQgcG9zaXRpb25pbmcuIFVzZSAic3RhcnQiIGFzIHRoZSBkZWZhdWx0IGFs aWdubWVudC4KKworICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNYWM6OmNhcHRpb25zV2lu ZG93Q1NTKTogU2V0IHBhZGRpbmcgd2hlbiB0aGUgd2luZG93IGlzIHZpc2libGUKKyAgICAgICAg ICAgIHNvIGl0IHNob3dzIGFyb3VuZCB0aGUgY3VlIGJhY2tncm91bmQuCisgICAgICAgIChXZWJD b3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjOjpjYXB0aW9uc0JhY2tncm91bmRDU1MpOiBT ZXQgcGFkZGluZyB0byAwIHdoZW4gdGhlIGJhY2tncm91bmQKKyAgICAgICAgICAgIGlzIHZpc2li bGUuCisgICAgICAgIChXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjOjp3aW5kb3dS b3VuZGVkQ29ybmVyUmFkaXVzQ1NTKTogQWRkICJweCIgdG8gdGhlIGJvcmRlciByYWRpdXMKKyAg ICAgICAgICAgIHNvIGl0IGFjdHVhbGx5IHdvcmtzLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJUZXh0VHJhY2tDdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dFRyYWNrQ3Vl OjpsYXlvdXQpOiBTcGVjaWFsIGNhc2UgZ2VuZXJpYyBjdWVzIHdpdGggZGVmYXVsdCBzdHlsZS4K KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRUcmFja0N1ZTo6cmVwb3NpdGlvbkdlbmVyaWND dWUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0VHJhY2tDdWUuaDoKKwogMjAxMy0w Mi0wNSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSU5QVVRf TVVMVElQTEVfRklFTERTX1VJOiBSZWFkLW9ubHkgaW5wdXRzIHNob3VsZCBiZSBmb2N1c2FibGUK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24g MTQxOTQ4KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDM3NCw2ICs0Mzc0LDkgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpj YXB0aW9uUHJlZmVyZW5jZQogICAgIGlmICghaXNWaWRlbygpKQogICAgICAgICByZXR1cm47CiAK KyAgICBpZiAoaGFzTWVkaWFDb250cm9scygpKQorICAgICAgICBtZWRpYUNvbnRyb2xzKCktPnRl eHRUcmFja1ByZWZlcmVuY2VzQ2hhbmdlZCgpOworICAgIAogICAgIG1hcmtDYXB0aW9uQW5kU3Vi dGl0bGVUcmFja3NBc1VuY29uZmlndXJlZCgpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCShyZXZpc2lvbiAx NDE5NDgpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50 cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMDYsNyArMTMwNiw3IEBAIHZvaWQgTWVkaWFDb250 cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWUKICAgICB9CiB9CiAKLXZvaWQgTWVkaWFDb250cm9s VGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6dXBkYXRlU2l6ZXMoKQordm9pZCBNZWRpYUNvbnRy b2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50Ojp1cGRhdGVTaXplcyhib29sIGZvcmNlVXBkYXRl KQogewogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHRvUGFyZW50TWVkaWFF bGVtZW50KHRoaXMpOwogICAgIGlmICghbWVkaWFFbGVtZW50KQpAQCAtMTMyNSw3ICsxMzI1LDcg QEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZQogICAgICAgICB2aWRl b0JveCA9IHRvUmVuZGVyVmlkZW8obWVkaWFFbGVtZW50LT5yZW5kZXJlcigpKS0+dmlkZW9Cb3go KTsKICAgICB9CiAKLSAgICBpZiAobV92aWRlb0Rpc3BsYXlTaXplID09IHZpZGVvQm94KQorICAg IGlmICghZm9yY2VVcGRhdGUgJiYgbV92aWRlb0Rpc3BsYXlTaXplID09IHZpZGVvQm94KQogICAg ICAgICByZXR1cm47CiAgICAgbV92aWRlb0Rpc3BsYXlTaXplID0gdmlkZW9Cb3g7CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMu aAkocmV2aXNpb24gMTQxOTQ4KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFD b250cm9sRWxlbWVudHMuaAkod29ya2luZyBjb3B5KQpAQCAtNDM4LDcgKzQzOCw3IEBAIHB1Ymxp YzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJF bGVtZW50PiBjcmVhdGUoRG9jdW1lbnQqKTsKIAogICAgIHZvaWQgdXBkYXRlRGlzcGxheSgpOwot ICAgIHZvaWQgdXBkYXRlU2l6ZXMoKTsKKyAgICB2b2lkIHVwZGF0ZVNpemVzKGJvb2wgZm9yY2VV cGRhdGUgPSBmYWxzZSk7CiAgICAgdm9pZCBjcmVhdGVTdWJ0cmVlcyhEb2N1bWVudCopOwogCiBw cml2YXRlOgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9scy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9s cy5jcHAJKHJldmlzaW9uIDE0MTk0OCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01l ZGlhQ29udHJvbHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDcsNiArNDA3LDEyIEBAIHZvaWQg TWVkaWFDb250cm9sczo6dXBkYXRlVGV4dFRyYWNrRGlzcGwKIAogICAgIG1fdGV4dERpc3BsYXlD b250YWluZXItPnVwZGF0ZURpc3BsYXkoKTsKIH0KKyAgICAKK3ZvaWQgTWVkaWFDb250cm9sczo6 dGV4dFRyYWNrUHJlZmVyZW5jZXNDaGFuZ2VkKCkKK3sKKyAgICBpZiAobV90ZXh0RGlzcGxheUNv bnRhaW5lcikKKyAgICAgICAgbV90ZXh0RGlzcGxheUNvbnRhaW5lci0+dXBkYXRlU2l6ZXModHJ1 ZSk7Cit9CiAjZW5kaWYKIAogfQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVk aWFDb250cm9scy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01l ZGlhQ29udHJvbHMuaAkocmV2aXNpb24gMTQxOTQ4KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvTWVkaWFDb250cm9scy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYsNiArMTA2LDcgQEAg Y2xhc3MgTWVkaWFDb250cm9scyA6IHB1YmxpYyBIVE1MRGl2RWxlbQogICAgIHZpcnR1YWwgdm9p ZCBzaG93VGV4dFRyYWNrRGlzcGxheSgpOwogICAgIHZpcnR1YWwgdm9pZCBoaWRlVGV4dFRyYWNr RGlzcGxheSgpOwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7Cisg ICAgdmlydHVhbCB2b2lkIHRleHRUcmFja1ByZWZlcmVuY2VzQ2hhbmdlZCgpOwogI2VuZGlmCiAK IHByb3RlY3RlZDoKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3Vl R2VuZXJpYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0 VHJhY2tDdWVHZW5lcmljLmNwcAkocmV2aXNpb24gMTQxOTQ4KQorKysgU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYs MjMgKzY2LDI0IEBAIHZvaWQgVGV4dFRyYWNrQ3VlR2VuZXJpY0JveEVsZW1lbnQ6OmFwcGwKICAg ICAKICAgICBUZXh0VHJhY2tDdWVHZW5lcmljKiBjdWUgPSBzdGF0aWNfY2FzdDxUZXh0VHJhY2tD dWVHZW5lcmljKj4oZ2V0Q3VlKCkpOwogCisgICAgZmxvYXQgc2l6ZSA9IHN0YXRpY19jYXN0PGZs b2F0PihjdWUtPmdldENTU1NpemUoKSk7CiAgICAgaWYgKGN1ZS0+dXNlRGVmYXVsdFBvc2l0aW9u KCkpIHsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUJvdHRvbSwg IjAiKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1hcmdpbkJv dHRvbSwgMS4wLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwogICAgIH0gZWxz ZSB7CiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlMZWZ0LCBzdGF0 aWNfY2FzdDxmbG9hdD4oY3VlLT5wb3NpdGlvbigpKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19Q RVJDRU5UQUdFKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVRv cCwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KGN1ZS0+bGluZSgpKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U19QRVJDRU5UQUdFKTsKKworICAgICAgICBpZiAoY3VlLT5nZXRXcml0aW5nRGlyZWN0aW9uKCkg PT0gVGV4dFRyYWNrQ3VlOjpIb3Jpem9udGFsKQorICAgICAgICAgICAgc2V0SW5saW5lU3R5bGVQ cm9wZXJ0eShDU1NQcm9wZXJ0eVdpZHRoLCBzaXplLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BF UkNFTlRBR0UpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3Bl cnR5KENTU1Byb3BlcnR5SGVpZ2h0LCBzaXplLCAgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJD RU5UQUdFKTsKICAgICB9CiAKLSAgICBmbG9hdCBzaXplID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGN1 ZS0+Z2V0Q1NTU2l6ZSgpKTsKLSAgICBpZiAoY3VlLT5nZXRXcml0aW5nRGlyZWN0aW9uKCkgPT0g VGV4dFRyYWNrQ3VlOjpIb3Jpem9udGFsKSB7Ci0gICAgICAgIHNldElubGluZVN0eWxlUHJvcGVy dHkoQ1NTUHJvcGVydHlEaXJlY3Rpb24sIENTU1ZhbHVlTHRyKTsKLSAgICAgICAgc2V0SW5saW5l U3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdpZHRoLCBzaXplLCBDU1NQcmltaXRpdmVWYWx1ZTo6 Q1NTX1BFUkNFTlRBR0UpOworICAgIGlmIChjdWUtPmdldFdyaXRpbmdEaXJlY3Rpb24oKSA9PSBU ZXh0VHJhY2tDdWU6Okhvcml6b250YWwpCiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHko Q1NTUHJvcGVydHlIZWlnaHQsIENTU1ZhbHVlQXV0byk7Ci0gICAgfSBlbHNlIHsKKyAgICBlbHNl CiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlXaWR0aCwgQ1NTVmFs dWVBdXRvKTsKLSAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUhlaWdo dCwgc2l6ZSwgIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSk7Ci0gICAgfQogCiAg ICAgaWYgKGN1ZS0+YmFzZUZvbnRTaXplUmVsYXRpdmVUb1ZpZGVvSGVpZ2h0KCkpIHsKICAgICAg ICAgZG91YmxlIGZvbnRTaXplID0gdmlkZW9TaXplLmhlaWdodCgpICogY3VlLT5iYXNlRm9udFNp emVSZWxhdGl2ZVRvVmlkZW9IZWlnaHQoKSAvIDEwMDsKQEAgLTkxLDEyICs5MiwxMiBAQCB2b2lk IFRleHRUcmFja0N1ZUdlbmVyaWNCb3hFbGVtZW50OjphcHBsCiAgICAgICAgIHNldElubGluZVN0 eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlGb250U2l6ZSwgU3RyaW5nOjpudW1iZXIoZm9udFNpemUp ICsgInB4Iik7CiAgICAgfQogCi0gICAgaWYgKGN1ZS0+Z2V0QWxpZ25tZW50KCkgPT0gVGV4dFRy YWNrQ3VlOjpTdGFydCkKLSAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eVRleHRBbGlnbiwgQ1NTVmFsdWVTdGFydCk7CisgICAgaWYgKGN1ZS0+Z2V0QWxpZ25tZW50KCkg PT0gVGV4dFRyYWNrQ3VlOjpNaWRkbGUpCisgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHko Q1NTUHJvcGVydHlUZXh0QWxpZ24sIENTU1ZhbHVlQ2VudGVyKTsKICAgICBlbHNlIGlmIChjdWUt PmdldEFsaWdubWVudCgpID09IFRleHRUcmFja0N1ZTo6RW5kKQogICAgICAgICBzZXRJbmxpbmVT dHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VGV4dEFsaWduLCBDU1NWYWx1ZUVuZCk7CiAgICAgZWxz ZQotICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VGV4dEFsaWduLCBD U1NWYWx1ZUNlbnRlcik7CisgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVy dHlUZXh0QWxpZ24sIENTU1ZhbHVlU3RhcnQpOwogCiAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0 eShDU1NQcm9wZXJ0eVdlYmtpdFdyaXRpbmdNb2RlLCBjdWUtPmdldENTU1dyaXRpbmdNb2RlKCks IGZhbHNlKTsKICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5V2hpdGVTcGFj ZSwgQ1NTVmFsdWVQcmVXcmFwKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVz ZXJQcmVmZXJlbmNlc01hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0Nh cHRpb25Vc2VyUHJlZmVyZW5jZXNNYWMubW0JKHJldmlzaW9uIDE0MTk0OCkKKysrIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5tbQkod29ya2luZyBjb3B5KQpA QCAtMTQwLDcgKzE0MCwyMCBAQCBTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYzo6Y2Fw dGlvCiAgICAgICAgIHdpbmRvd0NvbG9yID0gQ29sb3I6OnRyYW5zcGFyZW50OwogCiAgICAgQ0dG bG9hdCBvcGFjaXR5ID0gTUFDYXB0aW9uQXBwZWFyYW5jZUdldFdpbmRvd09wYWNpdHkoa01BQ2Fw dGlvbkFwcGVhcmFuY2VEb21haW5Vc2VyLCAmYmVoYXZpb3IpOwotICAgIHJldHVybiBjb2xvclBy b3BlcnR5Q1NTKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLCBDb2xvcih3aW5kb3dDb2xvci5y ZWQoKSwgd2luZG93Q29sb3IuZ3JlZW4oKSwgd2luZG93Q29sb3IuYmx1ZSgpLCBzdGF0aWNfY2Fz dDxpbnQ+KG9wYWNpdHkgKiAyNTUpKSwgYmVoYXZpb3IgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VC ZWhhdmlvclVzZVZhbHVlKTsKKyAgICBTdHJpbmcgd2luZG93U3R5bGUgPSBjb2xvclByb3BlcnR5 Q1NTKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLCBDb2xvcih3aW5kb3dDb2xvci5yZWQoKSwg d2luZG93Q29sb3IuZ3JlZW4oKSwgd2luZG93Q29sb3IuYmx1ZSgpLCBzdGF0aWNfY2FzdDxpbnQ+ KG9wYWNpdHkgKiAyNTUpKSwgYmVoYXZpb3IgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VCZWhhdmlv clVzZVZhbHVlKTsKKworICAgIGlmICghb3BhY2l0eSkKKyAgICAgICAgcmV0dXJuIHdpbmRvd1N0 eWxlOworCisgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIGJ1aWxkZXIuYXBwZW5kKHdp bmRvd1N0eWxlKTsKKyAgICBidWlsZGVyLmFwcGVuZChnZXRQcm9wZXJ0eU5hbWVTdHJpbmcoQ1NT UHJvcGVydHlQYWRkaW5nKSk7CisgICAgYnVpbGRlci5hcHBlbmQoIjogLjJlbSIpOworICAgIGlm IChiZWhhdmlvciA9PSBrTUFDYXB0aW9uQXBwZWFyYW5jZUJlaGF2aW9yVXNlVmFsdWUpCisgICAg ICAgIGJ1aWxkZXIuYXBwZW5kKCIgIWltcG9ydGFudCIpOworICAgIGJ1aWxkZXIuYXBwZW5kKCc7 Jyk7CisgICAgCisgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAogU3RyaW5nIENh cHRpb25Vc2VyUHJlZmVyZW5jZXNNYWM6OmNhcHRpb25zQmFja2dyb3VuZENTUygpIGNvbnN0CkBA IC0xNTcsNyArMTcwLDIwIEBAIFN0cmluZyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjOjpjYXB0 aW8KICAgICAgICAgYmFja2dyb3VuZENvbG9yID0gZGVmYXVsdEJhY2tncm91bmRDb2xvcjsKIAog ICAgIENHRmxvYXQgb3BhY2l0eSA9IE1BQ2FwdGlvbkFwcGVhcmFuY2VHZXRCYWNrZ3JvdW5kT3Bh Y2l0eShrTUFDYXB0aW9uQXBwZWFyYW5jZURvbWFpblVzZXIsIDApOwotICAgIHJldHVybiBjb2xv clByb3BlcnR5Q1NTKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLCBDb2xvcihiYWNrZ3JvdW5k Q29sb3IucmVkKCksIGJhY2tncm91bmRDb2xvci5ncmVlbigpLCBiYWNrZ3JvdW5kQ29sb3IuYmx1 ZSgpLCBzdGF0aWNfY2FzdDxpbnQ+KG9wYWNpdHkgKiAyNTUpKSwgYmVoYXZpb3IgPT0ga01BQ2Fw dGlvbkFwcGVhcmFuY2VCZWhhdmlvclVzZVZhbHVlKTsKKyAgICBTdHJpbmcgYmFja2dyb3VuZFN0 eWxlID0gY29sb3JQcm9wZXJ0eUNTUyhDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvciwgQ29sb3Io YmFja2dyb3VuZENvbG9yLnJlZCgpLCBiYWNrZ3JvdW5kQ29sb3IuZ3JlZW4oKSwgYmFja2dyb3Vu ZENvbG9yLmJsdWUoKSwgc3RhdGljX2Nhc3Q8aW50PihvcGFjaXR5ICogMjU1KSksIGJlaGF2aW9y ID09IGtNQUNhcHRpb25BcHBlYXJhbmNlQmVoYXZpb3JVc2VWYWx1ZSk7CisKKyAgICBpZiAoIW9w YWNpdHkpCisgICAgICAgIHJldHVybiBiYWNrZ3JvdW5kU3R5bGU7CisgICAgCisgICAgU3RyaW5n QnVpbGRlciBidWlsZGVyOworICAgIGJ1aWxkZXIuYXBwZW5kKGJhY2tncm91bmRTdHlsZSk7Cisg ICAgYnVpbGRlci5hcHBlbmQoZ2V0UHJvcGVydHlOYW1lU3RyaW5nKENTU1Byb3BlcnR5UGFkZGlu ZykpOworICAgIGJ1aWxkZXIuYXBwZW5kKCI6IDBweCIpOworICAgIGlmIChiZWhhdmlvciA9PSBr TUFDYXB0aW9uQXBwZWFyYW5jZUJlaGF2aW9yVXNlVmFsdWUpCisgICAgICAgIGJ1aWxkZXIuYXBw ZW5kKCIgIWltcG9ydGFudCIpOworICAgIGJ1aWxkZXIuYXBwZW5kKCc7Jyk7CisgICAgCisgICAg cmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAogQ29sb3IgQ2FwdGlvblVzZXJQcmVmZXJl bmNlc01hYzo6Y2FwdGlvbnNUZXh0Q29sb3IoYm9vbCYgaW1wb3J0YW50KSBjb25zdApAQCAtMTk1 LDcgKzIyMSw3IEBAIFN0cmluZyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjOjp3aW5kb3cKICAg ICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CiAgICAgYnVpbGRlci5hcHBlbmQoZ2V0UHJvcGVydHlO YW1lU3RyaW5nKENTU1Byb3BlcnR5Qm9yZGVyUmFkaXVzKSk7CiAgICAgYnVpbGRlci5hcHBlbmQo JzonKTsKLSAgICBidWlsZGVyLmFwcGVuZChTdHJpbmc6OmZvcm1hdCgiJS4wMmYiLCByYWRpdXMp KTsKKyAgICBidWlsZGVyLmFwcGVuZChTdHJpbmc6OmZvcm1hdCgiJS4wMmZweCIsIHJhZGl1cykp OwogICAgIGlmIChiZWhhdmlvciA9PSBrTUFDYXB0aW9uQXBwZWFyYW5jZUJlaGF2aW9yVXNlVmFs dWUpCiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCIgIWltcG9ydGFudCIpOwogICAgIGJ1aWxkZXIu YXBwZW5kKCc7Jyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dFRy YWNrQ3VlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGV4dFRyYWNrQ3VlLmNwcAkocmV2aXNpb24gMTQxOTQ4KQorKysgU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRleHRUcmFja0N1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMw LDcgQEAKICNpbmNsdWRlICJSZW5kZXJUZXh0VHJhY2tDdWUuaCIKIAogI2luY2x1ZGUgIlRleHRU cmFja0N1ZS5oIgorI2luY2x1ZGUgIlRleHRUcmFja0N1ZUdlbmVyaWMuaCIKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCkBAIC00NSwxMCArNDYsMTUgQEAgdm9pZCBSZW5kZXJUZXh0VHJhY2tDdWU6 OmxheW91dCgpCiAgICAgUmVuZGVyQmxvY2s6OmxheW91dCgpOwogCiAgICAgTGF5b3V0U3RhdGVN YWludGFpbmVyIHN0YXRlUHVzaGVyKHZpZXcoKSwgdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFz VHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlKCktPmlzRmxpcHBlZEJsb2Nr c1dyaXRpbmdNb2RlKCkpOwotICAgIGlmIChtX2N1ZS0+c25hcFRvTGluZXMoKSkKLSAgICAgICAg cmVwb3NpdGlvbkN1ZVNuYXBUb0xpbmVzU2V0KCk7Ci0gICAgZWxzZQotICAgICAgICByZXBvc2l0 aW9uQ3VlU25hcFRvTGluZXNOb3RTZXQoKTsKKyAgICAKKyAgICBpZiAobV9jdWUtPmN1ZVR5cGUo KT09IFRleHRUcmFja0N1ZTo6V2ViVlRUKSB7CisgICAgICAgIGlmIChtX2N1ZS0+c25hcFRvTGlu ZXMoKSkKKyAgICAgICAgICAgIHJlcG9zaXRpb25DdWVTbmFwVG9MaW5lc1NldCgpOworICAgICAg ICBlbHNlCisgICAgICAgICAgICByZXBvc2l0aW9uQ3VlU25hcFRvTGluZXNOb3RTZXQoKTsKKyAg ICB9IGVsc2UKKyAgICAgICAgcmVwb3NpdGlvbkdlbmVyaWNDdWUoKTsKKwogICAgIHN0YXRlUHVz aGVyLnBvcCgpOwogfQogCkBAIC0yMjEsNiArMjI3LDI0IEBAIHZvaWQgUmVuZGVyVGV4dFRyYWNr Q3VlOjpyZXBvc2l0aW9uQ3VlU24KICAgICB9CiB9CiAKK3ZvaWQgUmVuZGVyVGV4dFRyYWNrQ3Vl OjpyZXBvc2l0aW9uR2VuZXJpY0N1ZSgpCit7CisgICAgVGV4dFRyYWNrQ3VlR2VuZXJpYyogY3Vl ID0gc3RhdGljX2Nhc3Q8VGV4dFRyYWNrQ3VlR2VuZXJpYyo+KG1fY3VlKTsKKyAgICBpZiAoIWN1 ZS0+dXNlRGVmYXVsdFBvc2l0aW9uKCkpCisgICAgICAgIHJldHVybjsKKworICAgIEFTU0VSVChm aXJzdENoaWxkKCkpOworCisgICAgSW5saW5lRmxvd0JveCogZmlyc3RMaW5lQm94ID0gdG9SZW5k ZXJJbmxpbmUoZmlyc3RDaGlsZCgpKS0+Zmlyc3RMaW5lQm94KCk7CisgICAgaWYgKCFmaXJzdExp bmVCb3gpCisgICAgICAgIHJldHVybjsKKworICAgIExheW91dFVuaXQgcGFyZW50V2lkdGggPSBj b250YWluaW5nQmxvY2soKS0+bG9naWNhbFdpZHRoKCk7CisgICAgTGF5b3V0VW5pdCB3aWR0aCA9 IGZpcnN0TGluZUJveC0+d2lkdGgoKTsKKyAgICBMYXlvdXRVbml0IHJpZ2h0ID0gKHBhcmVudFdp ZHRoIC8gMikgLSAod2lkdGggLyAyKTsKKyAgICBzZXRYKHJpZ2h0KTsKK30KKwogdm9pZCBSZW5k ZXJUZXh0VHJhY2tDdWU6OnJlcG9zaXRpb25DdWVTbmFwVG9MaW5lc05vdFNldCgpCiB7CiAgICAg Ly8gRklYTUU6IEltcGxlbWVudCBvdmVybGFwcGluZyBkZXRlY3Rpb24gd2hlbiBzbmFwLXRvLWxp bmVzIGlzIG5vdCBzZXQuIGh0dHA6Ly93a2IudWcvODQyOTYKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0VHJhY2tDdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dFRyYWNrQ3VlLmgJKHJldmlzaW9uIDE0MTk0OCkKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0VHJhY2tDdWUuaAkod29ya2luZyBj b3B5KQpAQCAtNTQsOCArNTQsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgaW5pdGlhbGl6ZUxheW91 dFBhcmFtZXRlcnMoSW5saW5lRmxvd0JveComLCBMYXlvdXRVbml0JiwgTGF5b3V0VW5pdCYpOwog ICAgIHZvaWQgcGxhY2VCb3hJbkRlZmF1bHRQb3NpdGlvbihMYXlvdXRVbml0LCBib29sJik7CiAg ICAgdm9pZCByZXBvc2l0aW9uQ3VlU25hcFRvTGluZXNTZXQoKTsKLQogICAgIHZvaWQgcmVwb3Np dGlvbkN1ZVNuYXBUb0xpbmVzTm90U2V0KCk7CisgICAgdm9pZCByZXBvc2l0aW9uR2VuZXJpY0N1 ZSgpOwogCiAgICAgVGV4dFRyYWNrQ3VlKiBtX2N1ZTsKICAgICBGbG9hdFBvaW50IG1fZmFsbGJh Y2tQb3NpdGlvbjsK