98809 2012-10-09 11:44:27 -0700 Text Autosizing: Counteract funky window sizing on Android. 2012-10-10 00:23:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84186 1 johnme johnme abarth aelias benjamin eric skyostil webkit.review.bot oldest_to_newest 738009 0 johnme 2012-10-09 11:44:27 -0700 Text Autosizing: Counteract funky window sizing on Android. 738020 1 167806 johnme 2012-10-09 11:55:19 -0700 Created attachment 167806 Patch 738022 2 167806 abarth 2012-10-09 11:56:34 -0700 Comment on attachment 167806 Patch Thanks. 738031 3 aelias 2012-10-09 12:04:18 -0700 I would have preferred pushing down a setting so that we can switch between the modes with only a Chromium-side change; this will be a loose end. That said if this is one of the last things blocking the text autosizing completion we can land and fix later. 738056 4 johnme 2012-10-09 12:21:43 -0700 (In reply to comment #3) > I would have preferred pushing down a setting so that we can switch between the modes with only a Chromium-side change; this will be a loose end. That said if this is one of the last things blocking the text autosizing completion we can land and fix later. Yeah, this is the last thing blocking us from turning Text Autosizing on in Chrome for Android. By pushing down a setting, do you mean exposing WebSettingsImpl::applyDefaultDeviceScaleFactorInCompositor to WebCore? Or some separate setting? 738063 5 aelias 2012-10-09 12:25:20 -0700 Yes, WebSettingsImpl::applyDefaultDeviceScaleFactorInCompositor is essentially equivalent to this new USE define, so we would be better to use that instead. 738149 6 167806 webkit.review.bot 2012-10-09 13:42:51 -0700 Comment on attachment 167806 Patch Rejecting attachment 167806 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: commit-queue/Source/WebKit/chromium/third_party/v8-i18n --revision 150 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 50>At revision 150. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/14197033 738173 7 167806 abarth 2012-10-09 14:10:50 -0700 Comment on attachment 167806 Patch This code already has a m_document, so it shouldn't have any trouble finding Settings. Perhaps we should use that instead. 738325 8 167876 aelias 2012-10-09 16:43:19 -0700 Created attachment 167876 Patch 738327 9 aelias 2012-10-09 16:45:07 -0700 Uploaded a patch using applyPageScaleFactorInCompositor. It's essentially the same thing as the other setting except for being in WebCore and I plan to flip them simultaneously. 738350 10 167876 abarth 2012-10-09 17:18:03 -0700 Comment on attachment 167876 Patch Ok. I would have added a comment explaining the connection between applyPageScaleFactorInCompositor and the bug in the units of the window size. 738662 11 167876 aelias 2012-10-10 00:17:07 -0700 Comment on attachment 167876 Patch I'll cq+ without the comment to unblock johnme@ for his remaining cleanup. I'll go back eventually to remove all these if() statements anyway. 738668 12 167876 webkit.review.bot 2012-10-10 00:23:22 -0700 Comment on attachment 167876 Patch Clearing flags on attachment: 167876 Committed r130866: <http://trac.webkit.org/changeset/130866> 738669 13 webkit.review.bot 2012-10-10 00:23:26 -0700 All reviewed patches have been landed. Closing bug. 167806 2012-10-09 11:55:19 -0700 2012-10-09 16:43:17 -0700 Patch bug-98809-20121009195420.patch text/plain 5279 johnme U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQwNmUwNjE1NDljYjM2MGU2NmRlZmNk NjAyZTdmNjQxODAxMjU1MmUuLmFiOGM5ZTJmZjk0M2FhOWUzOGVjMWQxNGE4MWMzMTFmMDUwOGJk NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTItMTAtMDkgIEpvaG4gTWVsbG9yICA8am9obm1l QGNocm9taXVtLm9yZz4KKworICAgICAgICBUZXh0IEF1dG9zaXppbmc6IENvdW50ZXJhY3QgZnVu a3kgd2luZG93IHNpemluZyBvbiBBbmRyb2lkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg4MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbiBDaHJvbWUgZm9yIEFuZHJvaWQsIHRoZSB3aW5kb3cgc2l6 ZXMgcHJvdmlkZWQgdG8gV2ViQ29yZSBhcmUKKyAgICAgICAgY3VycmVudGx5IGluIHBoeXNpY2Fs IHNjcmVlbiBwaXhlbHMgaW5zdGVhZCBvZiBsb2dpY2lhbAorICAgICAgICAoZGV2aWNlLWluZGVw ZW5kZW50KSBVSSBwaXhlbHMuIEZvciBleGFtcGxlIHdpbmRvdyB3aWR0aCBvbiBhIFNhbXN1bmcK KyAgICAgICAgR2FsYXh5IE5leHVzIGlzIDcyMCBpbnN0ZWFkIG9mIDM2MC4KKworICAgICAgICBT ZXZlcmFsIHBsYWNlcyBpbiBXZWJDb3JlIG5lZWQgdG8gYmUgYWJsZSB0byBnZXQgYSB2YWx1ZSBm b3IgdGhlIGlubmVyCisgICAgICAgIHNpemUgb2YgdGhlIG1haW4gZnJhbWUgdGhhdCBpcyBhbHdh eXMgaW4gVUkgcGl4ZWxzOyBidXQgdGhleSBkb24ndCBoYXZlCisgICAgICAgIGFjY2VzcyB0byBX ZWJTZXR0aW5nc0ltcGw6OmFwcGx5RGVmYXVsdERldmljZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9y KCkKKyAgICAgICAgd2hpY2ggaXMgdGhlIG9ubHkgY3VycmVudCB3YXkgb2YgZGlzdGluZ3Vpc2hp bmcgQ2hyb21lIGZvciBBbmRyb2lkJ3MKKyAgICAgICAgYmVoYXZpb3IgKGFuZCBoZW5jZSBkaXZp ZGluZyBieSBkZXZpY2VTY2FsZUZhY3RvciBhY2NvcmRpbmdseSkuCisKKyAgICAgICAgSGVuY2Ug YXQgYWJhcnRoJ3Mgc3VnZ2VzdGlvbiBJJ3ZlIGFkZGVkIGEKKyAgICAgICAgICAgIFVTRShERVBS RUNBVEVEX1BIWVNJQ0FMX1BJWEVMU19GT1JfV0lORE9XX1NJWkUpCisgICAgICAgIG1hY3JvIHRo YXQgY2FuIGJlIHVzZWQgdG8gZGlzdGluZ3Vpc2ggQ2hyb21lIGZvciBBbmRyb2lkJ3MgdW51c3Vh bAorICAgICAgICBiZWhhdmlvciBmcm9tIG90aGVyIHBvcnRzLgorCisgICAgICAgIE9uY2UgQ2hy b21lIGZvciBBbmRyb2lkIHN3aXRjaGVzIG92ZXIgdG8gdXNpbmcgbG9naWNhbCBwaXhlbHMgZm9y IHdpbmRvdworICAgICAgICBzaXplcywgdGhpcyBtYWNybyBjYW4gYmUgZGVsZXRlZC4KKworICAg ICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDEyLTEwLTA0ICBEaXJrIFByYW5rZSAgPGRwcmFu a2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzA0 MTkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggOTViMTJjNzU5MGFmMzMzMGNhM2EwNDM1NmM0YTU4ZTY0ZTlmNmI5 Mi4uZTVjNTNjZGIzZDk4N2ViYmYwNjRhZDg1MjU1NDQ4OTZlM2Y2YjRiMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM2IEBACisyMDEyLTEwLTA5ICBKb2huIE1lbGxvciAgPGpvaG5tZUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgVGV4dCBBdXRvc2l6aW5nOiBDb3VudGVyYWN0IGZ1bmt5IHdpbmRv dyBzaXppbmcgb24gQW5kcm9pZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk4ODA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW4gQ2hyb21lIGZvciBBbmRyb2lkLCB0aGUgd2luZG93IHNpemVzIHByb3Zp ZGVkIHRvIFdlYkNvcmUgYXJlCisgICAgICAgIGN1cnJlbnRseSBpbiBwaHlzaWNhbCBzY3JlZW4g cGl4ZWxzIGluc3RlYWQgb2YgbG9naWNpYWwKKyAgICAgICAgKGRldmljZS1pbmRlcGVuZGVudCkg VUkgcGl4ZWxzLiBGb3IgZXhhbXBsZSB3aW5kb3cgd2lkdGggb24gYSBTYW1zdW5nCisgICAgICAg IEdhbGF4eSBOZXh1cyBpcyA3MjAgaW5zdGVhZCBvZiAzNjAuCisKKyAgICAgICAgVGV4dCBBdXRv c2l6aW5nIG5lZWRzIHRvIGJlIGFibGUgdG8gZ2V0IGEgdmFsdWUgZm9yIHRoZSBpbm5lciBzaXpl IG9mCisgICAgICAgIHRoZSBtYWluIGZyYW1lIHRoYXQgaXMgYWx3YXlzIGluIFVJIHBpeGVsczsg YnV0IGl0IGRvZXNuJ3QgaGF2ZSBhY2Nlc3MKKyAgICAgICAgdG8gV2ViU2V0dGluZ3NJbXBsOjph cHBseURlZmF1bHREZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpIHdoaWNoIGlzCisgICAg ICAgIHRoZSBvbmx5IGN1cnJlbnQgd2F5IG9mIGRpc3Rpbmd1aXNoaW5nIENocm9tZSBmb3IgQW5k cm9pZCdzIGJlaGF2aW9yCisgICAgICAgIChhbmQgaGVuY2UgZGl2aWRpbmcgYnkgZGV2aWNlU2Nh bGVGYWN0b3IgYWNjb3JkaW5nbHkpLgorCisgICAgICAgIFRoZXJlIGFyZSB2YXJpb3VzIG90aGVy IHBsYWNlcyB3aGVyZSB0aGlzIGNvdWxkIGJlIHVzZWZ1bCB0b28uCisKKyAgICAgICAgSGVuY2Ug YXQgYWJhcnRoJ3Mgc3VnZ2VzdGlvbiBJJ3ZlIGFkZGVkIGEKKyAgICAgICAgICAgIFVTRShERVBS RUNBVEVEX1BIWVNJQ0FMX1BJWEVMU19GT1JfV0lORE9XX1NJWkUpCisgICAgICAgIG1hY3JvIHRo YXQgY2FuIGJlIHVzZWQgdG8gZGlzdGluZ3Vpc2ggQ2hyb21lIGZvciBBbmRyb2lkJ3MgdW51c3Vh bAorICAgICAgICBiZWhhdmlvciBmcm9tIG90aGVyIHBvcnRzLCBhbmQgSSB1c2UgdGhpcyB0byBm aXggVGV4dCBBdXRvc2l6aW5nLgorCisgICAgICAgIE9uY2UgQ2hyb21lIGZvciBBbmRyb2lkIHN3 aXRjaGVzIG92ZXIgdG8gdXNpbmcgbG9naWNhbCBwaXhlbHMgZm9yIHdpbmRvdworICAgICAgICBz aXplcywgdGhpcyBtYWNybyBjYW4gYmUgZGVsZXRlZC4KKworICAgICAgICBObyBuZXcgdGVzdHMg KE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9UZXh0QXV0b3NpemVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHRBdXRvc2l6ZXI6OnByb2Nlc3NTdWJ0cmVlKToKKwogMjAxMi0xMC0w NCAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENyYXNoIGlu IEV2ZW50SGFuZGxlcjo6bW91c2VNb3ZlZCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv UGxhdGZvcm0uaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKaW5kZXggNjkyZjhhNjFiODM4 ODYwOWMyYjZkY2EwNWY2YWUzMGNmZTg2MzA5NC4uYmMxODU3MDViZjkxYjU1ZmQ4ZjFkMjQ4NTcy YWE5MmM4NTM3MjY5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAorKysg Yi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCkBAIC00NzcsNiArNDc3LDggQEAKICNkZWZpbmUg V1RGX1VTRV9MT1dfUVVBTElUWV9JTUFHRV9JTlRFUlBPTEFUSU9OIDEKICNkZWZpbmUgV1RGX1VT RV9MT1dfUVVBTElUWV9JTUFHRV9OT19KUEVHX0RJVEhFUklORyAxCiAjZGVmaW5lIFdURl9VU0Vf TE9XX1FVQUxJVFlfSU1BR0VfTk9fSlBFR19GQU5DWV9VUFNBTVBMSU5HIDEKKy8vIE1vc3QgcG9y dHMgc2l6ZSB3aW5kb3dzIGluIGxvZ2ljYWwgKGRldmljZS1pbmRlcGVuZGVudCkgVUkgcGl4ZWxz LiBDaHJvbWUgZm9yIEFuZHJvaWQgZG9lc24ndCB5ZXQgKHNlZSBkaXNjdXNzaW9uIGF0IHdlYmtp dC5vcmcvYi84NzQ0MCksIHNvIHRoaXMgdGVtcG9yYXJ5IGRlZmluZSBjYW4gYmUgdXNlZCB0byBj b3VudGVyYWN0IHRoaXMgdW50aWwgd2Ugc3dpdGNoLgorI2RlZmluZSBXVEZfVVNFX0RFUFJFQ0FU RURfUEhZU0lDQUxfUElYRUxTX0ZPUl9XSU5ET1dfU0laRSAxCiAjZWxzZQogI2RlZmluZSBXVEZf VVNFX1NLSUEgMQogI2RlZmluZSBXVEZfVVNFX0lDQ0pQRUcgMQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwCmluZGV4IDMwNGJkYjMxYzlmMTUwMmZiZmU1NjRjZGU2 ZGQ2OTZlNWQ2YjhhOWUuLjZkYjJhZmU2YzM4NjIxODU1ZmM5OTNmYWMwZmQ1MzkyY2FlMWVkZGEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b3NpemVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5jcHAKQEAgLTY0LDcg KzY0LDEwIEBAIGJvb2wgVGV4dEF1dG9zaXplcjo6cHJvY2Vzc1N1YnRyZWUoUmVuZGVyT2JqZWN0 KiBsYXlvdXRSb290KQogICAgIHdpbmRvd0luZm8ud2luZG93U2l6ZSA9IG1fZG9jdW1lbnQtPnNl dHRpbmdzKCktPnRleHRBdXRvc2l6aW5nV2luZG93U2l6ZU92ZXJyaWRlKCk7CiAgICAgaWYgKHdp bmRvd0luZm8ud2luZG93U2l6ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgYm9vbCBpbmNsdWRlU2Ny b2xsYmFycyA9ICFJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnNob3VsZEFwcGx5U2NyZWVuV2lk dGhPdmVycmlkZShtYWluRnJhbWUpOwotICAgICAgICB3aW5kb3dJbmZvLndpbmRvd1NpemUgPSBt YWluRnJhbWUtPnZpZXcoKS0+dmlzaWJsZUNvbnRlbnRSZWN0KGluY2x1ZGVTY3JvbGxiYXJzKS5z aXplKCk7IC8vIEZJWE1FOiBDaGVjayB0aGF0IHRoaXMgaXMgYWx3YXlzIGluIGxvZ2ljYWwgKGRl bnNpdHktaW5kZXBlbmRlbnQpIHBpeGVscyAoc2VlIHdrYnVnLmNvbS84NzQ0MCkuCisgICAgICAg IHdpbmRvd0luZm8ud2luZG93U2l6ZSA9IG1haW5GcmFtZS0+dmlldygpLT52aXNpYmxlQ29udGVu dFJlY3QoaW5jbHVkZVNjcm9sbGJhcnMpLnNpemUoKTsKKyNpZiBVU0UoREVQUkVDQVRFRF9QSFlT SUNBTF9QSVhFTFNfRk9SX1dJTkRPV19TSVpFKQorICAgICAgICB3aW5kb3dJbmZvLndpbmRvd1Np emUuc2NhbGUoMSAvIG1fZG9jdW1lbnQtPnBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7Cisj ZW5kaWYKICAgICB9CiAKICAgICAvLyBMYXJnZXN0IGFyZWEgb2YgYmxvY2sgdGhhdCBjYW4gYmUg dmlzaWJsZSBhdCBvbmNlIChhc3N1bWluZyB0aGUgbWFpbgo= 167876 2012-10-09 16:43:19 -0700 2012-10-10 00:23:22 -0700 Patch bug-98809-20121009164219.patch text/plain 2311 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA4YjFhMGUzN2I5YjVk ZDRkNmJlYjJkNzI2YTM5MzI1NjNmNGZjNC4uYzNjYzI2YWQ3OGI3ODhjMzA3MDg5OTJjODg0MjQ1 MWRiMjhkZTMxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTA5ICBBbGV4 YW5kcmUgRWxpYXMgIDxhZWxpYXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRleHQgQXV0b3Np emluZzogQ291bnRlcmFjdCBmdW5reSB3aW5kb3cgc2l6aW5nIG9uIEFuZHJvaWQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODgwOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIENocm9tZSBmb3IgQW5k cm9pZCwgdGhlIHdpbmRvdyBzaXplcyBwcm92aWRlZCB0byBXZWJDb3JlIGFyZQorICAgICAgICBj dXJyZW50bHkgaW4gcGh5c2ljYWwgc2NyZWVuIHBpeGVscyBpbnN0ZWFkIG9mCisgICAgICAgIGRl dmljZS1zY2FsZS1hZGp1c3RlZCB1bml0cy4gRm9yIGV4YW1wbGUgd2luZG93IHdpZHRoIG9uIGEK KyAgICAgICAgR2FsYXh5IE5leHVzIGlzIDcyMCBpbnN0ZWFkIG9mIDM2MC4gIFRleHQgYXV0b3Np emluZyBleHBlY3RzCisgICAgICAgIGRldmljZS1pbmRlcGVuZGVudCBwaXhlbHMuICBXaGVuIENo cm9tZSBmb3IgQW5kcm9pZCBjdXRzIG92ZXIgdG8KKyAgICAgICAgdGhlIG5ldyBjb29yZGluYXRl IHNwYWNlLCBpdCB3aWxsIGJlIHRpZWQgdG8gdGhlIHNldHRpbmcKKyAgICAgICAgYXBwbHlQYWdl U2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAg ICAgICogcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4 dEF1dG9zaXplcjo6cHJvY2Vzc1N1YnRyZWUpOgorCiAyMDEyLTEwLTA5ICBCZXRoIERha2luICA8 YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTg0NTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9U ZXh0QXV0b3NpemVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b3NpemVy LmNwcAppbmRleCAzMDRiZGIzMWM5ZjE1MDJmYmZlNTY0Y2RlNmRkNjk2ZTVkNmI4YTllLi4wYTA3 OTE0OTgyMWMyMjcyYzljMzY5MTIwNTdiNGU2MDY5MTk1NzIyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwCkBAIC02NCw3ICs2NCw5IEBAIGJvb2wgVGV4dEF1 dG9zaXplcjo6cHJvY2Vzc1N1YnRyZWUoUmVuZGVyT2JqZWN0KiBsYXlvdXRSb290KQogICAgIHdp bmRvd0luZm8ud2luZG93U2l6ZSA9IG1fZG9jdW1lbnQtPnNldHRpbmdzKCktPnRleHRBdXRvc2l6 aW5nV2luZG93U2l6ZU92ZXJyaWRlKCk7CiAgICAgaWYgKHdpbmRvd0luZm8ud2luZG93U2l6ZS5p c0VtcHR5KCkpIHsKICAgICAgICAgYm9vbCBpbmNsdWRlU2Nyb2xsYmFycyA9ICFJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OnNob3VsZEFwcGx5U2NyZWVuV2lkdGhPdmVycmlkZShtYWluRnJhbWUp OwotICAgICAgICB3aW5kb3dJbmZvLndpbmRvd1NpemUgPSBtYWluRnJhbWUtPnZpZXcoKS0+dmlz aWJsZUNvbnRlbnRSZWN0KGluY2x1ZGVTY3JvbGxiYXJzKS5zaXplKCk7IC8vIEZJWE1FOiBDaGVj ayB0aGF0IHRoaXMgaXMgYWx3YXlzIGluIGxvZ2ljYWwgKGRlbnNpdHktaW5kZXBlbmRlbnQpIHBp eGVscyAoc2VlIHdrYnVnLmNvbS84NzQ0MCkuCisgICAgICAgIHdpbmRvd0luZm8ud2luZG93U2l6 ZSA9IG1haW5GcmFtZS0+dmlldygpLT52aXNpYmxlQ29udGVudFJlY3QoaW5jbHVkZVNjcm9sbGJh cnMpLnNpemUoKTsKKyAgICAgICAgaWYgKCFtX2RvY3VtZW50LT5zZXR0aW5ncygpLT5hcHBseVBh Z2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpKQorICAgICAgICAgICAgd2luZG93SW5mby53aW5k b3dTaXplLnNjYWxlKDEgLyBtX2RvY3VtZW50LT5wYWdlKCktPmRldmljZVNjYWxlRmFjdG9yKCkp OwogICAgIH0KIAogICAgIC8vIExhcmdlc3QgYXJlYSBvZiBibG9jayB0aGF0IGNhbiBiZSB2aXNp YmxlIGF0IG9uY2UgKGFzc3VtaW5nIHRoZSBtYWluCg==