186387 2018-06-07 01:20:33 -0700 [Win][MiniBrowser] MiniBrowser::updateDeviceScaleFactor should be a MainWindow's method 2018-06-07 19:20:21 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184770 1 fujii fujii achristensen bfulgham lforschler pvollan rniwa webkit-bug-importer oldest_to_newest 1430770 0 fujii 2018-06-07 01:20:33 -0700 [Win][MiniBrowser] Convert MiniBrowser::updateDeviceScaleFactor to a MainWindow's method MiniBrowser::updateDeviceScaleFactor does nothing for MiniBrowser. It should be a MainWindow's method. 1430771 1 342139 fujii 2018-06-07 01:26:46 -0700 Created attachment 342139 Patch 1431002 2 342139 rniwa 2018-06-07 13:15:14 -0700 Comment on attachment 342139 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342139&action=review > Tools/MiniBrowser/win/MainWindow.cpp:426 > + m_hURLBarFont = ::CreateFont(scaleFactor * 18, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, Where did 18 come from!? 1431102 3 342139 fujii 2018-06-07 18:54:23 -0700 Comment on attachment 342139 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342139&action=review Thank you very much for the review. >> Tools/MiniBrowser/win/MainWindow.cpp:426 >> + m_hURLBarFont = ::CreateFont(scaleFactor * 18, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, > > Where did 18 come from!? Good question! urlBarHeight is 24. It should be urlBarHeight * 3.0 / 4. 1431107 4 342230 fujii 2018-06-07 19:13:21 -0700 Created attachment 342230 Patch 1431111 5 fujii 2018-06-07 19:20:00 -0700 Committed r232609: <https://trac.webkit.org/changeset/232609> 1431112 6 webkit-bug-importer 2018-06-07 19:20:21 -0700 <rdar://problem/40920937> 342139 2018-06-07 01:26:46 -0700 2018-06-07 19:13:18 -0700 Patch bug-186387-20180607172644.patch text/plain 6748 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTJkNDIxOGE1MjIyMTgzMDdiYzA3NGFiMTJmNDU0N2Nh NDRlNmM1MS4uMzllYjI2OWYwMDEyZDk2NDhjMmYyMmFhNmQ1YTFiNjdjMDcwMzRhZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDE4LTA2LTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBDb252ZXJ0IE1pbmlCcm93c2VyOjp1cGRh dGVEZXZpY2VTY2FsZUZhY3RvciB0byBhIE1haW5XaW5kb3cncyBtZXRob2QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjM4NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1pbmlCcm93c2VyOjp1cGRhdGVE ZXZpY2VTY2FsZUZhY3RvciBkb2VzIG5vdGhpbmcgZm9yIE1pbmlCcm93c2VyLgorICAgICAgICBJ dCBzaG91bGQgYmUgYSBNYWluV2luZG93J3MgbWV0aG9kLgorCisgICAgICAgICogTWluaUJyb3dz ZXIvd2luL01haW5XaW5kb3cuY3BwOgorICAgICAgICAoTWFpbldpbmRvdzo6aW5pdCk6IENhbGwg TWFpbldpbmRvdzo6dXBkYXRlRGV2aWNlU2NhbGVGYWN0b3IuCisgICAgICAgIChNYWluV2luZG93 OjpyZXNpemVTdWJWaWV3cyk6IERvIG5vdCBzZXQgYSBmb250IGV2ZXJ5IHRpbWUgd2luZG93IHNp emUgaXMgY2hhbmdlZC4KKyAgICAgICAgKE1haW5XaW5kb3c6OlduZFByb2MpOiBDYWxsIE1haW5X aW5kb3c6OnVwZGF0ZURldmljZVNjYWxlRmFjdG9yIG9uIFdNX0RQSUNIQU5HRUQuCisgICAgICAg IChNYWluV2luZG93Ojp1cGRhdGVEZXZpY2VTY2FsZUZhY3Rvcik6IENvbnZlcnRlZCBmcm9tCisg ICAgICAgIE1pbmlCcm93c2VyOjp1cGRhdGVEZXZpY2VTY2FsZUZhY3RvciBhbmQKKyAgICAgICAg TWluaUJyb3dzZXI6OmdlbmVyYXRlRm9udEZvclNjYWxlRmFjdG9yLiBTZXQgYSBVUkwgYmFyJ3Mg Zm9udCBpZiBEUEkgaXMgY2hhbmdlZC4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWFpbldp bmRvdy5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHA6CisgICAg ICAgIChNaW5pQnJvd3Nlcjo6aW5pdCk6CisgICAgICAgIChNaW5pQnJvd3Nlcjo6Z2VuZXJhdGVG b250Rm9yU2NhbGVGYWN0b3IpOiBEZWxldGVkLgorICAgICAgICAoTWluaUJyb3dzZXI6OnVwZGF0 ZURldmljZVNjYWxlRmFjdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4v TWluaUJyb3dzZXIuaDoKKyAgICAgICAgKE1pbmlCcm93c2VyOjpkZXZpY2VTY2FsZUZhY3Rvcik6 IERlbGV0ZWQuCisgICAgICAgIChNaW5pQnJvd3Nlcjo6dXJsQmFyRm9udCk6IERlbGV0ZWQuCisK IDIwMTgtMDYtMDcgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAK ICAgICAgICAgW1dpbl1bTWluaUJyb3dzZXJdIFN1cHBvcnQgbXVsdGlwbGUgd2luZG93cyBwcm9w ZXJseQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwIGIv VG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwCmluZGV4IDUxODMxYTMxZGM0NWI4 ZmM1ZTJjNTdiZTYxODdjNzZhM2RhMWFiZjQuLjliOGY3MjNhZmI5Mjk2ZmZmNTBkNTFhYzMyMzY3 M2M5MjY4NDE3YjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93 LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAKQEAgLTExOSw2 ICsxMTksNyBAQCBib29sIE1haW5XaW5kb3c6OmluaXQoSElOU1RBTkNFIGhJbnN0YW5jZSwgYm9v bCB1c2VzTGF5ZXJlZFdlYlZpZXcsIGJvb2wgcGFnZUxvYQogICAgIGlmIChGQUlMRUQoaHIpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICB1cGRhdGVEZXZpY2VTY2FsZUZhY3RvcigpOwog ICAgIHJlc2l6ZVN1YlZpZXdzKCk7CiAgICAgU2V0Rm9jdXMobV9oVVJMQmFyV25kKTsKICAgICBy ZXR1cm4gdHJ1ZTsKQEAgLTEzOSw4ICsxNDAsNiBAQCB2b2lkIE1haW5XaW5kb3c6OnJlc2l6ZVN1 YlZpZXdzKCkKICAgICBNb3ZlV2luZG93KG1faEZvcndhcmRCdXR0b25XbmQsIHdpZHRoLCAwLCB3 aWR0aCwgaGVpZ2h0LCBUUlVFKTsKICAgICBNb3ZlV2luZG93KG1faFVSTEJhclduZCwgd2lkdGgg KiAyLCAwLCByY0NsaWVudC5yaWdodCwgaGVpZ2h0LCBUUlVFKTsKIAotICAgIDo6U2VuZE1lc3Nh Z2UobV9oVVJMQmFyV25kLCBzdGF0aWNfY2FzdDxVSU5UPihXTV9TRVRGT05UKSwgcmVpbnRlcnBy ZXRfY2FzdDxXUEFSQU0+KG1fYnJvd3NlcldpbmRvdy0+dXJsQmFyRm9udCgpKSwgVFJVRSk7Ci0K ICAgICBpZiAobV9icm93c2VyV2luZG93LT51c2VzTGF5ZXJlZFdlYlZpZXcoKSB8fCAhbV9icm93 c2VyV2luZG93LT5od25kKCkpCiAgICAgICAgIHJldHVybjsKICAgICBNb3ZlV2luZG93KG1fYnJv d3NlcldpbmRvdy0+aHduZCgpLCAwLCBoZWlnaHQsIHJjQ2xpZW50LnJpZ2h0LCByY0NsaWVudC5i b3R0b20gLSBoZWlnaHQsIFRSVUUpOwpAQCAtMjI5LDcgKzIyOCw3IEBAIExSRVNVTFQgQ0FMTEJB Q0sgTWFpbldpbmRvdzo6V25kUHJvYyhIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQ YXJhbSwgTFBBCiAgICAgICAgIHRoaXNXaW5kb3ctPnJlc2l6ZVN1YlZpZXdzKCk7CiAgICAgICAg IGJyZWFrOwogICAgIGNhc2UgV01fRFBJQ0hBTkdFRDoKLSAgICAgICAgdGhpc1dpbmRvdy0+YnJv d3NlcldpbmRvdygpLT51cGRhdGVEZXZpY2VTY2FsZUZhY3RvcigpOworICAgICAgICB0aGlzV2lu ZG93LT51cGRhdGVEZXZpY2VTY2FsZUZhY3RvcigpOwogICAgICAgICByZXR1cm4gRGVmV2luZG93 UHJvYyhoV25kLCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSk7CiAgICAgZGVmYXVsdDoKICAgICAg ICAgcmV0dXJuIERlZldpbmRvd1Byb2MoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOwpA QCAtNDE4LDMgKzQxNywxMyBAQCB2b2lkIE1haW5XaW5kb3c6Om9uVVJMQmFyRW50ZXIoKQogICAg IF9ic3RyX3QgYnN0cihzdHJQdHIpOwogICAgIGxvYWRVUkwoYnN0ci5HZXRCU1RSKCkpOwogfQor Cit2b2lkIE1haW5XaW5kb3c6OnVwZGF0ZURldmljZVNjYWxlRmFjdG9yKCkKK3sKKyAgICBpZiAo bV9oVVJMQmFyRm9udCkKKyAgICAgICAgOjpEZWxldGVPYmplY3QobV9oVVJMQmFyRm9udCk7Cisg ICAgYXV0byBzY2FsZUZhY3RvciA9IFdlYkNvcmU6OmRldmljZVNjYWxlRmFjdG9yRm9yV2luZG93 KG1faE1haW5XbmQpOworICAgIG1faFVSTEJhckZvbnQgPSA6OkNyZWF0ZUZvbnQoc2NhbGVGYWN0 b3IgKiAxOCwgMCwgMCwgMCwgRldfTk9STUFMLCBGQUxTRSwgRkFMU0UsIEZBTFNFLCBERUZBVUxU X0NIQVJTRVQsCisgICAgICAgIE9VVF9UVF9PTkxZX1BSRUNJUywgQ0xJUF9ERUZBVUxUX1BSRUNJ UywgQU5USUFMSUFTRURfUVVBTElUWSwgRkZfRE9OVENBUkUsIEwiVGltZXMgTmV3IFJvbWFuIik7 CisgICAgOjpTZW5kTWVzc2FnZShtX2hVUkxCYXJXbmQsIHN0YXRpY19jYXN0PFVJTlQ+KFdNX1NF VEZPTlQpLCByZWludGVycHJldF9jYXN0PFdQQVJBTT4obV9oVVJMQmFyRm9udCksIFRSVUUpOwor fQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaCBiL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmgKaW5kZXggODFkOGRkMDE4YzNjMmY4OTkzYThj NzE4ZjlhNTQxNmFjYjcyMzFjNi4uMmRlNGI0Nzc1NmM1ODM5NWRjNzAzMjk4ZGEyNjNiYTdlZGY4 NjA2NCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaAorKysg Yi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCkBAIC01NCwxMSArNTQsMTMgQEAg cHJpdmF0ZToKICAgICBNYWluV2luZG93KCk7CiAgICAgYm9vbCB0b2dnbGVNZW51SXRlbShVSU5U IG1lbnVJRCk7CiAgICAgdm9pZCBvblVSTEJhckVudGVyKCk7CisgICAgdm9pZCB1cGRhdGVEZXZp Y2VTY2FsZUZhY3RvcigpOwogCiAgICAgSFdORCBtX2hNYWluV25kIHsgbnVsbHB0ciB9OwogICAg IEhXTkQgbV9oVVJMQmFyV25kIHsgbnVsbHB0ciB9OwogICAgIEhXTkQgbV9oQmFja0J1dHRvbldu ZCB7IG51bGxwdHIgfTsKICAgICBIV05EIG1faEZvcndhcmRCdXR0b25XbmQgeyBudWxscHRyIH07 CiAgICAgSFdORCBtX2hDYWNoZVduZCB7IG51bGxwdHIgfTsKKyAgICBIR0RJT0JKIG1faFVSTEJh ckZvbnQgeyBudWxscHRyIH07CiAgICAgUmVmUHRyPE1pbmlCcm93c2VyPiBtX2Jyb3dzZXJXaW5k b3c7CiB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyLmNw cCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHAKaW5kZXggYzU3ODE1Yjk0 MjI1YjIxNzA5MGY3Y2FkYjdjM2Q5NzkyOGNlMmMxOC4uNjAyYWQ2ZmQwMzJjYjQyNTBjZTVkZjkz NTc4ODVhZDUyMzkzNzc1MiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlC cm93c2VyLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuY3BwCkBA IC04OCw4ICs4OCw2IEBAIFVMT05HIE1pbmlCcm93c2VyOjpSZWxlYXNlKCkKIAogSFJFU1VMVCBN aW5pQnJvd3Nlcjo6aW5pdCgpCiB7Ci0gICAgdXBkYXRlRGV2aWNlU2NhbGVGYWN0b3IoKTsKLQog ICAgIEhSRVNVTFQgaHIgPSBXZWJLaXRDcmVhdGVJbnN0YW5jZShDTFNJRF9XZWJWaWV3LCAwLCBJ SURfSVdlYlZpZXcsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmbV93ZWJWaWV3LkdldEludGVy ZmFjZVB0cigpKSk7CiAgICAgaWYgKEZBSUxFRChocikpCiAgICAgICAgIHJldHVybiBocjsKQEAg LTYyNywyMiArNjI1LDYgQEAgdm9pZCBNaW5pQnJvd3Nlcjo6c2hvd0xheWVyVHJlZSgpCiAgICAg T3V0cHV0RGVidWdTdHJpbmcoTCJcblxuIik7CiB9CiAKLXZvaWQgTWluaUJyb3dzZXI6OmdlbmVy YXRlRm9udEZvclNjYWxlRmFjdG9yKGZsb2F0IHNjYWxlRmFjdG9yKQotewotICAgIGlmIChtX2hV UkxCYXJGb250KQotICAgICAgICA6OkRlbGV0ZU9iamVjdChtX2hVUkxCYXJGb250KTsKLQotICAg IG1faFVSTEJhckZvbnQgPSA6OkNyZWF0ZUZvbnQoc2NhbGVGYWN0b3IgKiAxOCwgMCwgMCwgMCwg RldfTk9STUFMLCBGQUxTRSwgRkFMU0UsIEZBTFNFLCBERUZBVUxUX0NIQVJTRVQsCi0gICAgICAg IE9VVF9UVF9PTkxZX1BSRUNJUywgQ0xJUF9ERUZBVUxUX1BSRUNJUywgQU5USUFMSUFTRURfUVVB TElUWSwgRkZfRE9OVENBUkUsIEwiVGltZXMgTmV3IFJvbWFuIik7Ci19Ci0KLQotdm9pZCBNaW5p QnJvd3Nlcjo6dXBkYXRlRGV2aWNlU2NhbGVGYWN0b3IoKQotewotICAgIG1fZGV2aWNlU2NhbGVG YWN0b3IgPSBXZWJDb3JlOjpkZXZpY2VTY2FsZUZhY3RvckZvcldpbmRvdyhtX2hNYWluV25kKTsK LSAgICBnZW5lcmF0ZUZvbnRGb3JTY2FsZUZhY3RvcihtX2RldmljZVNjYWxlRmFjdG9yKTsKLX0K LQogc3RhdGljIEJPT0wgQ0FMTEJBQ0sgQWJvcnRQcm9jKEhEQyBoREMsIGludCBFcnJvcikKIHsK ICAgICBNU0cgbXNnOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93 c2VyLmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuaAppbmRleCA1ZWNmNzE2 MDBhNTE3OGQ0MWU0YjU2NGExNjM0MTAzODJhNjBlYzNlLi5lYzU0MjhjNWFiZmZhZGIzNjExNTY2 OTg3ODBmZGM1Nzg5ZjE1ODVjIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWlu aUJyb3dzZXIuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuaApAQCAt MTAwLDEwICsxMDAsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNob3dMYXllclRyZWUoKTsKIAot ICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgeyByZXR1cm4gbV9kZXZpY2VTY2FsZUZhY3Rv cjsgfQotICAgIHZvaWQgdXBkYXRlRGV2aWNlU2NhbGVGYWN0b3IoKTsKLQotICAgIEhHRElPQkog dXJsQmFyRm9udCgpIHsgcmV0dXJuIG1faFVSTEJhckZvbnQ7IH0KICAgICBIV05EIGh3bmQoKSB7 IHJldHVybiBtX3ZpZXdXbmQ7IH0KIAogICAgIHZvaWQgcHJpbnQoKTsKQEAgLTExMyw3ICsxMDks NiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE1pbmlCcm93c2VyKEhXTkQgbWFpblduZCwgSFdO RCB1cmxCYXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcsIGJvb2wgcGFnZUxvYWRUZXN0aW5n KTsKICAgICB2b2lkIHN1YmNsYXNzRm9yTGF5ZXJlZFdpbmRvdygpOwotICAgIHZvaWQgZ2VuZXJh dGVGb250Rm9yU2NhbGVGYWN0b3IoZmxvYXQpOwogICAgIGJvb2wgc2V0Q2FjaGVGb2xkZXIoKTsK IAogICAgIHN0ZDo6dmVjdG9yPElXZWJIaXN0b3J5SXRlbVB0cj4gbV9oaXN0b3J5SXRlbXM7CkBA IC0xMzksOSArMTM0LDcgQEAgcHJpdmF0ZToKIAogICAgIEhXTkQgbV9oTWFpblduZCB7IG51bGxw dHIgfTsKICAgICBIV05EIG1faFVSTEJhclduZCB7IG51bGxwdHIgfTsKLSAgICBIR0RJT0JKIG1f aFVSTEJhckZvbnQgeyBudWxscHRyIH07CiAgICAgSFdORCBtX3ZpZXdXbmQgeyBudWxscHRyIH07 CiAKLSAgICBmbG9hdCBtX2RldmljZVNjYWxlRmFjdG9yIHsgMS4wZiB9OwogICAgIGJvb2wgbV91 c2VMYXllcmVkV2ViVmlldzsKIH07Cg== 342230 2018-06-07 19:13:21 -0700 2018-06-07 19:13:21 -0700 Patch bug-186387-20180608111319.patch text/plain 7238 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNjA4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmQ3YTFlNDJmMjRlNDg2OGNkMDEzOTYzNjVhYWU4MzU1 MGI5NzA2Ny4uOWYyOWU4MmRjYjUxNDg3ZWI5YjExMjEyMTcxMzYzZGU4ZmVlMTNiMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDE4LTA2LTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBNaW5pQnJvd3Nlcjo6dXBkYXRlRGV2aWNl U2NhbGVGYWN0b3Igc2hvdWxkIGJlIGEgTWFpbldpbmRvdydzIG1ldGhvZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2Mzg3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgIE1pbmlCcm93c2VyOjp1cGRhdGVEZXZp Y2VTY2FsZUZhY3RvciBkb2VzIG5vdGhpbmcgZm9yIE1pbmlCcm93c2VyLgorICAgICAgICBJdCBz aG91bGQgYmUgYSBNYWluV2luZG93J3MgbWV0aG9kLgorCisgICAgICAgICogTWluaUJyb3dzZXIv d2luL01haW5XaW5kb3cuY3BwOgorICAgICAgICAoTWFpbldpbmRvdzo6aW5pdCk6IENhbGwgTWFp bldpbmRvdzo6dXBkYXRlRGV2aWNlU2NhbGVGYWN0b3IuCisgICAgICAgIChNYWluV2luZG93Ojpy ZXNpemVTdWJWaWV3cyk6IERvIG5vdCBzZXQgYSBmb250IGV2ZXJ5IHRpbWUgd2luZG93IHNpemUg aXMgY2hhbmdlZC4KKyAgICAgICAgKE1haW5XaW5kb3c6OlduZFByb2MpOiBDYWxsIE1haW5XaW5k b3c6OnVwZGF0ZURldmljZVNjYWxlRmFjdG9yIG9uIFdNX0RQSUNIQU5HRUQuCisgICAgICAgIChN YWluV2luZG93Ojp1cGRhdGVEZXZpY2VTY2FsZUZhY3Rvcik6IENvbnZlcnRlZCBmcm9tCisgICAg ICAgIE1pbmlCcm93c2VyOjp1cGRhdGVEZXZpY2VTY2FsZUZhY3RvciBhbmQKKyAgICAgICAgTWlu aUJyb3dzZXI6OmdlbmVyYXRlRm9udEZvclNjYWxlRmFjdG9yLiBTZXQgYSBVUkwgYmFyJ3MgZm9u dCBpZiBEUEkgaXMgY2hhbmdlZC4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWFpbldpbmRv dy5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHA6CisgICAgICAg IChNaW5pQnJvd3Nlcjo6aW5pdCk6CisgICAgICAgIChNaW5pQnJvd3Nlcjo6Z2VuZXJhdGVGb250 Rm9yU2NhbGVGYWN0b3IpOiBEZWxldGVkLgorICAgICAgICAoTWluaUJyb3dzZXI6OnVwZGF0ZURl dmljZVNjYWxlRmFjdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWlu aUJyb3dzZXIuaDoKKyAgICAgICAgKE1pbmlCcm93c2VyOjpkZXZpY2VTY2FsZUZhY3Rvcik6IERl bGV0ZWQuCisgICAgICAgIChNaW5pQnJvd3Nlcjo6dXJsQmFyRm9udCk6IERlbGV0ZWQuCisKIDIw MTgtMDYtMDcgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAg IFt3ZWJraXRweV0gVHJlYXQgc3ZuIHZlcnNpb25zIGFzIFZlcnNpb24gb2JqZWN0cwpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJy b3dzZXIvd2luL01haW5XaW5kb3cuY3BwCmluZGV4IDUxODMxYTMxZGM0NWI4ZmM1ZTJjNTdiZTYx ODdjNzZhM2RhMWFiZjQuLmI5YWFjN2ZiY2I2OTU2MzIwZTEwOWUyMDE1ZWNhOWFmYWU4NGFhMTYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcAorKysgYi9U b29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAKQEAgLTM0LDYgKzM0LDcgQEAgZmxv YXQgZGV2aWNlU2NhbGVGYWN0b3JGb3JXaW5kb3coSFdORCk7CiB9CiAKIHN0YXRpYyBjb25zdGV4 cHIgaW50IGNvbnRyb2xCdXR0b25XaWR0aCA9IDI0Oworc3RhdGljIGNvbnN0ZXhwciBpbnQgdXJs QmFySGVpZ2h0ID0gMjQ7CiAKIHN0YXRpYyBXTkRQUk9DIERlZkVkaXRQcm9jID0gbnVsbHB0cjsK IApAQCAtMTE5LDYgKzEyMCw3IEBAIGJvb2wgTWFpbldpbmRvdzo6aW5pdChISU5TVEFOQ0UgaElu c3RhbmNlLCBib29sIHVzZXNMYXllcmVkV2ViVmlldywgYm9vbCBwYWdlTG9hCiAgICAgaWYgKEZB SUxFRChocikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIHVwZGF0ZURldmljZVNjYWxl RmFjdG9yKCk7CiAgICAgcmVzaXplU3ViVmlld3MoKTsKICAgICBTZXRGb2N1cyhtX2hVUkxCYXJX bmQpOwogICAgIHJldHVybiB0cnVlOwpAQCAtMTMxLDcgKzEzMyw2IEBAIHZvaWQgTWFpbldpbmRv dzo6cmVzaXplU3ViVmlld3MoKQogICAgIFJFQ1QgcmNDbGllbnQ7CiAgICAgR2V0Q2xpZW50UmVj dChtX2hNYWluV25kLCAmcmNDbGllbnQpOwogCi0gICAgY29uc3RleHByIGludCB1cmxCYXJIZWln aHQgPSAyNDsKICAgICBpbnQgaGVpZ2h0ID0gc2NhbGVGYWN0b3IgKiB1cmxCYXJIZWlnaHQ7CiAg ICAgaW50IHdpZHRoID0gc2NhbGVGYWN0b3IgKiBjb250cm9sQnV0dG9uV2lkdGg7CiAKQEAgLTEz OSw4ICsxNDAsNiBAQCB2b2lkIE1haW5XaW5kb3c6OnJlc2l6ZVN1YlZpZXdzKCkKICAgICBNb3Zl V2luZG93KG1faEZvcndhcmRCdXR0b25XbmQsIHdpZHRoLCAwLCB3aWR0aCwgaGVpZ2h0LCBUUlVF KTsKICAgICBNb3ZlV2luZG93KG1faFVSTEJhclduZCwgd2lkdGggKiAyLCAwLCByY0NsaWVudC5y aWdodCwgaGVpZ2h0LCBUUlVFKTsKIAotICAgIDo6U2VuZE1lc3NhZ2UobV9oVVJMQmFyV25kLCBz dGF0aWNfY2FzdDxVSU5UPihXTV9TRVRGT05UKSwgcmVpbnRlcnByZXRfY2FzdDxXUEFSQU0+KG1f YnJvd3NlcldpbmRvdy0+dXJsQmFyRm9udCgpKSwgVFJVRSk7Ci0KICAgICBpZiAobV9icm93c2Vy V2luZG93LT51c2VzTGF5ZXJlZFdlYlZpZXcoKSB8fCAhbV9icm93c2VyV2luZG93LT5od25kKCkp CiAgICAgICAgIHJldHVybjsKICAgICBNb3ZlV2luZG93KG1fYnJvd3NlcldpbmRvdy0+aHduZCgp LCAwLCBoZWlnaHQsIHJjQ2xpZW50LnJpZ2h0LCByY0NsaWVudC5ib3R0b20gLSBoZWlnaHQsIFRS VUUpOwpAQCAtMjI5LDcgKzIyOCw3IEBAIExSRVNVTFQgQ0FMTEJBQ0sgTWFpbldpbmRvdzo6V25k UHJvYyhIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBCiAgICAgICAg IHRoaXNXaW5kb3ctPnJlc2l6ZVN1YlZpZXdzKCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug V01fRFBJQ0hBTkdFRDoKLSAgICAgICAgdGhpc1dpbmRvdy0+YnJvd3NlcldpbmRvdygpLT51cGRh dGVEZXZpY2VTY2FsZUZhY3RvcigpOworICAgICAgICB0aGlzV2luZG93LT51cGRhdGVEZXZpY2VT Y2FsZUZhY3RvcigpOwogICAgICAgICByZXR1cm4gRGVmV2luZG93UHJvYyhoV25kLCBtZXNzYWdl LCB3UGFyYW0sIGxQYXJhbSk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIERlZldpbmRv d1Byb2MoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOwpAQCAtNDE4LDMgKzQxNywxNCBA QCB2b2lkIE1haW5XaW5kb3c6Om9uVVJMQmFyRW50ZXIoKQogICAgIF9ic3RyX3QgYnN0cihzdHJQ dHIpOwogICAgIGxvYWRVUkwoYnN0ci5HZXRCU1RSKCkpOwogfQorCit2b2lkIE1haW5XaW5kb3c6 OnVwZGF0ZURldmljZVNjYWxlRmFjdG9yKCkKK3sKKyAgICBpZiAobV9oVVJMQmFyRm9udCkKKyAg ICAgICAgOjpEZWxldGVPYmplY3QobV9oVVJMQmFyRm9udCk7CisgICAgYXV0byBzY2FsZUZhY3Rv ciA9IFdlYkNvcmU6OmRldmljZVNjYWxlRmFjdG9yRm9yV2luZG93KG1faE1haW5XbmQpOworICAg IGludCBmb250SGVpZ2h0ID0gc2NhbGVGYWN0b3IgKiB1cmxCYXJIZWlnaHQgKiAzIC8gNDsKKyAg ICBtX2hVUkxCYXJGb250ID0gOjpDcmVhdGVGb250KGZvbnRIZWlnaHQsIDAsIDAsIDAsIEZXX05P Uk1BTCwgRkFMU0UsIEZBTFNFLCBGQUxTRSwgREVGQVVMVF9DSEFSU0VULAorICAgICAgICBPVVRf VFRfT05MWV9QUkVDSVMsIENMSVBfREVGQVVMVF9QUkVDSVMsIEFOVElBTElBU0VEX1FVQUxJVFks IEZGX0RPTlRDQVJFLCBMIlRpbWVzIE5ldyBSb21hbiIpOworICAgIDo6U2VuZE1lc3NhZ2UobV9o VVJMQmFyV25kLCBzdGF0aWNfY2FzdDxVSU5UPihXTV9TRVRGT05UKSwgcmVpbnRlcnByZXRfY2Fz dDxXUEFSQU0+KG1faFVSTEJhckZvbnQpLCBUUlVFKTsKK30KZGlmZiAtLWdpdCBhL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9NYWluV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldp bmRvdy5oCmluZGV4IDgxZDhkZDAxOGMzYzJmODk5M2E4YzcxOGY5YTU0MTZhY2I3MjMxYzYuLjJk ZTRiNDc3NTZjNTgzOTVkYzcwMzI5OGRhMjYzYmE3ZWRmODYwNjQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2lu L01haW5XaW5kb3cuaApAQCAtNTQsMTEgKzU0LDEzIEBAIHByaXZhdGU6CiAgICAgTWFpbldpbmRv dygpOwogICAgIGJvb2wgdG9nZ2xlTWVudUl0ZW0oVUlOVCBtZW51SUQpOwogICAgIHZvaWQgb25V UkxCYXJFbnRlcigpOworICAgIHZvaWQgdXBkYXRlRGV2aWNlU2NhbGVGYWN0b3IoKTsKIAogICAg IEhXTkQgbV9oTWFpblduZCB7IG51bGxwdHIgfTsKICAgICBIV05EIG1faFVSTEJhclduZCB7IG51 bGxwdHIgfTsKICAgICBIV05EIG1faEJhY2tCdXR0b25XbmQgeyBudWxscHRyIH07CiAgICAgSFdO RCBtX2hGb3J3YXJkQnV0dG9uV25kIHsgbnVsbHB0ciB9OwogICAgIEhXTkQgbV9oQ2FjaGVXbmQg eyBudWxscHRyIH07CisgICAgSEdESU9CSiBtX2hVUkxCYXJGb250IHsgbnVsbHB0ciB9OwogICAg IFJlZlB0cjxNaW5pQnJvd3Nlcj4gbV9icm93c2VyV2luZG93OwogfTsKZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93 aW4vTWluaUJyb3dzZXIuY3BwCmluZGV4IGM1NzgxNWI5NDIyNWIyMTcwOTBmN2NhZGI3YzNkOTc5 MjhjZTJjMTguLjYwMmFkNmZkMDMyY2I0MjUwY2U1ZGY5MzU3ODg1YWQ1MjM5Mzc3NTIgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHAKKysrIGIvVG9vbHMv TWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyLmNwcApAQCAtODgsOCArODgsNiBAQCBVTE9ORyBN aW5pQnJvd3Nlcjo6UmVsZWFzZSgpCiAKIEhSRVNVTFQgTWluaUJyb3dzZXI6OmluaXQoKQogewot ICAgIHVwZGF0ZURldmljZVNjYWxlRmFjdG9yKCk7Ci0KICAgICBIUkVTVUxUIGhyID0gV2ViS2l0 Q3JlYXRlSW5zdGFuY2UoQ0xTSURfV2ViVmlldywgMCwgSUlEX0lXZWJWaWV3LCByZWludGVycHJl dF9jYXN0PHZvaWQqKj4oJm1fd2ViVmlldy5HZXRJbnRlcmZhY2VQdHIoKSkpOwogICAgIGlmIChG QUlMRUQoaHIpKQogICAgICAgICByZXR1cm4gaHI7CkBAIC02MjcsMjIgKzYyNSw2IEBAIHZvaWQg TWluaUJyb3dzZXI6OnNob3dMYXllclRyZWUoKQogICAgIE91dHB1dERlYnVnU3RyaW5nKEwiXG5c biIpOwogfQogCi12b2lkIE1pbmlCcm93c2VyOjpnZW5lcmF0ZUZvbnRGb3JTY2FsZUZhY3Rvcihm bG9hdCBzY2FsZUZhY3RvcikKLXsKLSAgICBpZiAobV9oVVJMQmFyRm9udCkKLSAgICAgICAgOjpE ZWxldGVPYmplY3QobV9oVVJMQmFyRm9udCk7Ci0KLSAgICBtX2hVUkxCYXJGb250ID0gOjpDcmVh dGVGb250KHNjYWxlRmFjdG9yICogMTgsIDAsIDAsIDAsIEZXX05PUk1BTCwgRkFMU0UsIEZBTFNF LCBGQUxTRSwgREVGQVVMVF9DSEFSU0VULAotICAgICAgICBPVVRfVFRfT05MWV9QUkVDSVMsIENM SVBfREVGQVVMVF9QUkVDSVMsIEFOVElBTElBU0VEX1FVQUxJVFksIEZGX0RPTlRDQVJFLCBMIlRp bWVzIE5ldyBSb21hbiIpOwotfQotCi0KLXZvaWQgTWluaUJyb3dzZXI6OnVwZGF0ZURldmljZVNj YWxlRmFjdG9yKCkKLXsKLSAgICBtX2RldmljZVNjYWxlRmFjdG9yID0gV2ViQ29yZTo6ZGV2aWNl U2NhbGVGYWN0b3JGb3JXaW5kb3cobV9oTWFpblduZCk7Ci0gICAgZ2VuZXJhdGVGb250Rm9yU2Nh bGVGYWN0b3IobV9kZXZpY2VTY2FsZUZhY3Rvcik7Ci19Ci0KIHN0YXRpYyBCT09MIENBTExCQUNL IEFib3J0UHJvYyhIREMgaERDLCBpbnQgRXJyb3IpCiB7CiAgICAgTVNHIG1zZzsKZGlmZiAtLWdp dCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5oIGIvVG9vbHMvTWluaUJyb3dz ZXIvd2luL01pbmlCcm93c2VyLmgKaW5kZXggNWVjZjcxNjAwYTUxNzhkNDFlNGI1NjRhMTYzNDEw MzgyYTYwZWMzZS4uZWM1NDI4YzVhYmZmYWRiMzYxMTU2Njk4NzgwZmRjNTc4OWYxNTg1YyAxMDA2 NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyLmgKKysrIGIvVG9vbHMv TWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyLmgKQEAgLTEwMCwxMCArMTAwLDYgQEAgcHVibGlj OgogCiAgICAgdm9pZCBzaG93TGF5ZXJUcmVlKCk7CiAKLSAgICBmbG9hdCBkZXZpY2VTY2FsZUZh Y3RvcigpIHsgcmV0dXJuIG1fZGV2aWNlU2NhbGVGYWN0b3I7IH0KLSAgICB2b2lkIHVwZGF0ZURl dmljZVNjYWxlRmFjdG9yKCk7Ci0KLSAgICBIR0RJT0JKIHVybEJhckZvbnQoKSB7IHJldHVybiBt X2hVUkxCYXJGb250OyB9CiAgICAgSFdORCBod25kKCkgeyByZXR1cm4gbV92aWV3V25kOyB9CiAK ICAgICB2b2lkIHByaW50KCk7CkBAIC0xMTMsNyArMTA5LDYgQEAgcHVibGljOgogcHJpdmF0ZToK ICAgICBNaW5pQnJvd3NlcihIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxh eWVyZWRXZWJWaWV3LCBib29sIHBhZ2VMb2FkVGVzdGluZyk7CiAgICAgdm9pZCBzdWJjbGFzc0Zv ckxheWVyZWRXaW5kb3coKTsKLSAgICB2b2lkIGdlbmVyYXRlRm9udEZvclNjYWxlRmFjdG9yKGZs b2F0KTsKICAgICBib29sIHNldENhY2hlRm9sZGVyKCk7CiAKICAgICBzdGQ6OnZlY3RvcjxJV2Vi SGlzdG9yeUl0ZW1QdHI+IG1faGlzdG9yeUl0ZW1zOwpAQCAtMTM5LDkgKzEzNCw3IEBAIHByaXZh dGU6CiAKICAgICBIV05EIG1faE1haW5XbmQgeyBudWxscHRyIH07CiAgICAgSFdORCBtX2hVUkxC YXJXbmQgeyBudWxscHRyIH07Ci0gICAgSEdESU9CSiBtX2hVUkxCYXJGb250IHsgbnVsbHB0ciB9 OwogICAgIEhXTkQgbV92aWV3V25kIHsgbnVsbHB0ciB9OwogCi0gICAgZmxvYXQgbV9kZXZpY2VT Y2FsZUZhY3RvciB7IDEuMGYgfTsKICAgICBib29sIG1fdXNlTGF5ZXJlZFdlYlZpZXc7CiB9Owo=