135759 2014-08-08 10:58:45 -0700 Adjustments to CueBox CSS Width calculations 2014-08-08 14:42:32 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 roger_fong webkit-unassigned bfulgham calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble jonlee mark.lam philipj roger_fong sergio oldest_to_newest 1027877 0 roger_fong 2014-08-08 10:58:45 -0700 <rdar://problem/17954473> This is a followup patch to http://trac.webkit.org/changeset/172224 It addresses the bugs I introduced with that revision and fixes the two test failures skipped here: https://bugs.webkit.org/show_bug.cgi?id=135720 1027903 1 236293 roger_fong 2014-08-08 11:59:27 -0700 Created attachment 236293 patch 1027906 2 236293 eric.carlson 2014-08-08 12:15:32 -0700 Comment on attachment 236293 patch View in context: https://bugs.webkit.org/attachment.cgi?id=236293&action=review r=me with a few nits. Thanks! > Source/WebCore/html/shadow/MediaControlElements.cpp:1243 > + toVTTCue(cue)->shouldChange(); The call to setFontSize should set m_displayTreeShouldChange automatically. > Source/WebCore/html/track/TextTrackCueGeneric.cpp:87 > + setInlineStyleProperty(CSSPropertyWidth, std::min(size * multiplier, 100.0f), CSSPrimitiveValue::CSS_PERCENTAGE); Nit:The "f" isn't necessary, "100.0" should be sufficient. > Source/WebCore/html/track/TextTrackCueGeneric.cpp:89 > + setInlineStyleProperty(CSSPropertyHeight, std::min(size * multiplier, 100.0f), CSSPrimitiveValue::CSS_PERCENTAGE); Ditto. > Source/WebCore/html/track/VTTCue.cpp:176 > + setInlineStyleProperty(CSSPropertyWidth, std::min(static_cast<float>(m_cue.getCSSSize() * multiplier), 100.0f), CSSPrimitiveValue::CSS_PERCENTAGE); Ditto. > Source/WebCore/html/track/VTTCue.cpp:184 > + setInlineStyleProperty(CSSPropertyMaxHeight, 100.0 - position.second, CSSPrimitiveValue::CSS_PERCENTAGE); Ditto. 1027924 3 roger_fong 2014-08-08 13:11:53 -0700 Landed: http://trac.webkit.org/changeset/172351 1027954 4 ap 2014-08-08 14:42:32 -0700 *** Bug 135720 has been marked as a duplicate of this bug. *** 236293 2014-08-08 11:59:27 -0700 2014-08-08 12:15:30 -0700 patch patch.patch text/plain 8726 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjM0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA4LTA4ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRqdXN0bWVudHMgdG8gQ3Vl Qm94IENTUyBXaWR0aCBjYWxjdWxhdGlvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU3NTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3OTU0 NDczPi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGlzIGEgZm9sbG93dXAgcGF0Y2ggdGhhdCBhZGRyZXNzZXMgc29tZSBvZiB0aGUgdGVzdCBm YWlsdXJlcyBjYXVzZWQgYnkgcjE3MjIyNC4KKyAgICAgICAgVGhlc2UgdGVzdHMgd2VyZSBza2lw cGVkIGluIHIxNzIyNTMuCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVu dHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVy RWxlbWVudDo6dXBkYXRlQWN0aXZlQ3Vlc0ZvbnRTaXplKToKKyAgICAgICAgVGVsbCB0aGUgY3Vl IGJveGVzIHRoYXQgdGhleSBuZWVkIHRvIGJlIHVwZGF0ZWQgd2hlbiB0aGUgZm9udCBzaXplIHNw ZWNpZmllZCBpbiB0aGUgdXNlciBwcmVmcyBjaGFuZ2VzLgorICAgICAgICAKKyAgICAgICAgQ2Fw IHdpZHRoIHRvIDEwMCUsIGNhbGN1bGF0ZSBtYXgtd2lkdGggaW4gcGVyY2VudGFnZXMgaW5zdGVh ZCBvZiBwaXhlbHMuCisgICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZUdlbmVyaWNCb3hFbGVtZW50OjphcHBs eUNTU1Byb3BlcnRpZXMpOgorICAgICAgICAqIGh0bWwvdHJhY2svVlRUQ3VlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlZUVEN1ZUJveDo6YXBwbHlDU1NQcm9wZXJ0aWVzKToKKworICAgICAgICAo V2ViQ29yZTo6VlRUQ3VlOjpzaG91bGRDaGFuZ2UpOiBTZXRzIHRoZSBjdWVib3ggdXBkYXRlIGZs YWcgdG8gdHJ1ZS4KKyAgICAgICAgKFdlYkNvcmU6OlZUVEN1ZTo6c2V0Rm9udFNpemUpOiBSZW1v dmUgc29tZSB1bm5lY2Vzc2FyeSBjb2RlIHRoYXQgZG9lc24ndCBhY3R1YWxseSB3b3JrLgorICAg ICAgICAqIGh0bWwvdHJhY2svVlRUQ3VlLmg6CisKIDIwMTQtMDgtMDggIFphbiBEb2JlcnNlayAg PHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDTWFrZV0gRHJvcCB0aGUgcmVxdWly ZWQgdmVyc2lvbiBvZiBDTWFrZSBkb3duIHRvIDIuOC44CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCShyZXZpc2lvbiAx NzIzMjIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50 cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNDAsNiArMTI0MCw3IEBAIHZvaWQgTWVkaWFDb250 cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWUKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAg ICAgIHRvVlRUQ3VlKGN1ZSktPnNldEZvbnRTaXplKG1fZm9udFNpemUsIG1fdmlkZW9EaXNwbGF5 U2l6ZS5zaXplKCksIG1fZm9udFNpemVJc0ltcG9ydGFudCk7CisgICAgICAgIHRvVlRUQ3VlKGN1 ZSktPnNob3VsZENoYW5nZSgpOwogICAgIH0KIAogfQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwCShyZXZpc2lvbiAxNzIzMjIp CisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC04NCwyMCArODQsMTggQEAgdm9pZCBUZXh0VHJhY2tDdWVHZW5lcmlj Qm94RWxlbWVudDo6YXBwbAogCiAgICAgICAgIGZsb2F0IG11bHRpcGxpZXIgPSBzdGQ6Om1heCgx LjBmLCBtX2ZvbnRTaXplRnJvbUNhcHRpb25Vc2VyUHJlZnMgLyBhdXRob3JGb250U2l6ZSk7CiAg ICAgICAgIGlmIChjdWUtPmdldFdyaXRpbmdEaXJlY3Rpb24oKSA9PSBWVFRDdWU6Okhvcml6b250 YWwpCi0gICAgICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5V2lkdGgs IHNpemUgKiBtdWx0aXBsaWVyLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwor ICAgICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdpZHRoLCBzdGQ6 Om1pbihzaXplICogbXVsdGlwbGllciwgMTAwLjBmKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19Q RVJDRU5UQUdFKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9w ZXJ0eShDU1NQcm9wZXJ0eUhlaWdodCwgc2l6ZSAqIG11bHRpcGxpZXIsICBDU1NQcmltaXRpdmVW YWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOworICAgICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0 eShDU1NQcm9wZXJ0eUhlaWdodCwgc3RkOjptaW4oc2l6ZSAqIG11bHRpcGxpZXIsIDEwMC4wZiks ICBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwogICAgIH0KIAogICAgIHN0ZDo6 cGFpcjxmbG9hdCwgZmxvYXQ+IHBvc2l0aW9uID0gbV9jdWUuZ2V0Q1NTUG9zaXRpb24oKTsKICAg ICBpZiAoY3VlLT5nZXRXcml0aW5nRGlyZWN0aW9uKCkgPT0gVlRUQ3VlOjpIb3Jpem9udGFsKSB7 CiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlNaW5XaWR0aCwgIi13 ZWJraXQtbWluLWNvbnRlbnQiKTsKLSAgICAgICAgZG91YmxlIG1heFdpZHRoID0gdmlkZW9TaXpl LndpZHRoKCkgKiAoMTAwLjAgLSBwb3NpdGlvbi5maXJzdCkgLyAxMDAuMDsKLSAgICAgICAgc2V0 SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1heFdpZHRoLCBtYXhXaWR0aCwgQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19QWCk7CisgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NT UHJvcGVydHlNYXhXaWR0aCwgMTAwLjAgLSBwb3NpdGlvbi5maXJzdCwgQ1NTUHJpbWl0aXZlVmFs dWU6OkNTU19QRVJDRU5UQUdFKTsKICAgICB9IGVsc2UgewogICAgICAgICBzZXRJbmxpbmVTdHls ZVByb3BlcnR5KENTU1Byb3BlcnR5TWluSGVpZ2h0LCAiLXdlYmtpdC1taW4tY29udGVudCIpOwot ICAgICAgICBkb3VibGUgbWF4SGVpZ2h0ID0gdmlkZW9TaXplLmhlaWdodCgpICogKDEwMC4wIC0g cG9zaXRpb24uc2Vjb25kKSAvIDEwMC4wOwotICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5 KENTU1Byb3BlcnR5TWF4SGVpZ2h0LCBtYXhIZWlnaHQsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1Nf UFgpOworICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5TWF4SGVpZ2h0 LCAxMDAuMCAtIHBvc2l0aW9uLnNlY29uZCwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5U QUdFKTsKICAgICB9CiAKICAgICBpZiAoY3VlLT5mb3JlZ3JvdW5kQ29sb3IoKS5pc1ZhbGlkKCkp CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WVFRDdWUuY3BwCShyZXZpc2lvbiAxNzIzMjIp CisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEzOCw3ICsxMzgsNyBAQCBWVFRDdWUqIFZUVEN1ZUJveDo6Z2V0Q3VlKCkgY29uc3QKICAg ICByZXR1cm4gJm1fY3VlOwogfQogCi12b2lkIFZUVEN1ZUJveDo6YXBwbHlDU1NQcm9wZXJ0aWVz KGNvbnN0IEludFNpemUmIHZpZGVvU2l6ZSkKK3ZvaWQgVlRUQ3VlQm94OjphcHBseUNTU1Byb3Bl cnRpZXMoY29uc3QgSW50U2l6ZSYpCiB7CiAgICAgLy8gRklYTUU6IEFwcGx5IGFsbCB0aGUgaW5p dGlhbCBDU1MgcG9zaXRpb25pbmcgcHJvcGVydGllcy4gaHR0cDovL3drYi51Zy83OTkxNgogI2lm IEVOQUJMRShXRUJWVFRfUkVHSU9OUykKQEAgLTE3MywxNyArMTczLDE1IEBAIHZvaWQgVlRUQ3Vl Qm94OjphcHBseUNTU1Byb3BlcnRpZXMoY29uc3QKICAgICBmbG9hdCBtdWx0aXBsaWVyID0gc3Rk OjptYXgoMS4wZiwgbV9mb250U2l6ZUZyb21DYXB0aW9uVXNlclByZWZzIC8gREVGQVVMVENBUFRJ T05GT05UU0laRSk7CiAgICAgLy8gdGhlICd3aWR0aCcgcHJvcGVydHkgbXVzdCBiZSBzZXQgdG8g d2lkdGgsIGFuZCB0aGUgJ2hlaWdodCcgcHJvcGVydHkgIG11c3QgYmUgc2V0IHRvIGhlaWdodAog ICAgIGlmIChtX2N1ZS52ZXJ0aWNhbCgpID09IGhvcml6b250YWxLZXl3b3JkKCkpIHsKLSAgICAg ICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdpZHRoLCBzdGF0aWNfY2FzdDxk b3VibGU+KG1fY3VlLmdldENTU1NpemUoKSAqIG11bHRpcGxpZXIpLCBDU1NQcmltaXRpdmVWYWx1 ZTo6Q1NTX1BFUkNFTlRBR0UpOworICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1By b3BlcnR5V2lkdGgsIHN0ZDo6bWluKHN0YXRpY19jYXN0PGZsb2F0PihtX2N1ZS5nZXRDU1NTaXpl KCkgKiBtdWx0aXBsaWVyKSwgMTAwLjBmKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5U QUdFKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUhlaWdodCwg Q1NTVmFsdWVBdXRvKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eU1pbldpZHRoLCAiLXdlYmtpdC1taW4tY29udGVudCIpOwotICAgICAgICBkb3VibGUgbWF4V2lk dGggPSB2aWRlb1NpemUud2lkdGgoKSAqICgxMDAuMCAtIHBvc2l0aW9uLmZpcnN0KSAvIDEwMC4w OwotICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5TWF4V2lkdGgsIG1h eFdpZHRoLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKKyAgICAgICAgc2V0SW5saW5lU3R5 bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1heFdpZHRoLCAxMDAuMCAtIHBvc2l0aW9uLmZpcnN0LCBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwogICAgIH0gZWxzZSB7CiAgICAgICAg IHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlXaWR0aCwgQ1NTVmFsdWVBdXRvKTsK LSAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUhlaWdodCwgc3RhdGlj X2Nhc3Q8ZG91YmxlPihtX2N1ZS5nZXRDU1NTaXplKCkgKiBtdWx0aXBsaWVyKSwgIENTU1ByaW1p dGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSk7CisgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVy dHkoQ1NTUHJvcGVydHlIZWlnaHQsIHN0ZDo6bWluKHN0YXRpY19jYXN0PGZsb2F0PihtX2N1ZS5n ZXRDU1NTaXplKCkgKiBtdWx0aXBsaWVyKSwgMTAwLjBmKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U19QRVJDRU5UQUdFKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eU1pbkhlaWdodCwgIi13ZWJraXQtbWluLWNvbnRlbnQiKTsKLSAgICAgICAgZG91YmxlIG1heEhl aWdodCA9IHZpZGVvU2l6ZS5oZWlnaHQoKSAqICgxMDAuMCAtIHBvc2l0aW9uLnNlY29uZCkgLyAx MDAuMDsKLSAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1heEhlaWdo dCwgbWF4SGVpZ2h0LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKKyAgICAgICAgc2V0SW5s aW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1heEhlaWdodCwgMTAwLjAgLSBwb3NpdGlvbi5z ZWNvbmQsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSk7CiAgICAgfQogCiAgICAg Ly8gVGhlICd0ZXh0LWFsaWduJyBwcm9wZXJ0eSBvbiB0aGUgKHJvb3QpIExpc3Qgb2YgV2ViVlRU IE5vZGUgT2JqZWN0cyBtdXN0CkBAIC0zMDMsNiArMzAxLDExIEBAIHZvaWQgVlRUQ3VlOjpkaWRD aGFuZ2UoKQogICAgIG1fZGlzcGxheVRyZWVTaG91bGRDaGFuZ2UgPSB0cnVlOwogfQogCit2b2lk IFZUVEN1ZTo6c2hvdWxkQ2hhbmdlKCkKK3sKKyAgICBtX2Rpc3BsYXlUcmVlU2hvdWxkQ2hhbmdl ID0gdHJ1ZTsKK30KKwogY29uc3QgU3RyaW5nJiBWVFRDdWU6OnZlcnRpY2FsKCkgY29uc3QKIHsK ICAgICBzd2l0Y2ggKG1fd3JpdGluZ0RpcmVjdGlvbikgewpAQCAtMTE0MSw5ICsxMTQ0LDYgQEAg dm9pZCBWVFRDdWU6OnNldEZvbnRTaXplKGludCBmb250U2l6ZSwgYwogICAgICAgICByZXR1cm47 CiAgICAgCiAgICAgTE9HKE1lZGlhLCAiVGV4dFRyYWNrQ3VlOjpzZXRGb250U2l6ZSAtIHNldHRp bmcgY3VlIGZvbnQgc2l6ZSB0byAlaSIsIGZvbnRTaXplKTsKLQotICAgIGlmIChpbXBvcnRhbnQp Ci0gICAgICAgIGRpc3BsYXlUcmVlSW50ZXJuYWwoKS0+c2V0Rm9udFNpemVGcm9tQ2FwdGlvblVz ZXJQcmVmcygwKTsKICAgICAKICAgICBkaXNwbGF5VHJlZUludGVybmFsKCktPnNldElubGluZVN0 eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlGb250U2l6ZSwgZm9udFNpemUsIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfUFgsIGltcG9ydGFudCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3Ry YWNrL1ZUVEN1ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRU Q3VlLmgJKHJldmlzaW9uIDE3MjMyMikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRU Q3VlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2NSw2ICsxNjUsNyBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCBib29sIGlzUmVuZGVyYWJsZSgpIGNvbnN0IG92ZXJyaWRlIGZpbmFsIHsgcmV0dXJuIHRy dWU7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2UoKSBvdmVycmlkZTsKKyAgICB2b2lk IHNob3VsZENoYW5nZSgpOwogCiBwcm90ZWN0ZWQ6CiAgICAgVlRUQ3VlKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQmLCBkb3VibGUgc3RhcnQsIGRvdWJsZSBlbmQsIGNvbnN0IFN0cmluZyYgY29udGVu dCk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNzIzMjIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxNC0wOC0wNyAgUm9nZXIgRm9uZyAg PHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIEFkanVzdG1lbnRzIHRvIEN1ZUJveCBD U1MgV2lkdGggY2FsY3VsYXRpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM1NzU5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzk1NDQ3Mz4u CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0 RXhwZWN0YXRpb25zOgorICAgICAgICBVbnNraXAgdGVzdHMgbWVkaWEvdHJhY2svdHJhY2stY3Vl LXJlbmRlcmluZy1ob3Jpem9udGFsLmh0bWwgYW5kIG1lZGlhL3RyYWNrL3RyYWNrLWN1ZS1yZW5k ZXJpbmctcnRsLmh0bWwuCisKIDIwMTQtMDgtMDcgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFp bkBhcHBsZS5jb20+CiAKICAgICAgICAgR2V0IHJpZCBvZiBTQ1JJUFRFRF9TUEVFQ0gKSW5kZXg6 IExheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucwkocmV2aXNpb24gMTcyMzIyKQorKysgTGF5b3V0VGVzdHMvVGVzdEV4 cGVjdGF0aW9ucwkod29ya2luZyBjb3B5KQpAQCAtMTQyLDYgKzE0MiwzIEBAIHdlYmtpdC5vcmcv Yi8xMzUzOTAgZmFzdC9jc3MvZm9udGxvYWRlci0KIHdlYmtpdC5vcmcvYi8xMzUzOTAgZmFzdC9j c3MvZm9udGxvYWRlci1tdWx0aXBsZS1mYW1pbGllcy5odG1sIFsgU2tpcCBdCiB3ZWJraXQub3Jn L2IvMTM1MzkwIGh0dHAvdGVzdHMvd2ViZm9udC9mb250bG9hZGVyLWxvYWRpbmctYXR0cmlidXRl Lmh0bWwgWyBTa2lwIF0KIAotIyBUZXN0cyBmYWlsZWQgYWZ0ZXIgaHR0cDovL3RyYWMud2Via2l0 Lm9yZy9yMTcyMjI0IGxhbmRlZDoKLXdlYmtpdC5vcmcvYi8xMzU3MjAgbWVkaWEvdHJhY2svdHJh Y2stY3VlLXJlbmRlcmluZy1ob3Jpem9udGFsLmh0bWwgWyBGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8xMzU3MjAgbWVkaWEvdHJhY2svdHJhY2stY3VlLXJlbmRlcmluZy1ydGwuaHRtbCBbIEZhaWx1 cmUgXQo=