128187 2014-02-04 09:05:58 -0800 [CSS Shapes] Dynamically created element with image valued shape-outside doesn't update automatically 2014-02-05 10:34:49 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 giles_joplin giles_joplin bdakin commit-queue dino esprehn+autocc glenn hyatt kling kondapallykalyan simon.fraser zalan oldest_to_newest 976376 0 223123 giles_joplin 2014-02-04 09:05:58 -0800 Created attachment 223123 Test case. When a float with an image valued shape-outside property is added dynamically, the layout it impacts isn't always updated automatically, after the image has loaded. Manually refreshing the page does fix up the layout. This bug was also reported here: https://code.google.com/p/chromium/issues/detail?id=339136 976446 1 223141 giles_joplin 2014-02-04 11:12:56 -0800 Created attachment 223141 Patch Corrected the way shape-outside handles the completion of an image load. Move the shape-outside imageChanged() logic from RenderBlock to RenderBox and call markShapeOutsideDependentsForLayout() instead of parent()->setNeedsLayoutAndPrefWidthsRecalc(). The latter did not deal with descendants of the shape element's siblings correctly and it failed when the shape element was inserted dynamically. The markShapeOutsideDependentsForLayout() method can't be called during layout, so the imageChanged() code checks for that. The only scenario where imageChanged() can be called during layout (that I've discovered so far anyway) is when an SVG Image is renderered with drawImage(). The Shape::createRasterShape() does, and the corresponding imageChanged() notification can be safely ignored. 976776 2 kling 2014-02-05 09:43:37 -0800 Moving this up to RenderBox seems okay to me. Could someone with better layout-fu have a look? (CC'd) 976805 3 223141 commit-queue 2014-02-05 10:34:46 -0800 Comment on attachment 223141 Patch Clearing flags on attachment: 223141 Committed r163458: <http://trac.webkit.org/changeset/163458> 976806 4 commit-queue 2014-02-05 10:34:49 -0800 All reviewed patches have been landed. Closing bug. 223123 2014-02-04 09:05:58 -0800 2014-02-04 09:05:58 -0800 Test case. test.html text/html 3052 giles_joplin PGh0bWw+CjxoZWFkPgo8c3R5bGU+Ci5jb250YWluZXIgewogICAgd2lkdGg6IDIwMHB4OwogICAg Zm9udC1zaXplOiAxMnB4Owp9Ci5zaGFwZS1vdXRzaWRlIHsKICAgIHdpZHRoOiAxMDBweDsKICAg IGhlaWdodDogMTAwcHg7CiAgICBmbG9hdDogbGVmdDsKICAgIGNsZWFyOiBib3RoOwp9Ci5vbmUg ewogICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiB1cmwoImRhdGE6aW1hZ2Uvc3ZnK3htbDtVVEYt OCw8c3ZnIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zycgd2lkdGg9JzEwMHB4JyBo ZWlnaHQ9JzEwMHB4Jz48Y2lyY2xlIGN4PSc1MCcgY3k9JzUwJyByPSc1MCcgZmlsbD0nYmx1ZScg Lz48L3N2Zz4iKTsKICAgIHNoYXBlLW91dHNpZGU6IHVybCgiZGF0YTppbWFnZS9zdmcreG1sO1VU Ri04LDxzdmcgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTAwcHgn IGhlaWdodD0nMTAwcHgnPjxjaXJjbGUgY3g9JzUwJyBjeT0nNTAnIHI9JzUwJyBmaWxsPSdibHVl JyAvPjwvc3ZnPiIpOwogICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCJkYXRhOmltYWdlL3N2Zyt4 bWw7VVRGLTgsPHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScx MDBweCcgaGVpZ2h0PScxMDBweCc+PGNpcmNsZSBjeD0nNTAnIGN5PSc1MCcgcj0nNTAnIGZpbGw9 J2JsdWUnIC8+PC9zdmc+Iik7Cn0KLnR3byB7CiAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IHVy bCgiY2lyY2xlMTAweDEwMC5zdmciKTsKICAgIHNoYXBlLW91dHNpZGU6IHVybCgiY2lyY2xlMTAw eDEwMC5zdmciKTsKICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgiY2lyY2xlMTAweDEwMC5zdmci KTsKfQo8L3N0eWxlPgo8c2NyaXB0Pgp3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oKSB7CiAgICB2 YXIgY29udGFpbmVyID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLmNvbnRhaW5lcicpOwogICAg Ly8gdmFyIHNoYXBlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CiAgICAvLyBzaGFw ZS5jbGFzc05hbWUgPSAnc2hhcGUtb3V0c2lkZSBvbmUnOwogICAgLy8gY29udGFpbmVyLmluc2Vy dEJlZm9yZShzaGFwZSwgY29udGFpbmVyLmZpcnN0Q2hpbGQpOwoKICAgIHZhciBzaGFwZSA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpOwogICAgc2hhcGUuY2xhc3NOYW1lID0gJ3NoYXBl LW91dHNpZGUgdHdvJzsKICAgIGNvbnRhaW5lci5pbnNlcnRCZWZvcmUoc2hhcGUsIGNvbnRhaW5l ci5maXJzdENoaWxkKTsKfQo8L3NjcmlwdD4KPC9oZWFkPgo8Ym9keT4KPGRpdiBjbGFzcz0nY29u dGFpbmVyJz4KPHA+VGhlIGNyb3RjaCBhbGx1ZGVkIHRvIG9uIGEgcHJldmlvdXMgcGFnZSBkZXNl cnZlcyBpbmRlcGVuZGVudCBtZW50aW9uLiBJdCBpcyBhIG5vdGNoZWQgc3RpY2sgb2YgYSBwZWN1 bGlhciBmb3JtLCBzb21lIHR3byBmZWV0IGluIGxlbmd0aCwgd2hpY2ggaXMgcGVycGVuZGljdWxh cmx5IGluc2VydGVkIGludG8gdGhlIHN0YXJib2FyZCBndW53YWxlIG5lYXIgdGhlIGJvdywgZm9y IHRoZSBwdXJwb3NlIG9mIGZ1cm5pc2hpbmcgYSByZXN0IGZvciB0aGUgd29vZGVuIGV4dHJlbWl0 eSBvZiB0aGUgaGFycG9vbiwgd2hvc2Ugb3RoZXIgbmFrZWQsIGJhcmJlZCBlbmQgc2xvcGluZ2x5 IHByb2plY3RzIGZyb20gdGhlIHByb3cuIFRoZXJlYnkgdGhlIHdlYXBvbiBpcyBpbnN0YW50bHkg YXQgaGFuZCB0byBpdHMgaHVybGVyLCB3aG8gc25hdGNoZXMgaXQgdXAgYXMgcmVhZGlseSBmcm9t IGl0cyByZXN0IGFzIGEgYmFja3dvb2RzbWFuIHN3aW5ncyBoaXMgcmlmbGUgZnJvbSB0aGUgd2Fs bC4gSXQgaXMgY3VzdG9tYXJ5IHRvIGhhdmUgdHdvIGhhcnBvb25zIHJlcG9zaW5nIGluIHRoZSBj cm90Y2gsIHJlc3BlY3RpdmVseSBjYWxsZWQgdGhlIGZpcnN0IGFuZCBzZWNvbmQgaXJvbnMuPC9w PgoKPHA+QnV0IHRoZXNlIHR3byBoYXJwb29ucywgZWFjaCBieSBpdHMgb3duIGNvcmQsIGFyZSBi b3RoIGNvbm5lY3RlZCB3aXRoIHRoZSBsaW5lOyB0aGUgb2JqZWN0IGJlaW5nIHRoaXM6IHRvIGRh cnQgdGhlbSBib3RoLCBpZiBwb3NzaWJsZSwgb25lIGluc3RhbnRseSBhZnRlciB0aGUgb3RoZXIg aW50byB0aGUgc2FtZSB3aGFsZTsgc28gdGhhdCBpZiwgaW4gdGhlIGNvbWluZyBkcmFnLCBvbmUg c2hvdWxkIGRyYXcgb3V0LCB0aGUgb3RoZXIgbWF5IHN0aWxsIHJldGFpbiBhIGhvbGQuIEl0IGlz IGEgZG91Ymxpbmcgb2YgdGhlIGNoYW5jZXMuIEJ1dCBpdCB2ZXJ5IG9mdGVuIGhhcHBlbnMgdGhh dCBvd2luZyB0byB0aGUgaW5zdGFudGFuZW91cywgdmlvbGVudCwgY29udnVsc2l2ZSBydW5uaW5n IG9mIHRoZSB3aGFsZSB1cG9uIHJlY2VpdmluZyB0aGUgZmlyc3QgaXJvbiwgaXQgYmVjb21lcyBp bXBvc3NpYmxlIGZvciB0aGUgaGFycG9vbmVlciwgaG93ZXZlciBsaWdodG5pbmctbGlrZSBpbiBo aXMgbW92ZW1lbnRzLCB0byBwaXRjaCB0aGUgc2Vjb25kIGlyb24gaW50byBoaW0uIE5ldmVydGhl bGVzcywgYXMgdGhlIHNlY29uZCBpcm9uIGlzIGFscmVhZHkgY29ubmVjdGVkIHdpdGggdGhlIGxp bmUsIGFuZCB0aGUgbGluZSBpcyBydW5uaW5nLCBoZW5jZSB0aGF0IHdlYXBvbiBtdXN0LCBhdCBh bGwgZXZlbnRzLCBiZSBhbnRpY2lwYXRpbmdseSB0b3NzZWQgb3V0IG9mIHRoZSBib2F0LCBzb21l aG93IGFuZCBzb21ld2hlcmU7IGVsc2UgdGhlIG1vc3QgdGVycmlibGUgamVvcGFyZHkgd291bGQg aW52b2x2ZSBhbGwgaGFuZHMuIFR1bWJsZWQgaW50byB0aGUgd2F0ZXIsIGl0IGFjY29yZGluZ2x5 IGlzIGluIHN1Y2ggY2FzZXM7IHRoZSBzcGFyZSBjb2lscyBvZiBib3ggbGluZSAobWVudGlvbmVk IGluIGEgcHJlY2VkaW5nIGNoYXB0ZXIpIG1ha2luZyB0aGlzIGZlYXQsIGluIG1vc3QgaW5zdGFu Y2VzLCBwcnVkZW50bHkgcHJhY3RpY2FibGUuIEJ1dCB0aGlzIGNyaXRpY2FsIGFjdCBpcyBub3Qg YWx3YXlzIHVuYXR0ZW5kZWQgd2l0aCB0aGUgc2FkZGVzdCBhbmQgbW9zdCBmYXRhbCBjYXN1YWx0 aWVzLjwvcD4KPC9kaXY+CjwvYm9keT4KPC9odG1sPg== 223141 2014-02-04 11:12:56 -0800 2014-02-05 10:34:46 -0800 Patch tmp.patch text/plain 5591 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5ZjVhMGEzLi5lNjBlMWZmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDIt MDQgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIER5bmFtaWNhbGx5IGNyZWF0ZWQgZWxlbWVudCB3aXRoIGltYWdlIHZhbHVlZCBzaGFwZS1v dXRzaWRlIGRvZXNuJ3QgdXBkYXRlIGF1dG9tYXRpY2FsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODE4NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLWV4cGVjdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNp ZGUtaW5zZXJ0LXN2Zy1zaGFwZS5odG1sOiBBZGRlZC4KKwogMjAxNC0wMi0wNCAgQW5kcnplaiBC YWRvd3NraSAgPGEuYmFkb3dza2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gQWRkIGV4 cGVjdGF0aW9ucyBmb3IgdHdvIGZsYWt5IG1lZGlhIGxheW91dCB0ZXN0cwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lk ZS1pbnNlcnQtc3ZnLXNoYXBlLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBl cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWluc2VydC1zdmctc2hhcGUtZXhw ZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MWNkNDczCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLWV4cGVjdGVkLmh0bWwKQEAgLTAs MCArMSwxNiBAQAorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIGZv bnQ6IDUwcHgvMSBBaGVtLCBzYW5zLXNlcmlmOworICAgIGNvbG9yOiBncmVlbjsKK30KKzwvc3R5 bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+Cis8cD5YPGJyPiZu YnNwO1g8YnI+WDwvcD4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgorCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRl LWluc2VydC1zdmctc2hhcGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91 dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtaW5zZXJ0LXN2Zy1zaGFwZS5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY3ZWZmZDQKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRl LWluc2VydC1zdmctc2hhcGUuaHRtbApAQCAtMCwwICsxLDMyIEBACis8aHRtbD4KKzxoZWFkPgor PHN0eWxlPgorLmNvbnRhaW5lciB7CisgICAgZm9udDogNTBweC8xIEFoZW0sIHNhbnMtc2VyaWY7 CisgICAgLXdlYmtpdC1mb250LXNtb290aGluZzogYW50aWFsaWFzZWQ7CisgICAgY29sb3I6IGdy ZWVuOworfQorCisuc2hhcGUtb3V0c2lkZSB7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdo dDogMTAwcHg7CisgICAgZmxvYXQ6IGxlZnQ7CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiB1 cmwoImRhdGE6aW1hZ2Uvc3ZnK3htbDt1dGY4LDxzdmcgeG1sbnM9J2h0dHA6Ly93d3cudzMub3Jn LzIwMDAvc3ZnJyB3aWR0aD0nMTAwcHgnIGhlaWdodD0nMTAwcHgnPjxyZWN0IHg9JzAnIHk9JzUw JyB3aWR0aD0nNDknIGhlaWdodD0nNDknIGZpbGw9J2JsdWUnLz48L3N2Zz4iKTsKK30KKzwvc3R5 bGU+Cis8c2NyaXB0Pgord2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgeworICAgIHZhciBjb250 YWluZXIgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCcuY29udGFpbmVyJyk7CisgICAgdmFyIHNo YXBlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CisgICAgc2hhcGUuY2xhc3NOYW1l ID0gJ3NoYXBlLW91dHNpZGUnOworICAgIGNvbnRhaW5lci5pbnNlcnRCZWZvcmUoc2hhcGUsIGNv bnRhaW5lci5maXJzdENoaWxkKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2 IGNsYXNzPSdjb250YWluZXInPgorPHA+WDxicj5YPGJyPlg8L3A+Cis8L2Rpdj4KKzwvYm9keT4K KzwvaHRtbD4KKwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDdlZDM2MjguLjlkMGYxMjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyNyBAQAorMjAxNC0wMi0wNCAgSGFucyBNdWxsZXIgIDxobXVsbGVyQGFkb2JlLmNv bT4KKworICAgICAgICBbQ1NTIFNoYXBlc10gRHluYW1pY2FsbHkgY3JlYXRlZCBlbGVtZW50IHdp dGggaW1hZ2UgdmFsdWVkIHNoYXBlLW91dHNpZGUgZG9lc24ndCB1cGRhdGUgYXV0b21hdGljYWxs eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MTg3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29ycmVj dGVkIHRoZSB3YXkgc2hhcGUtb3V0c2lkZSBoYW5kbGVzIHRoZSBjb21wbGV0aW9uIG9mIGFuIGlt YWdlIGxvYWQuIE1vdmUKKyAgICAgICAgdGhlIHNoYXBlLW91dHNpZGUgaW1hZ2VDaGFuZ2VkKCkg bG9naWMgZnJvbSBSZW5kZXJCbG9jayB0byBSZW5kZXJCb3ggYW5kIGNhbGwKKyAgICAgICAgbWFy a1NoYXBlT3V0c2lkZURlcGVuZGVudHNGb3JMYXlvdXQoKSBpbnN0ZWFkIG9mIHBhcmVudCgpLT5z ZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNhbGMoKS4KKyAgICAgICAgVGhlIGxhdHRlciBk aWQgbm90IGRlYWwgd2l0aCBkZXNjZW5kYW50cyBvZiB0aGUgc2hhcGUgZWxlbWVudCdzIHNpYmxp bmdzIGNvcnJlY3RseSBhbmQgaXQKKyAgICAgICAgZmFpbGVkIHdoZW4gdGhlIHNoYXBlIGVsZW1l bnQgd2FzIGluc2VydGVkIGR5bmFtaWNhbGx5LiBUaGUgbWFya1NoYXBlT3V0c2lkZURlcGVuZGVu dHNGb3JMYXlvdXQoKQorICAgICAgICBtZXRob2QgY2FuJ3QgYmUgY2FsbGVkIGR1cmluZyBsYXlv dXQsIHNvIHRoZSBpbWFnZUNoYW5nZWQoKSBjb2RlIGNoZWNrcyBmb3IgdGhhdC4gVGhlIG9ubHkK KyAgICAgICAgc2NlbmFyaW8gd2hlcmUgaW1hZ2VDaGFuZ2VkKCkgY2FuIGJlIGNhbGxlZCBkdXJp bmcgbGF5b3V0ICh0aGF0IEkndmUgZGlzY292ZXJlZCBzbyBmYXIgYW55d2F5KQorICAgICAgICBp cyB3aGVuIGFuIFNWRyBJbWFnZSBpcyByZW5kZXJlcmVkICB3aXRoIGRyYXdJbWFnZSgpLiBUaGUg U2hhcGU6OmNyZWF0ZVJhc3RlclNoYXBlKCkgZG9lcyB0aGlzLAorICAgICAgICBhbmQgdGhlIGNv cnJlc3BvbmRpbmcgaW1hZ2VDaGFuZ2VkKCkgbm90aWZpY2F0aW9uIGNhbiBiZSBzYWZlbHkgaWdu b3JlZC4KKworICAgICAgICBUZXN0OiBmYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9z aGFwZS1vdXRzaWRlLWluc2VydC1zdmctc2hhcGUuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjppbWFnZUNo YW5nZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjppbWFnZUNoYW5nZWQpOgorCiAyMDE0LTAyLTA0ICBSeXVhbiBDaG9p ICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbQ01BS0VdIFJlbW92ZSB3b3Jr YXJvdW5kIGZvciBHQ0MgNC42CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cAppbmRleCA1NzQ1MTkxLi42Mjc2N2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKQEAgLTEzNTUsMTAgKzEzNTUsNiBAQCB2b2lkIFJlbmRlckJsb2NrOjppbWFn ZUNoYW5nZWQoV3JhcHBlZEltYWdlUHRyIGltYWdlLCBjb25zdCBJbnRSZWN0KikKICAgICAgICAg bWFya1NoYXBlSW5zaWRlRGVzY2VuZGFudHNGb3JMYXlvdXQoKTsKICAgICB9CiAjZW5kaWYKLQot ICAgIFNoYXBlVmFsdWUqIHNoYXBlT3V0c2lkZVZhbHVlID0gc3R5bGUoKS5zaGFwZU91dHNpZGUo KTsKLSAgICBpZiAoaXNGbG9hdGluZygpICYmIHNoYXBlT3V0c2lkZVZhbHVlICYmIHNoYXBlT3V0 c2lkZVZhbHVlLT5pbWFnZSgpICYmIHNoYXBlT3V0c2lkZVZhbHVlLT5pbWFnZSgpLT5kYXRhKCkg PT0gaW1hZ2UpCi0gICAgICAgIHBhcmVudCgpLT5zZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNS ZWNhbGMoKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CmluZGV4IGE4MzNhNDIuLmJlMjA2MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCkBAIC0xNTM5LDYgKzE1MzksMTQgQEAgdm9pZCBSZW5kZXJCb3g6OmltYWdlQ2hhbmdl ZChXcmFwcGVkSW1hZ2VQdHIgaW1hZ2UsIGNvbnN0IEludFJlY3QqKQogICAgICAgICByZXR1cm47 CiAgICAgfQogCisjaWYgRU5BQkxFKENTU19TSEFQRVMpCisgICAgU2hhcGVWYWx1ZSogc2hhcGVP dXRzaWRlVmFsdWUgPSBzdHlsZSgpLnNoYXBlT3V0c2lkZSgpOworICAgIGlmICghdmlldygpLmZy YW1lVmlldygpLmlzSW5MYXlvdXQoKSAmJiBpc0Zsb2F0aW5nKCkgJiYgc2hhcGVPdXRzaWRlVmFs dWUgJiYgc2hhcGVPdXRzaWRlVmFsdWUtPmltYWdlKCkgJiYgc2hhcGVPdXRzaWRlVmFsdWUtPmlt YWdlKCktPmRhdGEoKSA9PSBpbWFnZSkgeworICAgICAgICBTaGFwZU91dHNpZGVJbmZvOjplbnN1 cmVJbmZvKCp0aGlzKS5kaXJ0eVNoYXBlU2l6ZSgpOworICAgICAgICBtYXJrU2hhcGVPdXRzaWRl RGVwZW5kZW50c0ZvckxheW91dCgpOworICAgIH0KKyNlbmRpZgorCiAgICAgYm9vbCBkaWRGdWxs UmVwYWludCA9IHJlcGFpbnRMYXllclJlY3RzRm9ySW1hZ2UoaW1hZ2UsIHN0eWxlKCkuYmFja2dy b3VuZExheWVycygpLCB0cnVlKTsKICAgICBpZiAoIWRpZEZ1bGxSZXBhaW50KQogICAgICAgICBy ZXBhaW50TGF5ZXJSZWN0c0ZvckltYWdlKGltYWdlLCBzdHlsZSgpLm1hc2tMYXllcnMoKSwgZmFs c2UpOwo=