148520 2015-08-27 02:55:37 -0700 Text areas resizer and scrollbars shouldn't be rendered while printing 2016-07-15 12:50:05 -0700 1 1 1 Unclassified WebKit Printing WebKit Local Build Unspecified Unspecified NEW P2 Normal --- 1 cgarcia webkit-unassigned commit-queue darin esprehn+autocc glenn kondapallykalyan simon.fraser tonikitoo zalan oldest_to_newest 1121266 0 cgarcia 2015-08-27 02:55:37 -0700 The resizer is useless in a printed document. Some HTML forms that are printed to be filled manually look really weird with the resizer in the text areas. 1121267 1 260049 cgarcia 2015-08-27 02:58:24 -0700 Created attachment 260049 Patch 1121270 2 260049 simon.fraser 2015-08-27 03:04:25 -0700 Comment on attachment 260049 Patch Isn't the same true of scrollbars? Why is this different? 1121271 3 cgarcia 2015-08-27 03:10:08 -0700 (In reply to comment #2) > Comment on attachment 260049 [details] > Patch > > Isn't the same true of scrollbars? Why is this different? Yes, I guess it also applies to scrollbars, I noticed it after printing a form with text areas, but no scrollbars. 1143609 4 265946 cgarcia 2015-11-20 02:42:13 -0800 Created attachment 265946 Updated patch Also hide the scrollbars and include a layout test. 1144904 5 265946 darin 2015-11-30 13:17:53 -0800 Comment on attachment 265946 Updated patch Patch is OK but I’d prefer not to make the printing mechanism, already messy, so much messier. I think this makes things a little worse by sprinkling more printing-specific code in some, but not all, places that deal with scroll bars. Originally I had many comments about how to simplify this, but now I think I have only one comment: Seems we’d want to use the style system for this if possible instead of adding special case code for printing. There’s a media type of "print" and we can eliminate both scrollbars and resizers with !important style rules. Can we try this? @media print { ::-webkit-scrollbar { display: none !important; } ::-webkit-resizer { display: none !important; } } Perhaps this can go right into html.css? If not, maybe there’s some other way to introduce those style rules at the right time. I suspect this will eliminate the need for any code changes in RenderLayer and RenderListBox; some small changes to FrameView or ScrollView might be needed, but they would likely be minimal, and also likely would fix bugs where these style rules aren’t properly respected. Another thought: I don’t think the current patch covers all the cases. What about RenderMenuList and RenderSearchField? Should cover those with test cases too. I’m going to say r=me but I’d like to see a version with fewer code changes. The printing code should be reduced in complexity if possible rather than increased. 1145179 6 cgarcia 2015-12-01 00:45:23 -0800 (In reply to comment #5) > Comment on attachment 265946 [details] > Updated patch > > Patch is OK but I’d prefer not to make the printing mechanism, already > messy, so much messier. I think this makes things a little worse by > sprinkling more printing-specific code in some, but not all, places that > deal with scroll bars. Originally I had many comments about how to simplify > this, but now I think I have only one comment: Seems we’d want to use the > style system for this if possible instead of adding special case code for > printing. There’s a media type of "print" and we can eliminate both > scrollbars and resizers with !important style rules. Can we try this? > > @media print { > ::-webkit-scrollbar { display: none !important; } > ::-webkit-resizer { display: none !important; } > } > > Perhaps this can go right into html.css? If not, maybe there’s some other > way to introduce those style rules at the right time. Great, idea, I'll try that. I also thought about something similar, injecting a user style sheet before printing and removing it afterwards, but this looks a lot cleaner to me. > I suspect this will eliminate the need for any code changes in RenderLayer > and RenderListBox; some small changes to FrameView or ScrollView might be > needed, but they would likely be minimal, and also likely would fix bugs > where these style rules aren’t properly respected. > > Another thought: I don’t think the current patch covers all the cases. What > about RenderMenuList and RenderSearchField? Should cover those with test > cases too. In both cases the scrollbars are in the popups, no? so I assumed the popups are always hidden when printing. > I’m going to say r=me but I’d like to see a version with fewer code changes. > The printing code should be reduced in complexity if possible rather than > increased. I agree, thanks for the review. 260049 2015-08-27 02:58:24 -0700 2015-11-20 02:42:13 -0800 Patch wcore-resizer-printing.diff text/plain 1374 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MWNjZTk5Li4wMzg4NDAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTUtMDgtMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFRleHQgYXJlYXMgcmVzaXplciBzaG91bGRuJ3QgYmUgcmVuZGVyZWQgd2hp bGUgcHJpbnRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0ODUyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoZSByZXNpemVyIGlzIHVzZWxlc3MgaW4gYSBwcmludGVkIGRvY3VtZW50LiBTb21lIEhU TUwgZm9ybXMgdGhhdAorICAgICAgICBhcmUgcHJpbnRlZCB0byBiZSBmaWxsZWQgbWFudWFsbHkg bG9vayByZWFsbHkgd2VpcmQgd2l0aCB0aGUKKyAgICAgICAgcmVzaXplciBpbiB0aGUgdGV4dCBh cmVhcy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRSZXNpemVyKTogUmV0dXJuIGVhcmx5IHdoZW4gcHJp bnRpbmcuCisKIDIwMTUtMDgtMjYgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIHdhdGNoZG9nIG1fZGlkRmlyZSBzdGF0ZSBlcnJvbmVvdXNseSByZXRhaW5lZC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGI4NTlkZmUuLmRkYjlk NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMzY2MCw2 ICszNjYwLDkgQEAgdm9pZCBSZW5kZXJMYXllcjo6ZHJhd1BsYXRmb3JtUmVzaXplckltYWdlKEdy YXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3UKIAogdm9pZCBSZW5kZXJMYXllcjo6 cGFpbnRSZXNpemVyKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3V0UG9pbnQm IHBhaW50T2Zmc2V0LCBjb25zdCBMYXlvdXRSZWN0JiBkYW1hZ2VSZWN0KQogeworICAgIGlmIChy ZW5kZXJlcigpLnZpZXcoKS5wcmludGluZygpKQorICAgICAgICByZXR1cm47CisKICAgICBpZiAo cmVuZGVyZXIoKS5zdHlsZSgpLnJlc2l6ZSgpID09IFJFU0laRV9OT05FKQogICAgICAgICByZXR1 cm47CiAK 265946 2015-11-20 02:42:13 -0800 2015-11-30 13:17:53 -0800 Updated patch wcore-resizer-scrollbars-printing.diff text/plain 12975 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjY2E5YmU5Li5lNDQwODE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTUtMTEt MjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAg IFRleHQgYXJlYXMgcmVzaXplciBhbmQgc2Nyb2xsYmFycyBzaG91bGRuJ3QgYmUgcmVuZGVyZWQg d2hpbGUgcHJpbnRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0ODUyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBhIHRlc3QgdG8gY2hlY2sgdGhhdCBzY3JvbGxiYXJzIGFuZCByZXNpemVyIGFy ZSBub3QgcmVuZGVyZWQKKyAgICAgICAgd2hpbGUgcHJpbnRlZC4KKworICAgICAgICAqIHByaW50 aW5nL3Njcm9sbGJhcnMtYW5kLXJlc2l6ZXItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAg ICogcHJpbnRpbmcvc2Nyb2xsYmFycy1hbmQtcmVzaXplci5odG1sOiBBZGRlZC4KKwogMjAxNS0x MS0xOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgU2VsZWN0aW9uLmRlbGV0ZUZyb21Eb2N1bWVudCBzaG91bGQgbm90IGxlYXZlIGEgc2VsZWN0 aW9uIGNoYXJhY3RlcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcHJpbnRpbmcvc2Nyb2xsYmFy cy1hbmQtcmVzaXplci1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvcHJpbnRpbmcvc2Nyb2xs YmFycy1hbmQtcmVzaXplci1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjY5Y2RmZDcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wcmludGlu Zy9zY3JvbGxiYXJzLWFuZC1yZXNpemVyLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw3NSBAQAor PGh0bWw+Cis8c2NyaXB0PgorICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5l ci5zZXRQcmludGluZygpOworPC9zY3JpcHQ+Cis8c3R5bGU+Cis6Oi13ZWJraXQtc2Nyb2xsYmFy IHsgZGlzcGxheTogbm9uZTsgfQorCis6Oi13ZWJraXQtcmVzaXplciB7IGRpc3BsYXk6IG5vbmU7 IH0KKwordGV4dGFyZWEsIHNlbGVjdCB7CisgIGhlaWdodDogMTAwcHg7Cit9CisKK2RpdiB7Cisg IG1heC1oZWlnaHQ6IDEwMHB4OworICBtYXgtd2lkdGg6IDEwMHB4OworICBib3JkZXI6IDFweCBz b2xpZCBibGFjazsKKyAgb3ZlcmZsb3c6IGF1dG87Cit9Cis8L3N0eWxlPgorPGJvZHk+CisgIDx0 ZXh0YXJlYT48L3RleHRhcmVhPgorICA8dGV4dGFyZWE+CisgICAgTGluZSAxCisgICAgTGluZSAy CisgICAgTGluZSAzCisgICAgTGluZSA0CisgICAgTGluZSA1CisgICAgTGluZSA2CisgICAgTGlu ZSA3CisgICAgTGluZSA4CisgICAgTGluZSA5CisgICAgTGluZTEwCisgIDwvdGV4dGFyZWE+Cisg IDxzZWxlY3QgbXVsdGlwbGU+CisgICAgPG9wdGlvbj5PcHRpb24gMTwvb3B0aW9uPgorICAgIDxv cHRpb24+T3B0aW9uIDI8L29wdGlvbj4KKyAgICA8b3B0aW9uIHNlbGVjdGVkPk9wdGlvbiAzPC9v cHRpb24+CisgICAgPG9wdGlvbj5PcHRpb24gNDwvb3B0aW9uPgorICAgIDxvcHRpb24+T3B0aW9u IDU8L29wdGlvbj4KKyAgICA8b3B0aW9uPk9wdGlvbiA2PC9vcHRpb24+CisgICAgPG9wdGlvbj5P cHRpb24gNzwvb3B0aW9uPgorICAgIDxvcHRpb24+T3B0aW9uIDg8L29wdGlvbj4KKyAgICA8b3B0 aW9uPk9wdGlvbiA5PC9vcHRpb24+CisgICAgPG9wdGlvbj5PcHRpb24gMTA8L29wdGlvbj4KKyAg PC9zZWxlY3Q+CisgIDwhLS0gQSBibG9jayB3aXRoIHZlcnRpY2FsIHNjcm9sbGJhciAtLT4KKyAg PGRpdj4KKyAgICBMaW5lIDE8YnIvPgorICAgIExpbmUgMjxici8+CisgICAgTGluZSAzPGJyLz4K KyAgICBMaW5lIDQ8YnIvPgorICAgIExpbmUgNTxici8+CisgICAgTGluZSA2PGJyLz4KKyAgICBM aW5lIDc8YnIvPgorICAgIExpbmUgODxici8+CisgICAgTGluZSA5PGJyLz4KKyAgICBMaW5lMTA8 YnIvPgorICA8L2Rpdj4KKyAgPCEtLSBBIGJsb2NrIHdpdGggaG9yaXpvbnRhbCBzY3JvbGxiYXIg LS0+CisgIDxkaXY+CisgICAgTG9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29uZ2VyIGxpbmUgMTxici8+CisgIDwvZGl2PgorICA8IS0tIEEgYmxvY2sgd2l0aCBib3Ro IHNjcm9sbGJhcnMgLS0+CisgIDxkaXY+CisgICAgTG9vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29uZ2VyIGxpbmUgMTxici8+CisgICAgTG9vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29uZ2VyIGxpbmUgMjxici8+CisgICAgTG9vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZ2VyIGxpbmUgMzxici8+CisgICAg TG9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZ2VyIGxpbmUgNDxi ci8+CisgICAgTG9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZ2Vy IGxpbmUgNTxici8+CisgIDwvZGl2PgorICA8aWZyYW1lIHNyYz0iLi9yZXNvdXJjZXMvaWZyYW1l LXN1YmZyYW1lLXZlcnRpY2FsLXJsLmh0bWwiIGZyYW1lYm9yZGVyPSIxIiB3aWR0aD0iMTAwIiBo ZWlnaHQ9IjEwMCI+PC9pZnJhbWU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9wcmludGluZy9zY3JvbGxiYXJzLWFuZC1yZXNpemVyLmh0bWwgYi9MYXlvdXRUZXN0 cy9wcmludGluZy9zY3JvbGxiYXJzLWFuZC1yZXNpemVyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uYmUxMTFiNwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L3ByaW50aW5nL3Njcm9sbGJhcnMtYW5kLXJlc2l6ZXIuaHRtbApAQCAtMCwwICsxLDcxIEBACis8 aHRtbD4KKzxzY3JpcHQ+CisgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVy LnNldFByaW50aW5nKCk7Cis8L3NjcmlwdD4KKzxzdHlsZT4KK3RleHRhcmVhLCBzZWxlY3Qgewor ICBoZWlnaHQ6IDEwMHB4OworfQorCitkaXYgeworICBtYXgtaGVpZ2h0OiAxMDBweDsKKyAgbWF4 LXdpZHRoOiAxMDBweDsKKyAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7CisgIG92ZXJmbG93OiBh dXRvOworfQorPC9zdHlsZT4KKzxib2R5PgorICA8dGV4dGFyZWE+PC90ZXh0YXJlYT4KKyAgPHRl eHRhcmVhPgorICAgIExpbmUgMQorICAgIExpbmUgMgorICAgIExpbmUgMworICAgIExpbmUgNAor ICAgIExpbmUgNQorICAgIExpbmUgNgorICAgIExpbmUgNworICAgIExpbmUgOAorICAgIExpbmUg OQorICAgIExpbmUxMAorICA8L3RleHRhcmVhPgorICA8c2VsZWN0IG11bHRpcGxlPgorICAgIDxv cHRpb24+T3B0aW9uIDE8L29wdGlvbj4KKyAgICA8b3B0aW9uPk9wdGlvbiAyPC9vcHRpb24+Cisg ICAgPG9wdGlvbiBzZWxlY3RlZD5PcHRpb24gMzwvb3B0aW9uPgorICAgIDxvcHRpb24+T3B0aW9u IDQ8L29wdGlvbj4KKyAgICA8b3B0aW9uPk9wdGlvbiA1PC9vcHRpb24+CisgICAgPG9wdGlvbj5P cHRpb24gNjwvb3B0aW9uPgorICAgIDxvcHRpb24+T3B0aW9uIDc8L29wdGlvbj4KKyAgICA8b3B0 aW9uPk9wdGlvbiA4PC9vcHRpb24+CisgICAgPG9wdGlvbj5PcHRpb24gOTwvb3B0aW9uPgorICAg IDxvcHRpb24+T3B0aW9uIDEwPC9vcHRpb24+CisgIDwvc2VsZWN0PgorICA8IS0tIEEgYmxvY2sg d2l0aCB2ZXJ0aWNhbCBzY3JvbGxiYXIgLS0+CisgIDxkaXY+CisgICAgTGluZSAxPGJyLz4KKyAg ICBMaW5lIDI8YnIvPgorICAgIExpbmUgMzxici8+CisgICAgTGluZSA0PGJyLz4KKyAgICBMaW5l IDU8YnIvPgorICAgIExpbmUgNjxici8+CisgICAgTGluZSA3PGJyLz4KKyAgICBMaW5lIDg8YnIv PgorICAgIExpbmUgOTxici8+CisgICAgTGluZTEwPGJyLz4KKyAgPC9kaXY+CisgIDwhLS0gQSBi bG9jayB3aXRoIGhvcml6b250YWwgc2Nyb2xsYmFyIC0tPgorICA8ZGl2PgorICAgIExvb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vbmdlciBsaW5lIDE8YnIvPgorICA8 L2Rpdj4KKyAgPCEtLSBBIGJsb2NrIHdpdGggYm90aCBzY3JvbGxiYXJzIC0tPgorICA8ZGl2Pgor ICAgIExvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vbmdlciBsaW5l IDE8YnIvPgorICAgIExvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v bmdlciBsaW5lIDI8YnIvPgorICAgIExvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vbmdlciBsaW5lIDM8YnIvPgorICAgIExvb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vbmdlciBsaW5lIDQ8YnIvPgorICAgIExvb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vbmdlciBsaW5lIDU8YnIvPgorICA8L2Rpdj4KKyAg PGlmcmFtZSBzcmM9Ii4vcmVzb3VyY2VzL2lmcmFtZS1zdWJmcmFtZS12ZXJ0aWNhbC1ybC5odG1s IiBmcmFtZWJvcmRlcj0iMSIgd2lkdGg9IjEwMCIgaGVpZ2h0PSIxMDAiPjwvaWZyYW1lPgorPC9i b2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFhMDNlZDcuLjY0MTM2YzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSw0MCBAQAorMjAxNS0xMS0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGV4dCBhcmVhcyByZXNpemVyIGFuZCBzY3JvbGxi YXJzIHNob3VsZG4ndCBiZSByZW5kZXJlZCB3aGlsZSBwcmludGluZworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTIwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHJlc2l6ZXIgYW5kIHNjcm9sbGJh cnMgYXJlIHVzZWxlc3MgaW4gYSBwcmludGVkIGRvY3VtZW50LiBTb21lCisgICAgICAgIEhUTUwg Zm9ybXMgdGhhdCBhcmUgcHJpbnRlZCB0byBiZSBmaWxsZWQgbWFudWFsbHkgbG9vayByZWFsbHkK KyAgICAgICAgd2VpcmQgd2l0aCB0aGUgcmVzaXplciBpbiB0aGUgdGV4dCBhcmVhcy4KKworICAg ICAgICBUZXN0OiBwcmludGluZy9zY3JvbGxiYXJzLWFuZC1yZXNpemVyLmh0bWwKKworICAgICAg ICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cHJp bnRpbmcpOiBJbXBsZW1lbnQgU2Nyb2xsVmlldzo6cHJpbnRpbmcoKS4KKyAgICAgICAgKiBwYWdl L0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6dW5zY2FsZWRWaXNpYmxlQ29udGVudFNpemVJbmNsdWRp bmdPYnNjdXJlZEFyZWEpOgorICAgICAgICBEbyBub3QgY29uc2lkZXIgc2Nyb2xsYmFycyB3aGVu IHByaW50aW5nLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6cGFpbnQpOiBEbyBub3Qg cGFpbnQgc2Nyb2xsYmFycyB3aGVuIHByaW50aW5nLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9s bFZpZXcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbENvcm5lclJlY3QpOiBSZXR1cm4gZW1wdHkgcmVj dGFuZ2xlCisgICAgICAgIGZvciBzY3JvbGwgY29ybmVyIHdoZW4gcHJpbnRpbmcuCisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cmVjdEZvckhvcml6b250YWxTY3JvbGxiYXIpOiBSZXR1 cm4gZW1wdHkKKyAgICAgICAgcmVjdGFuZ2xlIGZvciBzY3JvbGxiYXIgd2hlbiBwcmludGluZy4K KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpyZWN0Rm9yVmVydGljYWxTY3JvbGxiYXIp OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludFJlc2l6ZXIpOiBE byBub3QgcGFpbnQgdGhlIHJlc2l6ZXIKKyAgICAgICAgd2hlbiBwcmludGluZy4KKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM aXN0Qm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyk6IERvIG5vdAorICAgICAgICBj b25zaWRlciBzY3JvbGxiYXIgd2hlbiBwcmludGluZy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxpc3RCb3g6OnBhaW50U2Nyb2xsYmFyKTogRG8gbm90IHBhaW50IHRoZQorICAgICAgICBzY3Jv bGxiYXIgd2hlbiBwcmludGluZy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnZl cnRpY2FsU2Nyb2xsYmFyV2lkdGgpOiBSZXR1cm4gMCBhcworICAgICAgICBzY3JvbGxiYXIgd2lk dGggd2hlbiBwcmludGluZy4KKwogMjAxNS0xMS0xOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgU2VsZWN0aW9uLmRlbGV0ZUZyb21Eb2N1bWVu dCBzaG91bGQgbm90IGxlYXZlIGEgc2VsZWN0aW9uIGNoYXJhY3RlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCmluZGV4IDMxYWMzMWUuLmNlNGVlMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKQEAgLTM2ODIsNiArMzY4MiwxMyBAQCBib29sIEZyYW1lVmlldzo6c2Nyb2xsQW5pbWF0 b3JFbmFibGVkKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgRnJhbWVWaWV3 OjpwcmludGluZygpIGNvbnN0Cit7CisgICAgaWYgKERvY3VtZW50KiBkb2N1bWVudCA9IGZyYW1l KCkuZG9jdW1lbnQoKSkKKyAgICAgICAgcmV0dXJuIGRvY3VtZW50LT5wcmludGluZygpOworICAg IHJldHVybiBmYWxzZTsKK30KKwogI2lmIEVOQUJMRShEQVNIQk9BUkRfU1VQUE9SVCkKIHZvaWQg RnJhbWVWaWV3Ojp1cGRhdGVBbm5vdGF0ZWRSZWdpb25zKCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oCmluZGV4IGIxYjUwNDUuLmE3NGI2N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAt NjI5LDYgKzYyOSw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBTY3JvbGxhYmxlQXJlYSogZW5j bG9zaW5nU2Nyb2xsYWJsZUFyZWEoKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIEludFJl Y3Qgc2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0JveChib29sKiA9IG51bGxwdHIpIGNvbnN0IG92ZXJy aWRlOwogICAgIHZpcnR1YWwgYm9vbCBzY3JvbGxBbmltYXRvckVuYWJsZWQoKSBjb25zdCBvdmVy cmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgcHJpbnRpbmcoKSBjb25zdCBvdmVycmlkZTsKICAgICB2 aXJ0dWFsIEdyYXBoaWNzTGF5ZXIqIGxheWVyRm9yU2Nyb2xsaW5nKCkgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCBHcmFwaGljc0xheWVyKiBsYXllckZvckhvcml6b250YWxTY3JvbGxiYXIo KSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIEdyYXBoaWNzTGF5ZXIqIGxheWVyRm9yVmVy dGljYWxTY3JvbGxiYXIoKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsVmlldy5jcHAKaW5kZXggZGRlZGU2NS4uZjU1N2YxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsVmlldy5jcHAKQEAgLTI3OCw3ICsyNzgsNyBAQCBJbnRTaXplIFNjcm9sbFZpZXc6 OnVuc2NhbGVkVmlzaWJsZUNvbnRlbnRTaXplSW5jbHVkaW5nT2JzY3VyZWRBcmVhKFZpc2libGVD b250ZQogICAgIGludCB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoID0gMDsKICAgICBpbnQgaG9yaXpv bnRhbFNjcm9sbGJhckhlaWdodCA9IDA7CiAKLSAgICBpZiAoc2Nyb2xsYmFySW5jbHVzaW9uID09 IEV4Y2x1ZGVTY3JvbGxiYXJzKSB7CisgICAgaWYgKHNjcm9sbGJhckluY2x1c2lvbiA9PSBFeGNs dWRlU2Nyb2xsYmFycyAmJiAhcHJpbnRpbmcoKSkgewogICAgICAgICBpZiAoU2Nyb2xsYmFyKiB2 ZXJ0aWNhbEJhciA9IHZlcnRpY2FsU2Nyb2xsYmFyKCkpCiAgICAgICAgICAgICB2ZXJ0aWNhbFNj cm9sbGJhcldpZHRoID0gIXZlcnRpY2FsQmFyLT5pc092ZXJsYXlTY3JvbGxiYXIoKSA/IHZlcnRp Y2FsQmFyLT53aWR0aCgpIDogMDsKICAgICAgICAgaWYgKFNjcm9sbGJhciogaG9yaXpvbnRhbEJh ciA9IGhvcml6b250YWxTY3JvbGxiYXIoKSkKQEAgLTEyMjgsNyArMTIyOCw3IEBAIHZvaWQgU2Ny b2xsVmlldzo6cGFpbnQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBy ZWN0KQogI2VuZGlmCiAKICAgICAvLyBOb3cgcGFpbnQgdGhlIHNjcm9sbGJhcnMuCi0gICAgaWYg KCFtX3Njcm9sbGJhcnNTdXBwcmVzc2VkICYmIChtX2hvcml6b250YWxTY3JvbGxiYXIgfHwgbV92 ZXJ0aWNhbFNjcm9sbGJhcikpIHsKKyAgICBpZiAoIW1fc2Nyb2xsYmFyc1N1cHByZXNzZWQgJiYg IXByaW50aW5nKCkgJiYgKG1faG9yaXpvbnRhbFNjcm9sbGJhciB8fCBtX3ZlcnRpY2FsU2Nyb2xs YmFyKSkgewogICAgICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoY29u dGV4dCk7CiAgICAgICAgIEludFJlY3Qgc2Nyb2xsVmlld0RpcnR5UmVjdCA9IHJlY3Q7CiAgICAg ICAgIEludFJlY3QgdmlzaWJsZUFyZWFXaXRoU2Nyb2xsYmFycyhsb2NhdGlvbigpLCB1bm9ic2N1 cmVkQ29udGVudFJlY3RJbmNsdWRpbmdTY3JvbGxiYXJzKCkuc2l6ZSgpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbFZpZXcuaAppbmRleCAyMWM4NTM5Li41NzQxNjlhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5oCkBAIC00MTcsNiArNDE3LDggQEAgcHJvdGVjdGVkOgogCiAg ICAgdmlydHVhbCB2b2lkIHNjcm9sbFBvc2l0aW9uQ2hhbmdlZFZpYVBsYXRmb3JtV2lkZ2V0SW1w bChjb25zdCBJbnRQb2ludCYsIGNvbnN0IEludFBvaW50JikgeyB9CiAKKyAgICB2aXJ0dWFsIGJv b2wgcHJpbnRpbmcoKSBjb25zdCA9IDA7CisKIHByaXZhdGU6CiAgICAgdmlydHVhbCBJbnRSZWN0 IHZpc2libGVDb250ZW50UmVjdEludGVybmFsKFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Ny b2xsYmFycywgVmlzaWJsZUNvbnRlbnRSZWN0QmVoYXZpb3IpIGNvbnN0IG92ZXJyaWRlOwogICAg IFdFQkNPUkVfRVhQT1JUIEludFJlY3QgdW5vYnNjdXJlZENvbnRlbnRSZWN0SW50ZXJuYWwoVmlz aWJsZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvbGxiYXJzID0gRXhjbHVkZVNjcm9sbGJhcnMpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMGU4OTVk OS4uMWQ0ZTIyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBA IC0yODIyLDYgKzI4MjIsOSBAQCBzdGF0aWMgTGF5b3V0UmVjdCBjb3JuZXJSZWN0KGNvbnN0IFJl bmRlckxheWVyKiBsYXllciwgY29uc3QgTGF5b3V0UmVjdCYgYm91bmRzKQogCiBJbnRSZWN0IFJl bmRlckxheWVyOjpzY3JvbGxDb3JuZXJSZWN0KCkgY29uc3QKIHsKKyAgICBpZiAocmVuZGVyZXIo KS52aWV3KCkucHJpbnRpbmcoKSkKKyAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKKwogICAgIC8v IFdlIGhhdmUgYSBzY3JvbGxiYXIgY29ybmVyIHdoZW4gYSBzY3JvbGxiYXIgaXMgdmlzaWJsZSBh bmQgbm90IGZpbGxpbmcgdGhlIGVudGlyZSBsZW5ndGggb2YgdGhlIGJveC4KICAgICAvLyBUaGlz IGhhcHBlbnMgd2hlbjoKICAgICAvLyAoYSkgQSByZXNpemVyIGlzIHByZXNlbnQgYW5kIGF0IGxl YXN0IG9uZSBzY3JvbGxiYXIgaXMgcHJlc2VudApAQCAtMjk1Myw3ICsyOTU2LDcgQEAgYm9vbCBS ZW5kZXJMYXllcjo6aXNIYW5kbGluZ1doZWVsRXZlbnQoKSBjb25zdAogCiBJbnRSZWN0IFJlbmRl ckxheWVyOjpyZWN0Rm9ySG9yaXpvbnRhbFNjcm9sbGJhcihjb25zdCBJbnRSZWN0JiBib3JkZXJC b3hSZWN0KSBjb25zdAogewotICAgIGlmICghbV9oQmFyKQorICAgIGlmICghbV9oQmFyIHx8IHJl bmRlcmVyKCkudmlldygpLnByaW50aW5nKCkpCiAgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CiAK ICAgICBjb25zdCBSZW5kZXJCb3gqIGJveCA9IHJlbmRlckJveCgpOwpAQCAtMjk2Nyw3ICsyOTcw LDcgQEAgSW50UmVjdCBSZW5kZXJMYXllcjo6cmVjdEZvckhvcml6b250YWxTY3JvbGxiYXIoY29u c3QgSW50UmVjdCYgYm9yZGVyQm94UmVjdCkgY28KIAogSW50UmVjdCBSZW5kZXJMYXllcjo6cmVj dEZvclZlcnRpY2FsU2Nyb2xsYmFyKGNvbnN0IEludFJlY3QmIGJvcmRlckJveFJlY3QpIGNvbnN0 CiB7Ci0gICAgaWYgKCFtX3ZCYXIpCisgICAgaWYgKCFtX3ZCYXIgfHwgcmVuZGVyZXIoKS52aWV3 KCkucHJpbnRpbmcoKSkKICAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKIAogICAgIGNvbnN0IFJl bmRlckJveCogYm94ID0gcmVuZGVyQm94KCk7CkBAIC0zNjYyLDYgKzM2NjUsOSBAQCB2b2lkIFJl bmRlckxheWVyOjpkcmF3UGxhdGZvcm1SZXNpemVySW1hZ2UoR3JhcGhpY3NDb250ZXh0JiBjb250 ZXh0LCBjb25zdCBMYXlvdQogCiB2b2lkIFJlbmRlckxheWVyOjpwYWludFJlc2l6ZXIoR3JhcGhp Y3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsIGNvbnN0 IExheW91dFJlY3QmIGRhbWFnZVJlY3QpCiB7CisgICAgaWYgKHJlbmRlcmVyKCkudmlldygpLnBy aW50aW5nKCkpCisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChyZW5kZXJlcigpLnN0eWxlKCku cmVzaXplKCkgPT0gUkVTSVpFX05PTkUpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCmluZGV4IDhhYzQ4MTAuLjcyZjQ1MDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTE5MSw3ICsx OTEsNyBAQCB2b2lkIFJlbmRlckxpc3RCb3g6OnNjcm9sbFRvUmV2ZWFsU2VsZWN0aW9uKCkKIHZv aWQgUmVuZGVyTGlzdEJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5p dCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0CiB7 CiAgICAgbWF4TG9naWNhbFdpZHRoID0gbV9vcHRpb25zV2lkdGggKyAyICogb3B0aW9uc1NwYWNp bmdIb3Jpem9udGFsOwotICAgIGlmIChtX3ZCYXIpCisgICAgaWYgKG1fdkJhciAmJiAhZG9jdW1l bnQoKS5wcmludGluZygpKQogICAgICAgICBtYXhMb2dpY2FsV2lkdGggKz0gbV92QmFyLT53aWR0 aCgpOwogICAgIGlmICghc3R5bGUoKS53aWR0aCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKQog ICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGg7CkBAIC0zMzksNyArMzM5 LDcgQEAgdm9pZCBSZW5kZXJMaXN0Qm94OjphZGRGb2N1c1JpbmdSZWN0cyhWZWN0b3I8SW50UmVj dD4mIHJlY3RzLCBjb25zdCBMYXlvdXRQb2ludCYKIAogdm9pZCBSZW5kZXJMaXN0Qm94OjpwYWlu dFNjcm9sbGJhcihQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50 T2Zmc2V0KQogewotICAgIGlmIChtX3ZCYXIpIHsKKyAgICBpZiAobV92QmFyICYmICFkb2N1bWVu dCgpLnByaW50aW5nKCkpIHsKICAgICAgICAgSW50UmVjdCBzY3JvbGxSZWN0ID0gc25hcHBlZElu dFJlY3QocGFpbnRPZmZzZXQueCgpICsgd2lkdGgoKSAtIGJvcmRlclJpZ2h0KCkgLSBtX3ZCYXIt PndpZHRoKCksCiAgICAgICAgICAgICBwYWludE9mZnNldC55KCkgKyBib3JkZXJUb3AoKSwKICAg ICAgICAgICAgIG1fdkJhci0+d2lkdGgoKSwKQEAgLTYzMCw3ICs2MzAsNyBAQCBMYXlvdXRVbml0 IFJlbmRlckxpc3RCb3g6Oml0ZW1IZWlnaHQoKSBjb25zdAogCiBpbnQgUmVuZGVyTGlzdEJveDo6 dmVydGljYWxTY3JvbGxiYXJXaWR0aCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fdkJhciAmJiAh bV92QmFyLT5pc092ZXJsYXlTY3JvbGxiYXIoKSA/IG1fdkJhci0+d2lkdGgoKSA6IDA7CisgICAg cmV0dXJuIG1fdkJhciAmJiAhZG9jdW1lbnQoKS5wcmludGluZygpICYmICFtX3ZCYXItPmlzT3Zl cmxheVNjcm9sbGJhcigpID8gbV92QmFyLT53aWR0aCgpIDogMDsKIH0KIAogLy8gRklYTUU6IFdl IGlnbm9yZSBwYWRkaW5nIGluIHRoZSB2ZXJ0aWNhbCBkaXJlY3Rpb24gYXMgZmFyIGFzIHRoZXNl IHZhbHVlcyBhcmUgY29uY2VybmVkLCBzaW5jZSB0aGF0J3MK