172889 2017-06-02 19:52:50 -0700 Cleanup FrameView::autoSizeIfEnabled. 2017-06-02 21:40:44 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1315348 0 zalan 2017-06-02 19:52:50 -0700 some minor cleanup. 1315349 1 webkit-bug-importer 2017-06-02 19:53:29 -0700 <rdar://problem/32550783> 1315350 2 311899 zalan 2017-06-02 19:58:11 -0700 Created attachment 311899 Patch 1315353 3 311899 thorton 2017-06-02 20:00:20 -0700 Comment on attachment 311899 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=311899&action=review > Source/WebCore/ChangeLog:3 > + Clenaup FrameView::autoSizeIfEnabled. Useless title, not even spelled right :) > Source/WebCore/page/FrameView.cpp:3746 > + // FIXME: Now that autoSizeIfEnabled() actually returns clean, we don't need to call it from layout() anymore. Don't know if this is a useful comment. Especially if not attached to a bug that explains why we might want to move it elsewhere. 1315357 4 311902 zalan 2017-06-02 20:14:04 -0700 Created attachment 311902 Patch 1315370 5 311902 commit-queue 2017-06-02 21:40:42 -0700 Comment on attachment 311902 Patch Clearing flags on attachment: 311902 Committed r217751: <http://trac.webkit.org/changeset/217751> 1315371 6 commit-queue 2017-06-02 21:40:44 -0700 All reviewed patches have been landed. Closing bug. 311899 2017-06-02 19:58:11 -0700 2017-06-02 20:14:03 -0700 Patch bug-172889-20170602195811.patch text/plain 7252 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI5ZGFmYTE4MDU4ZTBj MTBmZjEzZGZlZTU4ZjdlNDkxN2Q3YTYyNS4uNTA3OWI4OWQ0Y2ExMTdkZTY5OTcxMWQyNjNmNGEw NTQyNjUzZmZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE3LTA2LTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlbmF1cCBGcmFtZVZpZXc6 OmF1dG9TaXplSWZFbmFibGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyODg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjU1MDc4Mz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNo IGVuc3VyZXMgdGhhdCB3ZSBhbHdheXMgaGF2ZSBhIGNsZWFuIHRyZWUgKGFuZCBhIHZhbGlkIGFu ZCBjdXJyZW50IGRvY3VtZW50IHNpemUpIHdoZW4KKyAgICAgICAgc2V0dGluZyBtX2F1dG9TaXpl Q29udGVudFNpemUuIAorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjphdXRvU2l6ZUlmRW5hYmxlZCk6CisKIDIwMTctMDYtMDIgIE15 bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OKHIyMTM0NjQpOiBbaU9TXSBGb250cyBnZXQgdG9vIGJvbGQgd2hlbiB0aGUgIkJvbGQgVGV4 dCIgYWNjZXNzaWJpbGl0eSBzZXR0aW5nIGlzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcAppbmRleCAzZWExZTBhZTQzNzkyYTg5M2Y4OGEzNjFlZDJlMmMxYzJkOGI3M2E4Li44N2E2 OTVkYjBkMWUxZmNjNTIxYmFhZjlhNDgxZmI4OTc2ZDIxOWYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCkBAIC0zNjU1LDMzICszNjU1LDI4IEBAIHZvaWQgRnJhbWVWaWV3OjphdXRvU2l6 ZUlmRW5hYmxlZCgpCiAgICAgaWYgKG1faW5BdXRvU2l6ZSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgTE9HKExheW91dCwgIkZyYW1lVmlldyAlcCBhdXRvU2l6ZUlmRW5hYmxlZCIsIHRoaXMpOwot Ci0gICAgU2V0Rm9yU2NvcGU8Ym9vbD4gY2hhbmdlSW5BdXRvU2l6ZShtX2luQXV0b1NpemUsIHRy dWUpOwotCi0gICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gZnJhbWUoKS5kb2N1bWVudCgpOworICAg IGF1dG8qIGRvY3VtZW50ID0gZnJhbWUoKS5kb2N1bWVudCgpOwogICAgIGlmICghZG9jdW1lbnQp CiAgICAgICAgIHJldHVybjsKIAotICAgIFJlbmRlclZpZXcqIGRvY3VtZW50VmlldyA9IGRvY3Vt ZW50LT5yZW5kZXJWaWV3KCk7Ci0gICAgRWxlbWVudCogZG9jdW1lbnRFbGVtZW50ID0gZG9jdW1l bnQtPmRvY3VtZW50RWxlbWVudCgpOwotICAgIGlmICghZG9jdW1lbnRWaWV3IHx8ICFkb2N1bWVu dEVsZW1lbnQpCisgICAgYXV0byogcmVuZGVyVmlldyA9IGRvY3VtZW50LT5yZW5kZXJWaWV3KCk7 CisgICAgaWYgKCFyZW5kZXJWaWV3KQogICAgICAgICByZXR1cm47CiAKKyAgICBMT0coTGF5b3V0 LCAiRnJhbWVWaWV3ICVwIGF1dG9TaXplSWZFbmFibGVkIiwgdGhpcyk7CisgICAgU2V0Rm9yU2Nv cGU8Ym9vbD4gY2hhbmdlSW5BdXRvU2l6ZShtX2luQXV0b1NpemUsIHRydWUpOwogICAgIGlmICht X2xheW91dFJvb3QpCiAgICAgICAgIGNvbnZlcnRTdWJ0cmVlTGF5b3V0VG9GdWxsTGF5b3V0KCk7 CiAgICAgLy8gU3RhcnQgZnJvbSB0aGUgbWluaW11bSBzaXplIGFuZCBhbGxvdyBpdCB0byBncm93 LgogICAgIHJlc2l6ZShtX21pbkF1dG9TaXplLndpZHRoKCksIG1fbWluQXV0b1NpemUuaGVpZ2h0 KCkpOwotCiAgICAgSW50U2l6ZSBzaXplID0gZnJhbWVSZWN0KCkuc2l6ZSgpOwotCiAgICAgLy8g RG8gdGhlIHJlc2l6aW5nIHR3aWNlLiBUaGUgZmlyc3QgdGltZSBpcyBiYXNpY2FsbHkgYSByb3Vn aCBjYWxjdWxhdGlvbiB1c2luZyB0aGUgcHJlZmVycmVkIHdpZHRoCiAgICAgLy8gd2hpY2ggbWF5 IHJlc3VsdCBpbiBhIGhlaWdodCBjaGFuZ2UgZHVyaW5nIHRoZSBzZWNvbmQgaXRlcmF0aW9uLgog ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgMjsgaSsrKSB7CiAgICAgICAgIC8vIFVwZGF0ZSB2YXJp b3VzIHNpemVzIGluY2x1ZGluZyBjb250ZW50c1NpemUsIHNjcm9sbEhlaWdodCwgZXRjLgogICAg ICAgICBkb2N1bWVudC0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7Ci0g ICAgICAgIGludCB3aWR0aCA9IGRvY3VtZW50Vmlldy0+bWluUHJlZmVycmVkTG9naWNhbFdpZHRo KCk7Ci0gICAgICAgIGludCBoZWlnaHQgPSBkb2N1bWVudFZpZXctPmRvY3VtZW50UmVjdCgpLmhl aWdodCgpOworICAgICAgICBpbnQgd2lkdGggPSByZW5kZXJWaWV3LT5taW5QcmVmZXJyZWRMb2dp Y2FsV2lkdGgoKTsKKyAgICAgICAgaW50IGhlaWdodCA9IHJlbmRlclZpZXctPmRvY3VtZW50UmVj dCgpLmhlaWdodCgpOwogICAgICAgICBJbnRTaXplIG5ld1NpemUod2lkdGgsIGhlaWdodCk7CiAK ICAgICAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIGEgc2Nyb2xsYmFyIGlzIG5lZWRlZCBmb3IgYSBn aXZlbiBkaW1lbnNpb24gYW5kCkBAIC0zNzQwLDE4ICszNzM1LDE1IEBAIHZvaWQgRnJhbWVWaWV3 OjphdXRvU2l6ZUlmRW5hYmxlZCgpCiAgICAgICAgIHNldEhvcml6b250YWxTY3JvbGxiYXJMb2Nr KGZhbHNlKTsKICAgICAgICAgc2V0U2Nyb2xsYmFyTW9kZXMoaG9yaXpvbmFsU2Nyb2xsYmFyTW9k ZSwgdmVydGljYWxTY3JvbGxiYXJNb2RlLCB0cnVlLCB0cnVlKTsKICAgICB9Ci0KLSAgICAvLyBB bGwgdGhlIHJlc2l6aW5nIGFib3ZlIG1heSBoYXZlIGludmFsaWRhdGVkIHN0eWxlIChmb3IgZXhh bXBsZSBpZiB2aWV3cG9ydCB1bml0cyBhcmUgYmVpbmcgdXNlZCkuCi0gICAgZG9jdW1lbnQtPnVw ZGF0ZVN0eWxlSWZOZWVkZWQoKTsKLQotICAgIG1fYXV0b1NpemVDb250ZW50U2l6ZSA9IGNvbnRl bnRzU2l6ZSgpOwotCiAgICAgaWYgKG1fYXV0b1NpemVGaXhlZE1pbmltdW1IZWlnaHQpIHsKLSAg ICAgICAgcmVzaXplKG1fYXV0b1NpemVDb250ZW50U2l6ZS53aWR0aCgpLCBzdGQ6Om1heChtX2F1 dG9TaXplRml4ZWRNaW5pbXVtSGVpZ2h0LCBtX2F1dG9TaXplQ29udGVudFNpemUuaGVpZ2h0KCkp KTsKLSAgICAgICAgZG9jdW1lbnQtPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0 cygpOworICAgICAgICBhdXRvIGNvbnRlbnRzU2l6ZSA9IHRoaXMtPmNvbnRlbnRzU2l6ZSgpOwor ICAgICAgICByZXNpemUoY29udGVudHNTaXplLndpZHRoKCksIHN0ZDo6bWF4KG1fYXV0b1NpemVG aXhlZE1pbmltdW1IZWlnaHQsIGNvbnRlbnRzU2l6ZS5oZWlnaHQoKSkpOwogICAgIH0KLQorICAg IC8vIEFsbCB0aGUgcmVzaXppbmcgYWJvdmUgbWF5IGhhdmUgaW52YWxpZGF0ZWQgc3R5bGUgKGZv ciBleGFtcGxlIGlmIHZpZXdwb3J0IHVuaXRzIGFyZSBiZWluZyB1c2VkKS4KKyAgICBkb2N1bWVu dC0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CisgICAgbV9hdXRvU2l6 ZUNvbnRlbnRTaXplID0gY29udGVudHNTaXplKCk7CiAgICAgbV9kaWRSdW5BdXRvc2l6ZSA9IHRy dWU7CisgICAgLy8gRklYTUU6IE5vdyB0aGF0IGF1dG9TaXplSWZFbmFibGVkKCkgYWN0dWFsbHkg cmV0dXJucyBjbGVhbiwgd2UgZG9uJ3QgbmVlZCB0byBjYWxsIGl0IGZyb20gbGF5b3V0KCkgYW55 bW9yZS4KIH0KIAogdm9pZCBGcmFtZVZpZXc6OnNldEF1dG9TaXplRml4ZWRNaW5pbXVtSGVpZ2h0 KGludCBmaXhlZE1pbmltdW1IZWlnaHQpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggM2E3YjAzNGQ4MTg3NzJlN2JkMjFmYmQxY2IxMDMzNGIyYjAy MDJjNi4uMDU1NzA0ZDgxNDNhNDBkNDQ2ODkxMDQ3YzY3MmYwZDhiOWFkNzYyNiAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDE3LTA2LTAyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAg Q2xlbmF1cCBGcmFtZVZpZXc6OmF1dG9TaXplSWZFbmFibGVkLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyODg5CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8zMjU1MDc4Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL0F1dG9MYXlvdXRJbnRl Z3JhdGlvbi5tbToKKyAgICAgICAgKC1bQXV0b0xheW91dFdLV2ViVmlldyBsb2FkOndpdGhXaWR0 aDpleHBlY3RpbmdDb250ZW50U2l6ZTpyZXNldHRpbmdXaWR0aDpdKTogcHJvZ3Jlc3Npb24uCisg ICAgICAgIChURVNUKToKKwogMjAxNy0wNi0wMiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgUHJldmVudCBzY2hlbWUgaGFuZGxlcnMgZnJvbSBoYW5kbGluZyBh bGwgYnVpbHQtaW4gVVJMIHNjaGVtZXMuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJDb2NvYS9BdXRvTGF5b3V0SW50ZWdyYXRpb24ubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9BdXRvTGF5b3V0SW50ZWdyYXRpb24ubW0KaW5k ZXggZDg2OTI4YjY0NmY3MmRhMTlkYmQ4NjEzYWU2YTQzYmFlOTUwNWZkYi4uNTBiMzNmOWY1MDIz YzI2OGIxMzExY2U0ZTY0OWIyOTlhODExNjMxYyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvQXV0b0xheW91dEludGVncmF0aW9uLm1tCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL0F1dG9MYXlvdXRJbnRlZ3JhdGlv bi5tbQpAQCAtNjcsNiArNjcsNyBAQCAtICh2b2lkKWxvYWQ6KE5TU3RyaW5nICopSFRNTFN0cmlu ZyB3aXRoV2lkdGg6KENHRmxvYXQpd2lkdGggZXhwZWN0aW5nQ29udGVudFNpegogICAgICIubGFy Z2UgeyB3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IH0iCiAgICAgIi52ZXJ5V2lkZSB7IHdp ZHRoOiAxMDBweDsgaGVpZ2h0OiAxMHB4OyB9IgogICAgICIuaW5saW5lIHsgZGlzcGxheTogaW5s aW5lLWJsb2NrOyB9IgorICAgICIudmlld3BvcnRVbml0IHsgaGVpZ2h0OiA1MHZoOyB9IgogICAg ICI8L3N0eWxlPiI7CiAKICAgICBbc2VsZiBsb2FkSFRNTFN0cmluZzpbYmFzZUhUTUwgc3RyaW5n QnlBcHBlbmRpbmdTdHJpbmc6SFRNTFN0cmluZ10gYmFzZVVSTDpuaWxdOwpAQCAtMTMwLDYgKzEz MSwxMCBAQCBURVNUKFdlYktpdDIsIEF1dG9MYXlvdXRJbnRlZ3JhdGlvbikKICAgICAvLyAxMDB4 MTAgcmVjdCB3aXRoIHRoZSBjb25zdHJhaW50ICh3aWR0aCA+PSA1MCkgLT4gMTAweDEwCiAgICAg W3dlYlZpZXcgbG9hZDpAIjxkaXYgY2xhc3M9J3ZlcnlXaWRlJz48L2Rpdj4iIHdpdGhXaWR0aDo1 MCBleHBlY3RpbmdDb250ZW50U2l6ZTpOU01ha2VTaXplKDEwMCwgMTApXTsKIAorICAgIC8vIDEw MHB4IGhlaWdodCArIDUwdmggLT4gMTUwcHgKKyAgICBbd2ViVmlldyBfc2V0Vmlld3BvcnRTaXpl Rm9yQ1NTVmlld3BvcnRVbml0czpDR1NpemVNYWtlKDEwMCwgMTAwKV07CisgICAgW3dlYlZpZXcg bG9hZDpAIjxkaXYgY2xhc3M9J3ZpZXdwb3J0VW5pdCc+PC9kaXY+PGRpdiBjbGFzcz0nbGFyZ2Un PjwvZGl2PiIgd2l0aFdpZHRoOjEwMCBleHBlY3RpbmdDb250ZW50U2l6ZTpOU01ha2VTaXplKDEw MCwgMTUwKV07CisKICAgICAvLyBUZW4gMTB4MTAgcmVjdHMsIGlubGluZSwgc2hvdWxkIHJlc3Vs dCBpbiB0d28gcm93cyBvZiBmaXZlOyB3aXRoIHRoZSBjb25zdHJhaW50ICh3aWR0aCA+PSA1MCkg LT4gNTB4MjAKICAgICBbd2ViVmlldyBsb2FkOkAiPGRpdiBjbGFzcz0nc21hbGwgaW5saW5lJz48 L2Rpdj48ZGl2IGNsYXNzPSdzbWFsbCBpbmxpbmUnPjwvZGl2PjxkaXYgY2xhc3M9J3NtYWxsIGlu bGluZSc+PC9kaXY+PGRpdiBjbGFzcz0nc21hbGwgaW5saW5lJz48L2Rpdj48ZGl2IGNsYXNzPSdz bWFsbCBpbmxpbmUnPjwvZGl2PjxkaXYgY2xhc3M9J3NtYWxsIGlubGluZSc+PC9kaXY+PGRpdiBj bGFzcz0nc21hbGwgaW5saW5lJz48L2Rpdj48ZGl2IGNsYXNzPSdzbWFsbCBpbmxpbmUnPjwvZGl2 PjxkaXYgY2xhc3M9J3NtYWxsIGlubGluZSc+PC9kaXY+PGRpdiBjbGFzcz0nc21hbGwgaW5saW5l Jz48L2Rpdj4iIHdpdGhXaWR0aDo1MCBleHBlY3RpbmdDb250ZW50U2l6ZTpOU01ha2VTaXplKDUw LCAyMCldOwogCkBAIC0xNTcsNyArMTYyLDcgQEAgVEVTVChXZWJLaXQyLCBBdXRvTGF5b3V0SW50 ZWdyYXRpb24pCiAgICAgLy8gb2YgdGhlIGludHJpbnNpYyBoZWlnaHQgb2YgdGhlIGNvbnRlbnQu IFdlIGhhdmUgdG8gbG9hZCBkaWZmZXJlbnRseS1zaXplZCBjb250ZW50IHNvIHRoYXQgd2UgY2Fu IHdhaXQgZm9yCiAgICAgLy8gdGhlIGludHJpbnNpYyBzaXplIGNoYW5nZSBjYWxsYmFjay4KICAg ICBbd2ViVmlldyBfc2V0U2hvdWxkRXhwYW5kQ29udGVudFRvVmlld0hlaWdodEZvckF1dG9MYXlv dXQ6WUVTXTsKLSAgICBbd2ViVmlldyBsb2FkOkAiPGRpdiBjbGFzcz0nbGFyZ2UnPjwvZGl2PiIg d2l0aFdpZHRoOjUwIGV4cGVjdGluZ0NvbnRlbnRTaXplOk5TTWFrZVNpemUoMTAwLCAxMDApIHJl c2V0dGluZ1dpZHRoOk5PXTsKKyAgICBbd2ViVmlldyBsb2FkOkAiPGRpdiBjbGFzcz0nbGFyZ2Un PjwvZGl2PiIgd2l0aFdpZHRoOjUwIGV4cGVjdGluZ0NvbnRlbnRTaXplOk5TTWFrZVNpemUoMTAw LCAxMDAwKSByZXNldHRpbmdXaWR0aDpOT107CiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2Ny aXB0OkAid2luZG93LmlubmVySGVpZ2h0IiBjb21wbGV0aW9uSGFuZGxlcjpeKGlkIHZhbHVlLCBO U0Vycm9yICplcnJvcikgewogICAgICAgICBFWFBFQ1RfVFJVRShbdmFsdWUgaXNLaW5kT2ZDbGFz czpbTlNOdW1iZXIgY2xhc3NdXSk7CiAgICAgICAgIEVYUEVDVF9FUSgxMDAwLCBbdmFsdWUgaW50 ZWdlclZhbHVlXSk7Cg== 311902 2017-06-02 20:14:04 -0700 2017-06-02 21:40:42 -0700 Patch bug-172889-20170602201403.patch text/plain 7299 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI5ZGFmYTE4MDU4ZTBj MTBmZjEzZGZlZTU4ZjdlNDkxN2Q3YTYyNS4uYTAzMGM0MDMwYjE0ODdjMmQ0Njg4YWQ4MDExYWY0 ZGI4OGJkMjQ3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE3LTA2LTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBGcmFtZVZpZXc6 OmF1dG9TaXplSWZFbmFibGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyODg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjU1MDc4Mz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZW5z dXJlcyB0aGF0IHdlIGFsd2F5cyBoYXZlIGEgY2xlYW4gdHJlZSAoYW5kIGEgdmFsaWQgYW5kIGN1 cnJlbnQgZG9jdW1lbnQgc2l6ZSkgd2hlbgorICAgICAgICBzZXR0aW5nIG1fYXV0b1NpemVDb250 ZW50U2l6ZS4gCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OmF1dG9TaXplSWZFbmFibGVkKToKKwogMjAxNy0wNi0wMiAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04o cjIxMzQ2NCk6IFtpT1NdIEZvbnRzIGdldCB0b28gYm9sZCB3aGVuIHRoZSAiQm9sZCBUZXh0IiBh Y2Nlc3NpYmlsaXR5IHNldHRpbmcgaXMgZW5hYmxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CmluZGV4IDNlYTFlMGFlNDM3OTJhODkzZjg4YTM2MWVkMmUyYzFjMmQ4YjczYTguLmM0MWZjOGQz ZGQzZWM2OTQyMmE4MjMxMmRkMTE1NjA2MGQzMGRhYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKQEAgLTM2NTUsMzMgKzM2NTUsMjggQEAgdm9pZCBGcmFtZVZpZXc6OmF1dG9TaXplSWZF bmFibGVkKCkKICAgICBpZiAobV9pbkF1dG9TaXplKQogICAgICAgICByZXR1cm47CiAKLSAgICBM T0coTGF5b3V0LCAiRnJhbWVWaWV3ICVwIGF1dG9TaXplSWZFbmFibGVkIiwgdGhpcyk7Ci0KLSAg ICBTZXRGb3JTY29wZTxib29sPiBjaGFuZ2VJbkF1dG9TaXplKG1faW5BdXRvU2l6ZSwgdHJ1ZSk7 Ci0KLSAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBmcmFtZSgpLmRvY3VtZW50KCk7CisgICAgYXV0 byogZG9jdW1lbnQgPSBmcmFtZSgpLmRvY3VtZW50KCk7CiAgICAgaWYgKCFkb2N1bWVudCkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgUmVuZGVyVmlldyogZG9jdW1lbnRWaWV3ID0gZG9jdW1lbnQt PnJlbmRlclZpZXcoKTsKLSAgICBFbGVtZW50KiBkb2N1bWVudEVsZW1lbnQgPSBkb2N1bWVudC0+ ZG9jdW1lbnRFbGVtZW50KCk7Ci0gICAgaWYgKCFkb2N1bWVudFZpZXcgfHwgIWRvY3VtZW50RWxl bWVudCkKKyAgICBhdXRvKiByZW5kZXJWaWV3ID0gZG9jdW1lbnQtPnJlbmRlclZpZXcoKTsKKyAg ICBpZiAoIXJlbmRlclZpZXcpCiAgICAgICAgIHJldHVybjsKIAorICAgIExPRyhMYXlvdXQsICJG cmFtZVZpZXcgJXAgYXV0b1NpemVJZkVuYWJsZWQiLCB0aGlzKTsKKyAgICBTZXRGb3JTY29wZTxi b29sPiBjaGFuZ2VJbkF1dG9TaXplKG1faW5BdXRvU2l6ZSwgdHJ1ZSk7CiAgICAgaWYgKG1fbGF5 b3V0Um9vdCkKICAgICAgICAgY29udmVydFN1YnRyZWVMYXlvdXRUb0Z1bGxMYXlvdXQoKTsKICAg ICAvLyBTdGFydCBmcm9tIHRoZSBtaW5pbXVtIHNpemUgYW5kIGFsbG93IGl0IHRvIGdyb3cuCiAg ICAgcmVzaXplKG1fbWluQXV0b1NpemUud2lkdGgoKSwgbV9taW5BdXRvU2l6ZS5oZWlnaHQoKSk7 Ci0KICAgICBJbnRTaXplIHNpemUgPSBmcmFtZVJlY3QoKS5zaXplKCk7Ci0KICAgICAvLyBEbyB0 aGUgcmVzaXppbmcgdHdpY2UuIFRoZSBmaXJzdCB0aW1lIGlzIGJhc2ljYWxseSBhIHJvdWdoIGNh bGN1bGF0aW9uIHVzaW5nIHRoZSBwcmVmZXJyZWQgd2lkdGgKICAgICAvLyB3aGljaCBtYXkgcmVz dWx0IGluIGEgaGVpZ2h0IGNoYW5nZSBkdXJpbmcgdGhlIHNlY29uZCBpdGVyYXRpb24uCiAgICAg Zm9yIChpbnQgaSA9IDA7IGkgPCAyOyBpKyspIHsKICAgICAgICAgLy8gVXBkYXRlIHZhcmlvdXMg c2l6ZXMgaW5jbHVkaW5nIGNvbnRlbnRzU2l6ZSwgc2Nyb2xsSGVpZ2h0LCBldGMuCiAgICAgICAg IGRvY3VtZW50LT51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKLSAgICAg ICAgaW50IHdpZHRoID0gZG9jdW1lbnRWaWV3LT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsK LSAgICAgICAgaW50IGhlaWdodCA9IGRvY3VtZW50Vmlldy0+ZG9jdW1lbnRSZWN0KCkuaGVpZ2h0 KCk7CisgICAgICAgIGludCB3aWR0aCA9IHJlbmRlclZpZXctPm1pblByZWZlcnJlZExvZ2ljYWxX aWR0aCgpOworICAgICAgICBpbnQgaGVpZ2h0ID0gcmVuZGVyVmlldy0+ZG9jdW1lbnRSZWN0KCku aGVpZ2h0KCk7CiAgICAgICAgIEludFNpemUgbmV3U2l6ZSh3aWR0aCwgaGVpZ2h0KTsKIAogICAg ICAgICAvLyBDaGVjayB0byBzZWUgaWYgYSBzY3JvbGxiYXIgaXMgbmVlZGVkIGZvciBhIGdpdmVu IGRpbWVuc2lvbiBhbmQKQEAgLTM3NDAsMTggKzM3MzUsMTYgQEAgdm9pZCBGcmFtZVZpZXc6OmF1 dG9TaXplSWZFbmFibGVkKCkKICAgICAgICAgc2V0SG9yaXpvbnRhbFNjcm9sbGJhckxvY2soZmFs c2UpOwogICAgICAgICBzZXRTY3JvbGxiYXJNb2Rlcyhob3Jpem9uYWxTY3JvbGxiYXJNb2RlLCB2 ZXJ0aWNhbFNjcm9sbGJhck1vZGUsIHRydWUsIHRydWUpOwogICAgIH0KLQotICAgIC8vIEFsbCB0 aGUgcmVzaXppbmcgYWJvdmUgbWF5IGhhdmUgaW52YWxpZGF0ZWQgc3R5bGUgKGZvciBleGFtcGxl IGlmIHZpZXdwb3J0IHVuaXRzIGFyZSBiZWluZyB1c2VkKS4KLSAgICBkb2N1bWVudC0+dXBkYXRl U3R5bGVJZk5lZWRlZCgpOwotCi0gICAgbV9hdXRvU2l6ZUNvbnRlbnRTaXplID0gY29udGVudHNT aXplKCk7Ci0KICAgICBpZiAobV9hdXRvU2l6ZUZpeGVkTWluaW11bUhlaWdodCkgewotICAgICAg ICByZXNpemUobV9hdXRvU2l6ZUNvbnRlbnRTaXplLndpZHRoKCksIHN0ZDo6bWF4KG1fYXV0b1Np emVGaXhlZE1pbmltdW1IZWlnaHQsIG1fYXV0b1NpemVDb250ZW50U2l6ZS5oZWlnaHQoKSkpOwot ICAgICAgICBkb2N1bWVudC0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7 CisgICAgICAgIGF1dG8gY29udGVudHNTaXplID0gdGhpcy0+Y29udGVudHNTaXplKCk7CisgICAg ICAgIHJlc2l6ZShjb250ZW50c1NpemUud2lkdGgoKSwgc3RkOjptYXgobV9hdXRvU2l6ZUZpeGVk TWluaW11bUhlaWdodCwgY29udGVudHNTaXplLmhlaWdodCgpKSk7CiAgICAgfQotCisgICAgLy8g QWxsIHRoZSByZXNpemluZyBhYm92ZSBtYXkgaGF2ZSBpbnZhbGlkYXRlZCBzdHlsZSAoZm9yIGV4 YW1wbGUgaWYgdmlld3BvcnQgdW5pdHMgYXJlIGJlaW5nIHVzZWQpLgorICAgIGRvY3VtZW50LT51 cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKKyAgICBtX2F1dG9TaXplQ29u dGVudFNpemUgPSBjb250ZW50c1NpemUoKTsKICAgICBtX2RpZFJ1bkF1dG9zaXplID0gdHJ1ZTsK KyAgICBBU1NFUlQoIW5lZWRzTGF5b3V0KCkpOworICAgIC8vIEZJWE1FOiBOb3cgdGhhdCBhdXRv U2l6ZUlmRW5hYmxlZCgpIGFjdHVhbGx5IHJldHVybnMgY2xlYW4sIHdlIGRvbid0IG5lZWQgdG8g Y2FsbCBpdCBmcm9tIGxheW91dCgpIGFueW1vcmUgKHNlZSB3ZWJraXQub3JnL2IvMTcyODkwKS4K IH0KIAogdm9pZCBGcmFtZVZpZXc6OnNldEF1dG9TaXplRml4ZWRNaW5pbXVtSGVpZ2h0KGludCBm aXhlZE1pbmltdW1IZWlnaHQpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggM2E3YjAzNGQ4MTg3NzJlN2JkMjFmYmQxY2IxMDMzNGIyYjAyMDJjNi4u Y2UzYmYyMWNhZjViZGIwMDIyOTY4YmE3MjA4YTA2Y2Y4NzlhZDYwYSAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3 LTA2LTAyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW51 cCBGcmFtZVZpZXc6OmF1dG9TaXplSWZFbmFibGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyODg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8z MjU1MDc4Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvQXV0b0xheW91dEludGVncmF0aW9uLm1t OgorICAgICAgICAoLVtBdXRvTGF5b3V0V0tXZWJWaWV3IGxvYWQ6d2l0aFdpZHRoOmV4cGVjdGlu Z0NvbnRlbnRTaXplOnJlc2V0dGluZ1dpZHRoOl0pOiBwcm9ncmVzc2lvbi4KKyAgICAgICAgKFRF U1QpOgorCiAyMDE3LTA2LTAyICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBQcmV2ZW50IHNjaGVtZSBoYW5kbGVycyBmcm9tIGhhbmRsaW5nIGFsbCBidWlsdC1p biBVUkwgc2NoZW1lcy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0MkNvY29hL0F1dG9MYXlvdXRJbnRlZ3JhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0MkNvY29hL0F1dG9MYXlvdXRJbnRlZ3JhdGlvbi5tbQppbmRleCBkODY5Mjhi NjQ2ZjcyZGExOWRiZDg2MTNhZTZhNDNiYWU5NTA1ZmRiLi41MGIzM2Y5ZjUwMjNjMjY4YjEzMTFj ZTRlNjQ5YjI5OWE4MTE2MzFjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdDJDb2NvYS9BdXRvTGF5b3V0SW50ZWdyYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvQXV0b0xheW91dEludGVncmF0aW9uLm1tCkBAIC02 Nyw2ICs2Nyw3IEBAIC0gKHZvaWQpbG9hZDooTlNTdHJpbmcgKilIVE1MU3RyaW5nIHdpdGhXaWR0 aDooQ0dGbG9hdCl3aWR0aCBleHBlY3RpbmdDb250ZW50U2l6CiAgICAgIi5sYXJnZSB7IHdpZHRo OiAxMDBweDsgaGVpZ2h0OiAxMDBweDsgfSIKICAgICAiLnZlcnlXaWRlIHsgd2lkdGg6IDEwMHB4 OyBoZWlnaHQ6IDEwcHg7IH0iCiAgICAgIi5pbmxpbmUgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7 IH0iCisgICAgIi52aWV3cG9ydFVuaXQgeyBoZWlnaHQ6IDUwdmg7IH0iCiAgICAgIjwvc3R5bGU+ IjsKIAogICAgIFtzZWxmIGxvYWRIVE1MU3RyaW5nOltiYXNlSFRNTCBzdHJpbmdCeUFwcGVuZGlu Z1N0cmluZzpIVE1MU3RyaW5nXSBiYXNlVVJMOm5pbF07CkBAIC0xMzAsNiArMTMxLDEwIEBAIFRF U1QoV2ViS2l0MiwgQXV0b0xheW91dEludGVncmF0aW9uKQogICAgIC8vIDEwMHgxMCByZWN0IHdp dGggdGhlIGNvbnN0cmFpbnQgKHdpZHRoID49IDUwKSAtPiAxMDB4MTAKICAgICBbd2ViVmlldyBs b2FkOkAiPGRpdiBjbGFzcz0ndmVyeVdpZGUnPjwvZGl2PiIgd2l0aFdpZHRoOjUwIGV4cGVjdGlu Z0NvbnRlbnRTaXplOk5TTWFrZVNpemUoMTAwLCAxMCldOwogCisgICAgLy8gMTAwcHggaGVpZ2h0 ICsgNTB2aCAtPiAxNTBweAorICAgIFt3ZWJWaWV3IF9zZXRWaWV3cG9ydFNpemVGb3JDU1NWaWV3 cG9ydFVuaXRzOkNHU2l6ZU1ha2UoMTAwLCAxMDApXTsKKyAgICBbd2ViVmlldyBsb2FkOkAiPGRp diBjbGFzcz0ndmlld3BvcnRVbml0Jz48L2Rpdj48ZGl2IGNsYXNzPSdsYXJnZSc+PC9kaXY+IiB3 aXRoV2lkdGg6MTAwIGV4cGVjdGluZ0NvbnRlbnRTaXplOk5TTWFrZVNpemUoMTAwLCAxNTApXTsK KwogICAgIC8vIFRlbiAxMHgxMCByZWN0cywgaW5saW5lLCBzaG91bGQgcmVzdWx0IGluIHR3byBy b3dzIG9mIGZpdmU7IHdpdGggdGhlIGNvbnN0cmFpbnQgKHdpZHRoID49IDUwKSAtPiA1MHgyMAog ICAgIFt3ZWJWaWV3IGxvYWQ6QCI8ZGl2IGNsYXNzPSdzbWFsbCBpbmxpbmUnPjwvZGl2PjxkaXYg Y2xhc3M9J3NtYWxsIGlubGluZSc+PC9kaXY+PGRpdiBjbGFzcz0nc21hbGwgaW5saW5lJz48L2Rp dj48ZGl2IGNsYXNzPSdzbWFsbCBpbmxpbmUnPjwvZGl2PjxkaXYgY2xhc3M9J3NtYWxsIGlubGlu ZSc+PC9kaXY+PGRpdiBjbGFzcz0nc21hbGwgaW5saW5lJz48L2Rpdj48ZGl2IGNsYXNzPSdzbWFs bCBpbmxpbmUnPjwvZGl2PjxkaXYgY2xhc3M9J3NtYWxsIGlubGluZSc+PC9kaXY+PGRpdiBjbGFz cz0nc21hbGwgaW5saW5lJz48L2Rpdj48ZGl2IGNsYXNzPSdzbWFsbCBpbmxpbmUnPjwvZGl2PiIg d2l0aFdpZHRoOjUwIGV4cGVjdGluZ0NvbnRlbnRTaXplOk5TTWFrZVNpemUoNTAsIDIwKV07CiAK QEAgLTE1Nyw3ICsxNjIsNyBAQCBURVNUKFdlYktpdDIsIEF1dG9MYXlvdXRJbnRlZ3JhdGlvbikK ICAgICAvLyBvZiB0aGUgaW50cmluc2ljIGhlaWdodCBvZiB0aGUgY29udGVudC4gV2UgaGF2ZSB0 byBsb2FkIGRpZmZlcmVudGx5LXNpemVkIGNvbnRlbnQgc28gdGhhdCB3ZSBjYW4gd2FpdCBmb3IK ICAgICAvLyB0aGUgaW50cmluc2ljIHNpemUgY2hhbmdlIGNhbGxiYWNrLgogICAgIFt3ZWJWaWV3 IF9zZXRTaG91bGRFeHBhbmRDb250ZW50VG9WaWV3SGVpZ2h0Rm9yQXV0b0xheW91dDpZRVNdOwot ICAgIFt3ZWJWaWV3IGxvYWQ6QCI8ZGl2IGNsYXNzPSdsYXJnZSc+PC9kaXY+IiB3aXRoV2lkdGg6 NTAgZXhwZWN0aW5nQ29udGVudFNpemU6TlNNYWtlU2l6ZSgxMDAsIDEwMCkgcmVzZXR0aW5nV2lk dGg6Tk9dOworICAgIFt3ZWJWaWV3IGxvYWQ6QCI8ZGl2IGNsYXNzPSdsYXJnZSc+PC9kaXY+IiB3 aXRoV2lkdGg6NTAgZXhwZWN0aW5nQ29udGVudFNpemU6TlNNYWtlU2l6ZSgxMDAsIDEwMDApIHJl c2V0dGluZ1dpZHRoOk5PXTsKICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ3aW5k b3cuaW5uZXJIZWlnaHQiIGNvbXBsZXRpb25IYW5kbGVyOl4oaWQgdmFsdWUsIE5TRXJyb3IgKmVy cm9yKSB7CiAgICAgICAgIEVYUEVDVF9UUlVFKFt2YWx1ZSBpc0tpbmRPZkNsYXNzOltOU051bWJl ciBjbGFzc11dKTsKICAgICAgICAgRVhQRUNUX0VRKDEwMDAsIFt2YWx1ZSBpbnRlZ2VyVmFsdWVd KTsK