87921 2012-05-30 20:33:57 -0700 [chromium] Combobox options and autofill options should not be scaled for device-scale factor 2012-06-04 12:56:57 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sadrul sadrul eric fishd rjkroege tkent webkit.review.bot oldest_to_newest 637969 0 sadrul 2012-05-30 20:33:57 -0700 Combobox options and autofill options should not be scaled for device-scale factor. 637970 1 144977 sadrul 2012-05-30 20:35:05 -0700 Created attachment 144977 Patch 637972 2 sadrul 2012-05-30 20:36:43 -0700 (In reply to comment #1) > Created an attachment (id=144977) [details] > Patch Just a quick note: this reverts parts of https://bugs.webkit.org/show_bug.cgi?id=80027 639430 3 fishd 2012-06-01 09:17:27 -0700 What is the motivation for this change? Why is it better to do this on the Chromium side? 640745 4 sadrul 2012-06-04 12:23:11 -0700 (In reply to comment #3) > What is the motivation for this change? Why is it better to do this on the Chromium side? The scaling that is done for combobox/autofill popups do not work correctly for the other components. So a normal web-page does not paint correctly when device-scale-factor is larger than 1. At the same time, chrome does some scaling on the browser side, so this ends up scaling twice. The proper fix is to set the scaling factor on the graphics-context (done in https://bugs.webkit.org/show_bug.cgi?id=88136, with corresponding changes on the chrome side in http://codereview.chromium.org/10451112/ and http://codereview.chromium.org/10481005/) 640780 5 144977 webkit.review.bot 2012-06-04 12:56:51 -0700 Comment on attachment 144977 Patch Clearing flags on attachment: 144977 Committed r119420: <http://trac.webkit.org/changeset/119420> 640781 6 webkit.review.bot 2012-06-04 12:56:57 -0700 All reviewed patches have been landed. Closing bug. 144977 2012-05-30 20:35:05 -0700 2012-06-04 12:56:51 -0700 Patch bug-87921-20120530233504.patch text/plain 8996 sadrul U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI4ZjEzNDIyMmE3M2Rl MWRmMDA4MzEzYjJlOTE3M2FlZGU0Njk0My4uN2U4MjgyMjZhYTg0MDk5NDkxZWY4ZjExMGZmN2Q2 ZmM0M2M5MzBjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTMwICBTYWRy dWwgSGFiaWIgQ2hvd2RodXJ5ICA8c2FkcnVsQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hy b21pdW1dIENvbWJvYm94IG9wdGlvbnMgYW5kIGF1dG9maWxsIG9wdGlvbnMgc2hvdWxkIG5vdCBi ZSBzY2FsZWQgZm9yIGRldmljZS1zY2FsZSBmYWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3OTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hyb21lIHRha2VzIGNhcmUgb2Ygc2NhbGluZyB0aGUg Y29tYm9ib3gvYXV0b2ZpbGwgbGlzdHMgaW4gdGhlIGJyb3dzZXIgc2lkZS4gU28gaXQgaXMgbm90 CisgICAgICAgIG5lY2Vzc2FyeSB0byBzY2FsZSBoZXJlLiBUaGlzIGNoYW5nZSByZXZlcnRzIHBh cnRzIG9mIGNoYW5nZXMgaW4gcjExMTUzOS4KKworICAgICAgICBNYW51YWxseSB0ZXN0ZWQgd2l0 aCBkaWZmZXJlbnQgc2NhbGUgZmFjdG9ycy4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L1BvcHVwTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cExpc3RCb3g6OnBhaW50 KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTGlzdEJveDo6cGFpbnRSb3cpOgorICAgICAgICAo V2ViQ29yZTo6UG9wdXBMaXN0Qm94OjpnZXRSb3dIZWlnaHQpOgorICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtL1BvcHVwTGlzdEJveC5oOgorICAgICAgICAoUG9wdXBDb250YWluZXJTZXR0aW5n cyk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UG9wdXBNZW51Q2hyb21pdW06OnNob3cpOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNZW51 TGlzdDo6c2hvd1BvcHVwKToKKwogMjAxMi0wNS0zMCAgUGV0ZXIgUnliaW4gIDxwZXRlci5yeWJp bkBnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZGlzYWJsZSBFeGFjdGx5SW50 IGZlYXR1cmUgaW4gSW5zcGVjdG9yVHlwZUJ1aWxkZXIgc2luY2UgaXQgYnJlYWtzIHJlbGVhc2Ug V2luZG93cyA3IFdLMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCAzZGI5OGY3ZjA5ODg1 ZTc3ZTNlZjZkZDNhOGYyZTEzMTE3YmQzOGE5Li42Y2ZjYjcxZjU3NDFlOTEwNDNkZTE5YTQ3YWQ4 NDNiNTViY2Q4MzI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDEyLTA1LTMwICBTYWRydWwgSGFiaWIgQ2hvd2RodXJ5ICA8c2FkcnVsQGNocm9taXVtLm9y Zz4KKworICAgICAgICBDb21ib2JveCBvcHRpb25zIGFuZCBhdXRvZmlsbCBvcHRpb25zIHNob3Vs ZCBub3QgYmUgc2NhbGVkIGZvciBkZXZpY2Utc2NhbGUgZmFjdG9yLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc5MjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjphcHBseUF1dG9maWxsU3VnZ2VzdGlvbnMpOgor CiAyMDEyLTA1LTMwICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIE1hdGNoIEZpcmVmb3ggcmVzdHJpY3Rpb25zIHRvIHdpbmRvdy5ibHVyIGFuZCB3aW5k b3cuZm9jdXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bv cHVwTGlzdEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cExp c3RCb3guY3BwCmluZGV4IDBkNGMwZWYwNTVkOTEzY2M4NDgxMGE1MTIyNTA1NTc1NDdmMTRjZWQu Ljg5NWMyYWVlZjNkYTM0NGVmNzFkZjQ1OTQ3NDJhYTk4NTcxYTQ3ZTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTGlzdEJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBMaXN0Qm94LmNwcApAQCAtMzUzLDcg KzM1Myw2IEBAIHZvaWQgUG9wdXBMaXN0Qm94Ojp0eXBlQWhlYWRGaW5kKGNvbnN0IFBsYXRmb3Jt S2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAKIHZvaWQgUG9wdXBMaXN0Qm94OjpwYWludChHcmFwaGlj c0NvbnRleHQqIGdjLCBjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIGludCBzY2FsZSA9IG1f c2V0dGluZ3MuZGVmYXVsdERldmljZVNjYWxlRmFjdG9yOwogICAgIC8vIGFkanVzdCBjb29yZHMg Zm9yIHNjcm9sbGVkIGZyYW1lCiAgICAgSW50UmVjdCByID0gaW50ZXJzZWN0aW9uKHJlY3QsIGZy YW1lUmVjdCgpKTsKICAgICBpbnQgdHggPSB4KCkgLSBzY3JvbGxYKCk7CkBAIC0zNjgsOCArMzY3 LDYgQEAgdm9pZCBQb3B1cExpc3RCb3g6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogZ2MsIGNvbnN0 IEludFJlY3QmIHJlY3QpCiAKICAgICAvLyBGSVhNRTogQ2FuIHdlIG9wdGltaXplIHNjcm9sbGlu ZyB0byBub3QgcmVxdWlyZSByZXBhaW50aW5nIHRoZSBlbnRpcmUKICAgICAvLyB3aW5kb3c/IFNo b3VsZCB3ZT8KLSAgICBpZiAoc2NhbGUgIT0gMSkKLSAgICAgICAgZ2MtPnNjYWxlKEZsb2F0U2l6 ZShzY2FsZSwgc2NhbGUpKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IG51bUl0ZW1zKCk7ICsr aSkKICAgICAgICAgcGFpbnRSb3coZ2MsIHIsIGkpOwogCkBAIC0zOTMsMTkgKzM5MCw2IEBAIHZv aWQgUG9wdXBMaXN0Qm94OjpwYWludFJvdyhHcmFwaGljc0NvbnRleHQqIGdjLCBjb25zdCBJbnRS ZWN0JiByZWN0LCBpbnQgcm93SW5kCiAgICAgaWYgKCFyb3dSZWN0LmludGVyc2VjdHMocmVjdCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIGludCBzY2FsZSA9IG1fc2V0dGluZ3MuZGVmYXVsdERl dmljZVNjYWxlRmFjdG9yOwotICAgIC8vIFJvd1JlY3QgaGFzIGFscmVhZHkgYmVlbiBzY2FsZWQg YnkgdGhlIGRlZmF1bHREZXZpY2VTY2FsZUZhY3Rvci4KLSAgICAvLyBUbyBhdm9pZCBzY2FsaW5n IGl0IHR3aWNlLCB3ZSBoYXZlIHRvIHVuc2NhbGUgaXQgYmVmb3JlIGRyYXdpbmcuCi0gICAgaWYg KHNjYWxlICE9IDEpIHsKLSAgICAgICAgLy8gSGVpZ2h0IGFuZCB5IHNob3VsZCBib3RoIGJlIGV2 ZW5seSBkaXZpc2libGUgYnkgc2NhbGUuCi0gICAgICAgIEFTU0VSVCghKHJvd1JlY3QueSgpICUg c2NhbGUpKTsKLSAgICAgICAgcm93UmVjdC5zZXRZKHJvd1JlY3QueSgpIC8gc2NhbGUpOwotICAg ICAgICBBU1NFUlQoIShyb3dSZWN0LmhlaWdodCgpICUgc2NhbGUpKTsKLSAgICAgICAgcm93UmVj dC5zZXRIZWlnaHQocm93UmVjdC5oZWlnaHQoKSAvIHNjYWxlKTsKLSAgICAgICAgcm93UmVjdC5z ZXRXaWR0aChjZWlsZihzdGF0aWNfY2FzdDxmbG9hdD4ocm93UmVjdC53aWR0aCgpKSAvIHNjYWxl KSk7Ci0gICAgICAgIC8vIHJvd1JlY3QueCBpcyBhbHdheXMgMC4KLSAgICB9Ci0KICAgICBQb3B1 cE1lbnVTdHlsZSBzdHlsZSA9IG1fcG9wdXBDbGllbnQtPml0ZW1TdHlsZShyb3dJbmRleCk7CiAK ICAgICAvLyBQYWludCBiYWNrZ3JvdW5kCkBAIC02MzAsMTYgKzYxNCwxNSBAQCB2b2lkIFBvcHVw TGlzdEJveDo6c2V0T3JpZ2luYWxJbmRleChpbnQgaW5kZXgpCiAKIGludCBQb3B1cExpc3RCb3g6 OmdldFJvd0hlaWdodChpbnQgaW5kZXgpCiB7Ci0gICAgaW50IHNjYWxlID0gbV9zZXR0aW5ncy5k ZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3I7CiAgICAgaW50IHBhZGRpbmdGb3JUb3VjaCA9IDA7CiAg ICAgaWYgKG1fc2V0dGluZ3MuZGV2aWNlU3VwcG9ydHNUb3VjaCkKICAgICAgICAgcGFkZGluZ0Zv clRvdWNoID0gUG9wdXBNZW51Q2hyb21pdW06Om9wdGlvblBhZGRpbmdGb3JUb3VjaCgpOwogICAg IGlmIChpbmRleCA8IDAgfHwgbV9wb3B1cENsaWVudC0+aXRlbVN0eWxlKGluZGV4KS5pc0Rpc3Bs YXlOb25lKCkpCi0gICAgICAgIHJldHVybiBQb3B1cE1lbnVDaHJvbWl1bTo6bWluaW11bVJvd0hl aWdodCgpICogc2NhbGU7CisgICAgICAgIHJldHVybiBQb3B1cE1lbnVDaHJvbWl1bTo6bWluaW11 bVJvd0hlaWdodCgpOwogCiAgICAgLy8gU2VwYXJhdG9yIHJvdyBoZWlnaHQgaXMgdGhlIHNhbWUg c2l6ZSBhcyBpdHNlbGYuCiAgICAgaWYgKG1fcG9wdXBDbGllbnQtPml0ZW1Jc1NlcGFyYXRvcihp bmRleCkpCi0gICAgICAgIHJldHVybiBtYXgoc2VwYXJhdG9ySGVpZ2h0LCAoUG9wdXBNZW51Q2hy b21pdW06Om1pbmltdW1Sb3dIZWlnaHQoKSkpICogc2NhbGU7CisgICAgICAgIHJldHVybiBtYXgo c2VwYXJhdG9ySGVpZ2h0LCAoUG9wdXBNZW51Q2hyb21pdW06Om1pbmltdW1Sb3dIZWlnaHQoKSkp OwogCiAgICAgU3RyaW5nIGljb24gPSBtX3BvcHVwQ2xpZW50LT5pdGVtSWNvbihpbmRleCk7CiAg ICAgUmVmUHRyPEltYWdlPiBpbWFnZShJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoaWNvbi51 dGY4KCkuZGF0YSgpKSk7CkBAIC02NDksNyArNjMyLDcgQEAgaW50IFBvcHVwTGlzdEJveDo6Z2V0 Um93SGVpZ2h0KGludCBpbmRleCkKIAogICAgIGludCBsaW5lUGFkZGluZ0hlaWdodCA9IG1fcG9w dXBDbGllbnQtPm1lbnVTdHlsZSgpLm1lbnVUeXBlKCkgPT0gUG9wdXBNZW51U3R5bGU6OkF1dG9m aWxsUG9wdXAgPyBrTGluZVBhZGRpbmdIZWlnaHQgOiAwOwogICAgIGludCBjYWxjdWxhdGVkUm93 SGVpZ2h0ID0gbWF4KGZvbnRIZWlnaHQsIGljb25IZWlnaHQpICsgbGluZVBhZGRpbmdIZWlnaHQg KiAyOwotICAgIHJldHVybiAobWF4KGNhbGN1bGF0ZWRSb3dIZWlnaHQsIFBvcHVwTWVudUNocm9t aXVtOjptaW5pbXVtUm93SGVpZ2h0KCkpICsgcGFkZGluZ0ZvclRvdWNoKSAqIHNjYWxlOworICAg IHJldHVybiAobWF4KGNhbGN1bGF0ZWRSb3dIZWlnaHQsIFBvcHVwTWVudUNocm9taXVtOjptaW5p bXVtUm93SGVpZ2h0KCkpICsgcGFkZGluZ0ZvclRvdWNoKTsKIH0KIAogSW50UmVjdCBQb3B1cExp c3RCb3g6OmdldFJvd0JvdW5kcyhpbnQgaW5kZXgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cExpc3RCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BvcHVwTGlzdEJveC5oCmluZGV4IGM3MzA5ZTVlOGEyZTM2MjVhOGZlYjI5 MDZlYWE0MDA0NzQ0MDg0NjcuLmRjOGUzYmY4ZDAxMTE3ODgyMjA3ZGRhNTEwNzBiNDAzYjI3YjY5 MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTGlz dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTGlzdEJv eC5oCkBAIC04MCwxMCArODAsNiBAQCBzdHJ1Y3QgUG9wdXBDb250YWluZXJTZXR0aW5ncyB7CiAg ICAgLy8gQXV0b2NvbXBsZXRlIHBvcHVwcyBhcmUgcmVzdHJpY3RlZCwgY29tYm8tYm94ZXMgKHNl bGVjdCB0YWdzKSBhcmVuJ3QuCiAgICAgYm9vbCByZXN0cmljdFdpZHRoT2ZMaXN0Qm94OwogCi0g ICAgLy8gVGhlIGRlZmF1bHQgZGV2aWNlIHNjYWxlIGZhY3RvciBvZiB0aGUgc2NyZWVuIHVzZWQg dG8gZHJhdyB0aGUgbWVudQotICAgIC8vIGF0IHRoaXMgc2NhbGUgc3VpdGFibGUgZm9yIHRoZSBk ZXZpY2UgRFBJLgotICAgIGludCBkZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3I7Ci0KICAgICAvLyBJ ZiB0aGUgZGV2aWNlIGlzIGEgdG91Y2ggc2NyZWVuIHdlIGluY3JlYXNlIHRoZSBoZWlnaHQgb2Yg bWVudSBpdGVtcwogICAgIC8vIHRvIG1ha2UgaXQgZWFzaWVyIHRvIHVuYW1iaWd1b3VzbHkgdG91 Y2ggdGhlbS4KICAgICBib29sIGRldmljZVN1cHBvcnRzVG91Y2g7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKaW5kZXgg ZGFjYTQ1YmVhMTBjNjIwN2U0Y2QwOTllNDIxYzVlNmZkY2M5Y2Q5NS4uZTU4ODk1NjY5NTNmNWY0 NWM0YzgwMDk5NzQ0YTliODc2YjRkNGIzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcApAQCAtNzEsOSArNzEsNiBA QCB2b2lkIFBvcHVwTWVudUNocm9taXVtOjpzaG93KGNvbnN0IEludFJlY3QmIHJlY3QsIEZyYW1l VmlldyogZnJhbWVWaWV3LCBpbnQgaW5kZQogICAgIGlmICghcC5wb3B1cCkgewogICAgICAgICBT ZXR0aW5ncyogc2V0dGluZ3MgPSBmcmFtZVZpZXctPmZyYW1lKCktPnBhZ2UoKS0+c2V0dGluZ3Mo KTsKICAgICAgICAgUG9wdXBDb250YWluZXJTZXR0aW5ncyBwb3B1cFNldHRpbmdzID0gZHJvcERv d25TZXR0aW5nczsKLSAgICAgICAgcG9wdXBTZXR0aW5ncy5kZWZhdWx0RGV2aWNlU2NhbGVGYWN0 b3IgPSBzZXR0aW5ncy0+ZGVmYXVsdERldmljZVNjYWxlRmFjdG9yKCk7Ci0gICAgICAgIGlmICgh cG9wdXBTZXR0aW5ncy5kZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3IpCi0gICAgICAgICAgICBwb3B1 cFNldHRpbmdzLmRlZmF1bHREZXZpY2VTY2FsZUZhY3RvciA9IDE7CiAgICAgICAgIHBvcHVwU2V0 dGluZ3MuZGV2aWNlU3VwcG9ydHNUb3VjaCA9IHNldHRpbmdzLT5kZXZpY2VTdXBwb3J0c1RvdWNo KCk7CiAgICAgICAgIHAucG9wdXAgPSBQb3B1cENvbnRhaW5lcjo6Y3JlYXRlKGNsaWVudCgpLCBQ b3B1cENvbnRhaW5lcjo6U2VsZWN0LCBwb3B1cFNldHRpbmdzKTsKICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcAppbmRleCA0ODE0NmUyNjYwNzI3MWU2 ZGM2ZjkwMDA3MDAwMDg2ZGYzZjQzMTI5Li41NmVjY2Y4YTFkZDkyNjViNjExOTFjODA2ZTRlNDRm ZTRjMjE5NmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVu dUxpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5j cHAKQEAgLTMxMiw5ICszMTIsNiBAQCB2b2lkIFJlbmRlck1lbnVMaXN0OjpzaG93UG9wdXAoKQog ICAgIC8vIHRoZSBhY3R1YWwgd2lkdGggb2YgdGhlIGVsZW1lbnQgdG8gc2l6ZSB0aGUgcG9wdXAu CiAgICAgRmxvYXRQb2ludCBhYnNUb3BMZWZ0ID0gbG9jYWxUb0Fic29sdXRlKEZsb2F0UG9pbnQo KSwgZmFsc2UsIHRydWUpOwogICAgIEludFJlY3QgYWJzQm91bmRzID0gYWJzb2x1dGVCb3VuZGlu Z0JveFJlY3RJZ25vcmluZ1RyYW5zZm9ybXMoKTsKLSAgICBpbnQgc2NhbGUgPSBkb2N1bWVudCgp LT5wYWdlKCktPnNldHRpbmdzKCktPmRlZmF1bHREZXZpY2VTY2FsZUZhY3RvcigpOwotICAgIGlm IChzY2FsZSAmJiBzY2FsZSAhPSAxKQotICAgICAgICBhYnNCb3VuZHMuc2NhbGUoc2NhbGUpOwog ICAgIGFic0JvdW5kcy5zZXRMb2NhdGlvbihyb3VuZGVkSW50UG9pbnQoYWJzVG9wTGVmdCkpOwog ICAgIEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QgPSB0b0hUTUxTZWxlY3RFbGVtZW50KG5vZGUo KSk7CiAgICAgbV9wb3B1cC0+c2hvdyhhYnNCb3VuZHMsIGRvY3VtZW50KCktPnZpZXcoKSwgc2Vs ZWN0LT5vcHRpb25Ub0xpc3RJbmRleChzZWxlY3QtPnNlbGVjdGVkSW5kZXgoKSkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGRhZTBkNjU1OThlNWI2 ZDE5NDc5YzUyYTVlNDhjYjFlNGI5YzMxMGIuLjAxM2Y1YmJjNWY4MTVkYzMyZmQxNWVhMzljYzIx NjMwNzZhZTc5NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKQEAgLTI5NTUsOSArMjk1NSw2IEBAIHZvaWQgV2ViVmlld0ltcGw6OmFwcGx5QXV0b2ZpbGxT dWdnZXN0aW9ucygKIAogICAgIGlmICghbV9hdXRvZmlsbFBvcHVwKSB7CiAgICAgICAgIFBvcHVw Q29udGFpbmVyU2V0dGluZ3MgcG9wdXBTZXR0aW5ncyA9IGF1dG9maWxsUG9wdXBTZXR0aW5nczsK LSAgICAgICAgcG9wdXBTZXR0aW5ncy5kZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3IgPSBzZXR0aW5n c0ltcGwoKS0+ZGVmYXVsdERldmljZVNjYWxlRmFjdG9yKCk7Ci0gICAgICAgIGlmICghcG9wdXBT ZXR0aW5ncy5kZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3IpCi0gICAgICAgICAgICBwb3B1cFNldHRp bmdzLmRlZmF1bHREZXZpY2VTY2FsZUZhY3RvciA9IDE7CiAgICAgICAgIHBvcHVwU2V0dGluZ3Mu ZGV2aWNlU3VwcG9ydHNUb3VjaCA9IHNldHRpbmdzSW1wbCgpLT5kZXZpY2VTdXBwb3J0c1RvdWNo KCk7CiAgICAgICAgIG1fYXV0b2ZpbGxQb3B1cCA9IFBvcHVwQ29udGFpbmVyOjpjcmVhdGUobV9h dXRvZmlsbFBvcHVwQ2xpZW50LmdldCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFBvcHVwQ29udGFpbmVyOjpTdWdnZXN0aW9uLAo=