135820 2014-08-11 16:29:51 -0700 More adjustments to css width calculations of cue boxes 2014-08-11 17:14:39 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned bfulgham calvaris commit-queue eric.carlson esprehn+autocc gyuyoung.kim philipj roger_fong oldest_to_newest 1028353 0 roger_fong 2014-08-11 16:29:51 -0700 <rdar://problem/17961164> Two more issues I neglected to fix: First off the multiplier calculations are wrong since they are based off a default font size of 10px which is not actually what we use. We use a percentage of the video size as specified in CaptionUserPreferences. The second issue is that for center aligned text, the cue box is offset from center after adjusting the width. This is because when we specify center alignment, what happens is that we actually calculate the left/top css value such that the cue looks centered. Thus we also need to adjust the left/top property value (by the difference in width / 2) if we're not centered such that the box remained in the center. 1028356 1 236413 roger_fong 2014-08-11 16:37:25 -0700 Created attachment 236413 patch 1028362 2 236413 bfulgham 2014-08-11 16:59:49 -0700 Comment on attachment 236413 patch View in context: https://bugs.webkit.org/attachment.cgi?id=236413&action=review r=me, but please address the possible zero-base-font-size issue I mentioned. > Source/WebCore/html/track/TextTrackCueGeneric.cpp:82 > + double authorFontSize = videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100.0; Can baseFontSizeRelativeToVideoHeight ever be zero (I think it can be)? If the author could arbitrarily set this to zero, I think we should check and fall back to that minimum (10 pt) value from the CSS. 1028365 3 roger_fong 2014-08-11 17:14:39 -0700 committed with review commented applied: http://trac.webkit.org/changeset/172421 236413 2014-08-11 16:37:25 -0700 2014-08-11 16:59:48 -0700 patch patch.patch text/plain 7891 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjQxNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA4LTExICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRqdXN0bWVudHMgdG8gQ3Vl Qm94IENTUyBXaWR0aCBjYWxjdWxhdGlvbnMgUGFydCAyLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1ODIwCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8xNzk1NDQ3Mz4uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVHdvIGFkanVzdG1lbnRzIG1hZGU6CisgICAgICAgIGEpIFRoZSBkZWZhdWx0IGZvbnQg c2l6ZSB1c2VkIHdhcyBpbmNvcnJlY3QuIEl0IGlzIG5vdCBqdXN0IDEwcHgsIAorICAgICAgICBi dXQgc2hvdWxkIGJlIGJhc2VkIG9mZiBhIHBlcmNlbnRhZ2Ugb2YgdGhlIHZpZGVvIHNpemUuCisg ICAgICAgIGIpIFRoZSB0b3AvbGVmdCBDU1MgcHJvcGVydHkgbmVlZHMgdG8gYmUgYWRqdXN0ZWQg YXBwcm9wcmlhdGVseSBpZiB0aGUgY3VlCisgICAgICAgIGlzIGNlbnRlciBhbGlnbmVkIGFuZCB3 ZSBjaGFuZ2UgdGhlIGN1ZSdzIHNpemUgc3VjaCB0aGF0IHRoZSBjdWUgcmVtYWlucyBjZW50ZXJl ZC4KKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6VGV4dFRyYWNrQ3VlR2VuZXJpY0JveEVsZW1lbnQ6OmFwcGx5Q1NTUHJvcGVy dGllcyk6CisgICAgICAgICogaHRtbC90cmFjay9WVFRDdWUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VlRUQ3VlQm94OjphcHBseUNTU1Byb3BlcnRpZXMpOgorICAgICAgICAqIGh0bWwvdHJhY2sv VlRUQ3VlLmg6IFJlbW92ZSB1bm5lY2Vzc2FyeSBjb25zdGFudC4KKwogMjAxNC0wOC0xMSAgQW50 dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUGFzcyBpbmhlcml0ZWQg c3R5bGUgb25seSB3aGVuIHJlc29sdmluZyB0cmVlIHN0eWxlCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlR2VuZXJpYy5jcHAJKHJldmlzaW9uIDE3 MjM1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlR2VuZXJpYy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTcwLDYgKzcwLDcgQEAgdm9pZCBUZXh0VHJhY2tDdWVHZW5l cmljQm94RWxlbWVudDo6YXBwbAogICAgIFRleHRUcmFja0N1ZUdlbmVyaWMqIGN1ZSA9IHN0YXRp Y19jYXN0PFRleHRUcmFja0N1ZUdlbmVyaWMqPihnZXRDdWUoKSk7CiAgICAgUmVmUHRyPEhUTUxT cGFuRWxlbWVudD4gY3VlRWxlbWVudCA9IGN1ZS0+ZWxlbWVudCgpOwogCisgICAgQ1NTVmFsdWVJ RCBhbGlnbm1lbnQgPSBjdWUtPmdldENTU0FsaWdubWVudCgpOwogICAgIGZsb2F0IHNpemUgPSBz dGF0aWNfY2FzdDxmbG9hdD4oY3VlLT5nZXRDU1NTaXplKCkpOwogICAgIGlmIChjdWUtPnVzZURl ZmF1bHRQb3NpdGlvbigpKSB7CiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJv cGVydHlCb3R0b20sIDAsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwpAQCAtNzgsMTUgKzc5 LDIxIEBAIHZvaWQgVGV4dFRyYWNrQ3VlR2VuZXJpY0JveEVsZW1lbnQ6OmFwcGwKICAgICAgICAg c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUxlZnQsIHN0YXRpY19jYXN0PGZsb2F0 PihjdWUtPnBvc2l0aW9uKCkpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwog ICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VG9wLCBzdGF0aWNfY2Fz dDxmbG9hdD4oY3VlLT5saW5lKCkpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0Up OwogCi0gICAgICAgIGRvdWJsZSBhdXRob3JGb250U2l6ZSA9IHN0ZDo6bWF4KERFRkFVTFRDQVBU SU9ORk9OVFNJWkUsIHZpZGVvU2l6ZS5oZWlnaHQoKSAqIGN1ZS0+YmFzZUZvbnRTaXplUmVsYXRp dmVUb1ZpZGVvSGVpZ2h0KCkgLyAxMDAuMCk7CisgICAgICAgIGRvdWJsZSBhdXRob3JGb250U2l6 ZSA9IHZpZGVvU2l6ZS5oZWlnaHQoKSAqIGN1ZS0+YmFzZUZvbnRTaXplUmVsYXRpdmVUb1ZpZGVv SGVpZ2h0KCkgLyAxMDAuMDsKICAgICAgICAgaWYgKGN1ZS0+Zm9udFNpemVNdWx0aXBsaWVyKCkp CiAgICAgICAgICAgICBhdXRob3JGb250U2l6ZSAqPSBjdWUtPmZvbnRTaXplTXVsdGlwbGllcigp IC8gMTAwOwogCi0gICAgICAgIGRvdWJsZSBtdWx0aXBsaWVyID0gc3RkOjptYXgoMS4wLCBtX2Zv bnRTaXplRnJvbUNhcHRpb25Vc2VyUHJlZnMgLyBhdXRob3JGb250U2l6ZSk7Ci0gICAgICAgIGlm IChjdWUtPmdldFdyaXRpbmdEaXJlY3Rpb24oKSA9PSBWVFRDdWU6Okhvcml6b250YWwpCi0gICAg ICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5V2lkdGgsIHN0ZDo6bWlu KHNpemUgKiBtdWx0aXBsaWVyLCAxMDAuMCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VO VEFHRSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHko Q1NTUHJvcGVydHlIZWlnaHQsIHN0ZDo6bWluKHNpemUgKiBtdWx0aXBsaWVyLCAxMDAuMCksICBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOworICAgICAgICBkb3VibGUgbXVsdGlw bGllciA9IG1fZm9udFNpemVGcm9tQ2FwdGlvblVzZXJQcmVmcyAvIGF1dGhvckZvbnRTaXplOwor ICAgICAgICBkb3VibGUgbmV3Q3VlU2l6ZSA9IHN0ZDo6bWluKHNpemUgKiBtdWx0aXBsaWVyLCAx MDAuMCk7CisgICAgICAgIGlmIChjdWUtPmdldFdyaXRpbmdEaXJlY3Rpb24oKSA9PSBWVFRDdWU6 Okhvcml6b250YWwpIHsKKyAgICAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJv cGVydHlXaWR0aCwgbmV3Q3VlU2l6ZSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdF KTsKKyAgICAgICAgICAgIGlmICgoYWxpZ25tZW50ID09IENTU1ZhbHVlTWlkZGxlIHx8IGFsaWdu bWVudCA9PSBDU1NWYWx1ZUNlbnRlcikgJiYgbXVsdGlwbGllciAhPSAxLjApCisgICAgICAgICAg ICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUxlZnQsIHN0YXRpY19jYXN0 PGRvdWJsZT4oY3VlLT5wb3NpdGlvbigpIC0gKG5ld0N1ZVNpemUgLSBtX2N1ZS5nZXRDU1NTaXpl KCkpIC8gMiksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSk7CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5SGVp Z2h0LCBuZXdDdWVTaXplLCAgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsKKyAg ICAgICAgICAgIGlmICgoYWxpZ25tZW50ID09IENTU1ZhbHVlTWlkZGxlIHx8IGFsaWdubWVudCA9 PSBDU1NWYWx1ZUNlbnRlcikgJiYgbXVsdGlwbGllciAhPSAxLjApCisgICAgICAgICAgICAgICAg c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVRvcCwgc3RhdGljX2Nhc3Q8ZG91Ymxl PihjdWUtPmxpbmUoKSAtIChuZXdDdWVTaXplIC0gbV9jdWUuZ2V0Q1NTU2l6ZSgpKSAvIDIpLCBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOworICAgICAgICB9CiAgICAgfQogCiAg ICAgc3RkOjpwYWlyPGZsb2F0LCBmbG9hdD4gcG9zaXRpb24gPSBtX2N1ZS5nZXRDU1NQb3NpdGlv bigpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WVFRDdWUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRUQ3VlLmNwcAkocmV2aXNpb24gMTcy MzUxKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WVFRDdWUuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01OCw2ICs1OCw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorLy8gVGhpcyBj b25zdGFudCBzaG91bGQgY29ycmVzcG9uZCB3aXRoIHRoZSBwZXJjZW50YWdlIHJldHVybmVkIGJ5 IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OmNhcHRpb25Gb250U2l6ZVNjYWxlQW5kSW1wb3J0YW5j ZS4KK2NvbnN0IHN0YXRpYyBkb3VibGUgREVGQVVMVENBUFRJT05GT05UU0laRVBFUkNFTlRBR0Ug PSA1OworCiBzdGF0aWMgY29uc3QgaW50IHVuZGVmaW5lZFBvc2l0aW9uID0gLTE7CiAKIHN0YXRp YyBjb25zdCBDU1NWYWx1ZUlEIGRpc3BsYXlXcml0aW5nTW9kZU1hcFtdID0gewpAQCAtMTM4LDcg KzE0MSw3IEBAIFZUVEN1ZSogVlRUQ3VlQm94OjpnZXRDdWUoKSBjb25zdAogICAgIHJldHVybiAm bV9jdWU7CiB9CiAKLXZvaWQgVlRUQ3VlQm94OjphcHBseUNTU1Byb3BlcnRpZXMoY29uc3QgSW50 U2l6ZSYpCit2b2lkIFZUVEN1ZUJveDo6YXBwbHlDU1NQcm9wZXJ0aWVzKGNvbnN0IEludFNpemUm IHZpZGVvU2l6ZSkKIHsKICAgICAvLyBGSVhNRTogQXBwbHkgYWxsIHRoZSBpbml0aWFsIENTUyBw b3NpdGlvbmluZyBwcm9wZXJ0aWVzLiBodHRwOi8vd2tiLnVnLzc5OTE2CiAjaWYgRU5BQkxFKFdF QlZUVF9SRUdJT05TKQpAQCAtMTcwLDE4ICsxNzMsMjggQEAgdm9pZCBWVFRDdWVCb3g6OmFwcGx5 Q1NTUHJvcGVydGllcyhjb25zdAogICAgIC8vIHRoZSAnbGVmdCcgcHJvcGVydHkgbXVzdCBiZSBz ZXQgdG8gbGVmdAogICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlMZWZ0LCBz dGF0aWNfY2FzdDxkb3VibGU+KHBvc2l0aW9uLmZpcnN0KSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U19QRVJDRU5UQUdFKTsKIAotICAgIGRvdWJsZSBtdWx0aXBsaWVyID0gc3RkOjptYXgoMS4wLCBt X2ZvbnRTaXplRnJvbUNhcHRpb25Vc2VyUHJlZnMgLyBERUZBVUxUQ0FQVElPTkZPTlRTSVpFKTsK KyAgICBkb3VibGUgYXV0aG9yRm9udFNpemUgPSBzdGQ6Om1pbih2aWRlb1NpemUud2lkdGgoKSwg dmlkZW9TaXplLmhlaWdodCgpKSAqIERFRkFVTFRDQVBUSU9ORk9OVFNJWkVQRVJDRU5UQUdFIC8g MTAwLjA7CisgICAgZG91YmxlIG11bHRpcGxpZXIgPSAxLjA7CisgICAgaWYgKGF1dGhvckZvbnRT aXplKQorICAgICAgICBtdWx0aXBsaWVyID0gbV9mb250U2l6ZUZyb21DYXB0aW9uVXNlclByZWZz IC8gYXV0aG9yRm9udFNpemU7CisKKyAgICBkb3VibGUgbmV3Q3VlU2l6ZSA9IHN0ZDo6bWluKG1f Y3VlLmdldENTU1NpemUoKSAqIG11bHRpcGxpZXIsIDEwMC4wKTsKKyAgICBDU1NWYWx1ZUlEIGFs aWdubWVudCA9IG1fY3VlLmdldENTU0FsaWdubWVudCgpOwogICAgIC8vIHRoZSAnd2lkdGgnIHBy b3BlcnR5IG11c3QgYmUgc2V0IHRvIHdpZHRoLCBhbmQgdGhlICdoZWlnaHQnIHByb3BlcnR5ICBt dXN0IGJlIHNldCB0byBoZWlnaHQKICAgICBpZiAobV9jdWUudmVydGljYWwoKSA9PSBob3Jpem9u dGFsS2V5d29yZCgpKSB7Ci0gICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVy dHlXaWR0aCwgc3RkOjptaW4obV9jdWUuZ2V0Q1NTU2l6ZSgpICogbXVsdGlwbGllciwgMTAwLjAp LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOworICAgICAgICBzZXRJbmxpbmVT dHlsZVByb3BlcnR5KENTU1Byb3BlcnR5V2lkdGgsIG5ld0N1ZVNpemUsIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfUEVSQ0VOVEFHRSk7CiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NT UHJvcGVydHlIZWlnaHQsIENTU1ZhbHVlQXV0byk7CiAgICAgICAgIHNldElubGluZVN0eWxlUHJv cGVydHkoQ1NTUHJvcGVydHlNaW5XaWR0aCwgIi13ZWJraXQtbWluLWNvbnRlbnQiKTsKICAgICAg ICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1heFdpZHRoLCAxMDAuMCAtIHBv c2l0aW9uLmZpcnN0LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOworICAgICAg ICBpZiAoKGFsaWdubWVudCA9PSBDU1NWYWx1ZU1pZGRsZSB8fCBhbGlnbm1lbnQgPT0gQ1NTVmFs dWVDZW50ZXIpICYmIG11bHRpcGxpZXIgIT0gMS4wKQorICAgICAgICAgICAgc2V0SW5saW5lU3R5 bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUxlZnQsIHN0YXRpY19jYXN0PGRvdWJsZT4ocG9zaXRpb24u Zmlyc3QgLSAobmV3Q3VlU2l6ZSAtIG1fY3VlLmdldENTU1NpemUoKSkgLyAyKSwgQ1NTUHJpbWl0 aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsKICAgICB9IGVsc2UgewogICAgICAgICBzZXRJbmxp bmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5V2lkdGgsIENTU1ZhbHVlQXV0byk7Ci0gICAgICAg IHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlIZWlnaHQsIHN0ZDo6bWluKG1fY3Vl LmdldENTU1NpemUoKSAqIG11bHRpcGxpZXIsIDEwMC4wKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U19QRVJDRU5UQUdFKTsKKyAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eUhlaWdodCwgbmV3Q3VlU2l6ZSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsK ICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1pbkhlaWdodCwgIi13 ZWJraXQtbWluLWNvbnRlbnQiKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQ cm9wZXJ0eU1heEhlaWdodCwgMTAwLjAgLSBwb3NpdGlvbi5zZWNvbmQsIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfUEVSQ0VOVEFHRSk7CisgICAgICAgIGlmICgoYWxpZ25tZW50ID09IENTU1ZhbHVl TWlkZGxlIHx8IGFsaWdubWVudCA9PSBDU1NWYWx1ZUNlbnRlcikgJiYgbXVsdGlwbGllciAhPSAx LjApCisgICAgICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VG9wLCBz dGF0aWNfY2FzdDxkb3VibGU+KHBvc2l0aW9uLnNlY29uZCAtIChuZXdDdWVTaXplIC0gbV9jdWUu Z2V0Q1NTU2l6ZSgpKSAvIDIpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwog ICAgIH0KIAogICAgIC8vIFRoZSAndGV4dC1hbGlnbicgcHJvcGVydHkgb24gdGhlIChyb290KSBM aXN0IG9mIFdlYlZUVCBOb2RlIE9iamVjdHMgbXVzdApJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC90cmFjay9WVFRDdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNr L1ZUVEN1ZS5oCShyZXZpc2lvbiAxNzIzNTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNr L1ZUVEN1ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw5ICs0OSw2IEBAIGNsYXNzIFZUVEN1ZTsK IGNsYXNzIFZUVFNjYW5uZXI7CiBjbGFzcyBXZWJWVFRDdWVEYXRhOwogCi0vLyBUaGlzIGRlZmF1 bHQgdmFsdWUgbXVzdCBiZSB0aGUgc2FtZSBhcyB0aGUgb25lIHNwZWNpZmllZCBpbiBtZWRpYUNv bnRyb2xzQXBwbGUuY3NzIGZvciAtd2Via2l0LW1lZGlhLWNvbnRyb2xzLWNsb3NlZC1jYXB0aW9u cy1jb250YWluZXIKLWNvbnN0IHN0YXRpYyBkb3VibGUgREVGQVVMVENBUFRJT05GT05UU0laRSA9 IDEwOwotCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIGNsYXNzIFZUVEN1ZUJv eCA6IHB1YmxpYyBIVE1MRWxlbWVudCB7Cg==