60644 2011-05-11 12:08:12 -0700 WebKit inserts base, link, meta, style, and title elements into an editable region when pasting table cells from Excel 2011-05-12 13:53:09 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified OS X 10.6 RESOLVED FIXED P2 Normal --- 60620 60653 1 rniwa rniwa abarth aestes ap commit-queue darin dcheng enrica eric ian jparent leviw ojan tony oldest_to_newest 402147 0 rniwa 2011-05-11 12:08:12 -0700 WebKit currently inserts elements that should only appear in head such as link, meta, and style elements when pasting HTML format. We should strip these elements instead to avoid bloating the resultant markup. 402341 1 93195 rniwa 2011-05-11 15:27:03 -0700 Created attachment 93195 fixes the bug 402347 2 ap 2011-05-11 15:32:56 -0700 How do these elements end up in a fragment parsed from the pasteboard? I'm thinking of bug 60155, where style disappears because it's being moved out to <head>. 402352 3 rniwa 2011-05-11 15:35:36 -0700 (In reply to comment #2) > How do these elements end up in a fragment parsed from the pasteboard? I'm thinking of bug 60155, where style disappears because it's being moved out to <head>. Oh I think it's moved to head when we insert the head into the document. 402357 4 rniwa 2011-05-11 15:40:07 -0700 Oops, I answered pre-maturely without reading the comments on the bug 60155. My guess is that DOCTYPE, html, or head elements in this test are triggering something in the fragment parsing algorithm to switch to non-body mode. 402369 5 ojan 2011-05-11 15:50:49 -0700 What do IE, Firefox, Opera do in these cases? 402378 6 93195 eric 2011-05-11 15:57:45 -0700 Comment on attachment 93195 fixes the bug I thought the HTML5 parser moved head elemetns to th head? thus they wouldn't appear in the fragment since fragment contnets are only what shows up in the body... 402390 7 rniwa 2011-05-11 16:14:27 -0700 (In reply to comment #5) > What do IE, Firefox, Opera do in these cases? Firefox passes the test. I couldn't test IE other than verifying that IE doesn't paste those elements into the content editable area since IE doesn't support InsertHTML. 402394 8 ian 2011-05-11 16:17:05 -0700 Once you're in <body>, nothing gets pushed to <head>. That was changed a while ago. Also even when things did get pushed, they wouldn't if you were using innerHTML (fragment parsing). 402396 9 rniwa 2011-05-11 16:18:21 -0700 At some point, we'll need to share code that implements: http://dev.w3.org/2006/webapi/clipops/clipops.html#cross-origin-copy-paste-of-source-code 402451 10 rniwa 2011-05-11 17:16:45 -0700 Looking at: http://dev.w3.org/2006/webapi/clipops/clipops.html#cross-origin-copy-paste-of-source-code 1. Parse the code on the clipboard to a DOM tree 2. Remove all of the following elements: SCRIPT, APPLET, OBJECT, FORM, INPUT, BUTTON, TEXTAREA, SELECT, OPTION, OPTGROUP and comment nodes. For all mentioned elements except FORM, also remove all child nodes. 3. Remove any elements whose computed style's display property is 'none' 4. Remove all event handler attributes from all elements 5. Remove all data- attributes from all elements 6. If the implementation supports embedding javascript: URLs or other forms of scripting inside CSS instructions, such scripts must be removed. 7. Remove HTML comments. Serialize the DOM and return the generated string to the script We'll need a some style resolution mechanism to do step 3. Eric, can we do step 3 in the fragment parsing algorithm? Or do we not support CSS style resolution without a WebView? 402627 11 ojan 2011-05-11 21:01:49 -0700 The test-case in the patch is a bit weird and covers the excel case, but I wonder if it breaks other things. Can you try the following test and see what IE/Firefox/Opera do? I put some pseudo-code, but the copy-paste needs to be done manually. Specifically, I think that with this patch, the styled stuff will no longer be styled after the cut+paste. I just want to make sure other browsers do this as well. <html> <body> <div id=editable contentEditable> <style>...</style> <div>styled stuff here</div> </div> <script> var editable = document.getElementById('editable'); editable.focus(); document.execCommand('selectall', false false); document.execCommand('cut', false false); document.execCommand('paste', false false); </script> </body> </html> 402885 12 rniwa 2011-05-12 09:17:56 -0700 (In reply to comment #11) > Specifically, I think that with this patch, the styled stuff will no longer be styled after the cut+paste. I just want to make sure other browsers do this as well. Sure, in this particular case, we'll lose some style. But if copy & paste are done across different websites, even weirder thing happens: Consider pasting: hello <style> blockquote { border-left: 2px solid black; } </style> <blockquote>world</blockquote> into <div contenteditable> </div> <blockquote>WebKit</blockquote> If we had copied style element, blockquote OUTSIDE of the contenteditable region suddenly starts to have a border on the left. Note: we can fix both of these problems we create a fake document, paste the entire content into the fake document, and then re-serialize the contents using StyledMarkupAccumulator and then re-paste it into the current document. 402894 13 rniwa 2011-05-12 09:33:07 -0700 FYI, IE8 and FF3.6 seem to preserve style element. Nonetheless, I think this patch is an improvement over the current situation where pasted style element can pollute non-editable regions (or editable regions that do not share the highest editable root) until we can properly handle style element. 402904 14 ap 2011-05-12 09:50:45 -0700 When I paste formatted text into GMail in Safari 5.0.5 on Mac, the formatting is preserved. Will it still work with this patch? Did you test any other services that let you create formatted documents on the Web? 402975 15 rniwa 2011-05-12 11:10:12 -0700 (In reply to comment #14) > When I paste formatted text into GMail in Safari 5.0.5 on Mac, the formatting is preserved. Will it still work with this patch? > > Did you test any other services that let you create formatted documents on the Web? This shouldn't break whenever you're copying & pasting within WebKit because WebKit will serialize styles that are coming from rules into inline style declaration. 402993 16 93195 commit-queue 2011-05-12 11:22:10 -0700 Comment on attachment 93195 fixes the bug Clearing flags on attachment: 93195 Committed r86360: <http://trac.webkit.org/changeset/86360> 402995 17 commit-queue 2011-05-12 11:22:17 -0700 All reviewed patches have been landed. Closing bug. 403014 18 ap 2011-05-12 11:32:16 -0700 > This shouldn't break whenever you're copying & pasting within WebKit because WebKit will serialize styles that are coming from rules into inline style declaration. I was pasting from TextEdit. 403025 19 commit-queue 2011-05-12 11:37:55 -0700 The commit-queue encountered the following flaky tests while processing attachment 93195: http/tests/xmlhttprequest/xmlhttprequest-50ms-download-dispatch.html bug 52016 (author: jchaffraix@webkit.org) The commit-queue is continuing to process your patch. 403121 20 rniwa 2011-05-12 13:53:09 -0700 (In reply to comment #18) > > This shouldn't break whenever you're copying & pasting within WebKit because WebKit will serialize styles that are coming from rules into inline style declaration. > > I was pasting from TextEdit. TextEdit, as far as I know, inserts inline style declaration so this shouldn't be an issue. 93195 2011-05-11 15:27:03 -0700 2011-05-12 11:22:10 -0700 fixes the bug bug-60644-20110511152702.patch text/plain 7546 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogODYyNzAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyZTQyNDFlYjE4N2IzN2QyYjBmYTIx MTRkMWZmZTljYmQ4OTUyNGY1Li45OTdlZmNmNjJlNDZmZWM1MDFjOTk2Mzg0ZGNkMDAxNTlkZjAw ODhmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDUtMTEgIFJ5b3N1a2UgTml3YSAgPHJu aXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2ViS2l0IGluc2VydHMgYmFzZSwgbGluaywgbWV0YSwgc3R5bGUsIGFuZCB0aXRs ZSBlbGVtZW50cyBpbnRvIGFuIGVkaXRhYmxlIHJlZ2lvbgorICAgICAgICB3aGVuIHBhc3Rpbmcg dGFibGUgY2VsbHMgZnJvbSBFeGNlbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjA2NDQKKworICAgICAgICBBZGRlZCBhIHRlc3QgdG8gZW5zdXJlIFdl YktpdCBzdHJpcHMgdGhlIHNhaWQgZWxlbWVudHMgcHJpb3IgdG8gaW5zZXJ0aW5nIEhUTUwuCisK KyAgICAgICAgKiBlZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUtaGVhZC1jb250ZW50cy1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1oZWFkLWNv bnRlbnRzLmh0bWw6IEFkZGVkLgorCiAyMDExLTA1LTExICBBZGFtIFJvYmVuICA8YXJvYmVuQGFw cGxlLmNvbT4KIAogICAgICAgICBUZXN0IHdoYXQgaGFwcGVucyB3aGVuIGEgcGx1Z2luIG1ha2Vz IGEgdGFyZ2V0ZWQgamF2YXNjcmlwdDogcmVxdWVzdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLWhlYWQtY29udGVudHMtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLWhlYWQtY29udGVudHMtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjNlMTIzYjYwZWNlNTI2MGJiZjI2MDllNzEwYWE1N2E2YjA1MmJhMWEK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUt aGVhZC1jb250ZW50cy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACitUaGlzIHRlc3QgZW5z dXJlcyBXZWJLaXQgc3RyaXBzIGF3YXkgYmFzZSwgbGluaywgbWV0YSwgc3R5bGUsIGFuZCB0aXRs ZSBlbGVtZW50cyBiZWZvcmUgaW5zZXJ0aW5nIEhUTUwuCisKK1BBU1MKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLWhlYWQtY29udGVudHMuaHRtbCBi L0xheW91dFRlc3RzL2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1oZWFkLWNvbnRlbnRzLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uY2RlODQ2MmYyM2ExMDg1OWJmZGMwMTJmNjBmZThlZDNhNDUwYjE4OAotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1oZWFk LWNvbnRlbnRzLmh0bWwKQEAgLTAsMCArMSwxMDIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+ Cis8Ym9keT4KKzxzY3JpcHQgdHlwZT0iZGF0YTp0ZXh0L2h0bWwiPgorPGh0bWwgeG1sbnM6dj0i dXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp2bWwiCit4bWxuczpvPSJ1cm46c2NoZW1hcy1taWNy b3NvZnQtY29tOm9mZmljZTpvZmZpY2UiCit4bWxuczp4PSJ1cm46c2NoZW1hcy1taWNyb3NvZnQt Y29tOm9mZmljZTpleGNlbCIKK3htbG5zPSJodHRwOi8vd3d3LnczLm9yZy9UUi9SRUMtaHRtbDQw Ij4KKzxoZWFkPgorPG1ldGEgaHR0cC1lcXVpdj1Db250ZW50LVR5cGUgY29udGVudD0idGV4dC9o dG1sOyBjaGFyc2V0PXV0Zi04Ij4KKzxtZXRhIG5hbWU9UHJvZ0lkIGNvbnRlbnQ9RXhjZWwuU2hl ZXQ+Cis8bWV0YSBuYW1lPUdlbmVyYXRvciBjb250ZW50PSJNaWNyb3NvZnQgRXhjZWwgMTQiPgor PGxpbmsgaWQ9TWFpbi1GaWxlIHJlbD1NYWluLUZpbGUgaHJlZj0iZHVtbXlfcGF0aCI+Cis8bGlu ayByZWw9RmlsZS1MaXN0IGhyZWY9ImR1bW15X3BhdGgyIj4KKzxiYXNlIGhyZWY9ImR1bW15LWJh c2UiPgorPHRpdGxlPkR1bW15IFRpdGxlPC90aXRsZT4KKzxzdHlsZT4KKzwhLS10YWJsZQorCXtt c28tZGlzcGxheWVkLWRlY2ltYWwtc2VwYXJhdG9yOiJcLiI7CisJbXNvLWRpc3BsYXllZC10aG91 c2FuZC1zZXBhcmF0b3I6IlwsIjt9CitAcGFnZQorCXttYXJnaW46MS4waW4gLjc1aW4gMS4waW4g Ljc1aW47CisJbXNvLWhlYWRlci1tYXJnaW46LjVpbjsKKwltc28tZm9vdGVyLW1hcmdpbjouNWlu O30KK3RkCisJe3BhZGRpbmctdG9wOjFweDsKKwlwYWRkaW5nLXJpZ2h0OjFweDsKKwlwYWRkaW5n LWxlZnQ6MXB4OworCW1zby1pZ25vcmU6cGFkZGluZzsKKwljb2xvcjpibGFjazsKKwlmb250LXNp emU6MTIuMHB0OworCWZvbnQtd2VpZ2h0OjQwMDsKKwlmb250LXN0eWxlOm5vcm1hbDsKKwl0ZXh0 LWRlY29yYXRpb246bm9uZTsKKwlmb250LWZhbWlseTpDYWxpYnJpLCBzYW5zLXNlcmlmOworCW1z by1mb250LWNoYXJzZXQ6MDsKKwltc28tbnVtYmVyLWZvcm1hdDpHZW5lcmFsOworCXRleHQtYWxp Z246Z2VuZXJhbDsKKwl2ZXJ0aWNhbC1hbGlnbjpib3R0b207CisJYm9yZGVyOm5vbmU7CisJbXNv LWJhY2tncm91bmQtc291cmNlOmF1dG87CisJbXNvLXBhdHRlcm46YXV0bzsKKwltc28tcHJvdGVj dGlvbjpsb2NrZWQgdmlzaWJsZTsKKwl3aGl0ZS1zcGFjZTpub3dyYXA7CisJbXNvLXJvdGF0ZTow O30KKy0tPgorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5IGxpbms9Ymx1ZSB2bGluaz1wdXJwbGU+ Cis8dGFibGUgYm9yZGVyPTAgY2VsbHBhZGRpbmc9MCBjZWxsc3BhY2luZz0wIHdpZHRoPTEzMCBz dHlsZT0nYm9yZGVyLWNvbGxhcHNlOgorIGNvbGxhcHNlO3dpZHRoOjEzMHB0Jz4KKzwhLS1TdGFy dEZyYWdtZW50LS0+CisgPGNvbCB3aWR0aD02NSBzcGFuPTIgc3R5bGU9J3dpZHRoOjY1cHQnPgor IDx0ciBoZWlnaHQ9MTUgc3R5bGU9J2hlaWdodDoxNS4wcHQnPgorICA8dGQgaGVpZ2h0PTE1IHdp ZHRoPTY1IHN0eWxlPSdoZWlnaHQ6MTUuMHB0O3dpZHRoOjY1cHQnPmhlbGxvPC90ZD4KKyAgPHRk IHdpZHRoPTY1IHN0eWxlPSd3aWR0aDo2NXB0Jz53b3JsZDwvdGQ+CisgPC90cj4KKyA8dHIgaGVp Z2h0PTE1IHN0eWxlPSdoZWlnaHQ6MTUuMHB0Jz4KKyAgPHRkIGhlaWdodD0xNSBzdHlsZT0naGVp Z2h0OjE1LjBwdCc+PC90ZD4KKyAgPHRkPndlYmtpdDwvdGQ+CisgPC90cj4KKzwhLS1FbmRGcmFn bWVudC0tPgorPC90YWJsZT4KKzwvYm9keT4KKzwvaHRtbD4KKzwvc2NyaXB0PgorPHA+VGhpcyB0 ZXN0IGVuc3VyZXMgV2ViS2l0IHN0cmlwcyBhd2F5IGJhc2UsIGxpbmssIG1ldGEsIHN0eWxlLCBh bmQgdGl0bGUgZWxlbWVudHMgYmVmb3JlIGluc2VydGluZyBIVE1MLjwvcD4KKzxkaXYgaWQ9InRl c3QiIGNvbnRlbnRlZGl0YWJsZT48L2Rpdj4KKzxwcmU+PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFz Y3JpcHQiPgorCit2YXIgaHRtbEluUGFzdGVib2FyZCA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlU YWdOYW1lKCdzY3JpcHQnKVswXS5maXJzdENoaWxkLnRleHRDb250ZW50OworZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ3Rlc3QnKS5mb2N1cygpOworZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ0luc2Vy dEhUTUwnLCBmYWxzZSwgaHRtbEluUGFzdGVib2FyZCk7CisKK3ZhciBwYXNzZWQgPSB0cnVlOwor ZnVuY3Rpb24gZXhwZWN0Tm9JbnN0YW5jZU9mKGVsZW1lbnROYW1lKSB7CisgICAgdmFyIGVsZW1l bnRzID0gZG9jdW1lbnQuYm9keS5nZXRFbGVtZW50c0J5VGFnTmFtZShlbGVtZW50TmFtZSk7Cisg ICAgaWYgKGVsZW1lbnRzLmxlbmd0aCA8PSAwKQorICAgICAgICByZXR1cm47CisKKyAgICBkb2N1 bWVudC53cml0ZSgnRkFJTCAtIGZvdW5kICcgKyBlbGVtZW50cy5sZW5ndGggKyAnICcpOworICAg IGRvY3VtZW50LndyaXRlKGVsZW1lbnRzLmxlbmd0aCA9PSAxID8gJ2luc3RhbmNlJyA6ICdpbnN0 YW5jZXMnKTsKKyAgICBkb2N1bWVudC53cml0ZWxuKCcgb2YgJyArIGVsZW1lbnROYW1lICsgJyBl bGVtZW50Jyk7CisgICAgcGFzc2VkID0gZmFsc2U7Cit9CisKK2lmICh3aW5kb3cubGF5b3V0VGVz dENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCitl eHBlY3ROb0luc3RhbmNlT2YoJ2Jhc2UnKTsKK2V4cGVjdE5vSW5zdGFuY2VPZignbWV0YScpOwor ZXhwZWN0Tm9JbnN0YW5jZU9mKCdsaW5rJyk7CitleHBlY3ROb0luc3RhbmNlT2YoJ3RpdGxlJyk7 CitleHBlY3ROb0luc3RhbmNlT2YoJ3N0eWxlJyk7CitpZiAocGFzc2VkKQorICAgIGRvY3VtZW50 LndyaXRlbG4oJ1BBU1MnKTsKKworZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3QnKS5pbm5l ckhUTUwgPSAnJzsKKworPC9zY3JpcHQ+PC9wcmU+Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3 bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGZkMGI4MDEzNmNiN2NlNzRmMDEzYjk1 Zjc0YTM1ZDgxZTAxOGU4YjEuLjQwOTZiZWI0YTkyN2M0YTUwNmM0NWEyMmI4YjhhMzk3Mzg2MzRj N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wNS0xMSAgUnlvc3VrZSBOaXdh ICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZWJLaXQgaW5zZXJ0cyBiYXNlLCBsaW5rLCBtZXRhLCBzdHlsZSwgYW5k IHRpdGxlIGVsZW1lbnRzIGludG8gYW4gZWRpdGFibGUgcmVnaW9uCisgICAgICAgIHdoZW4gcGFz dGluZyB0YWJsZSBjZWxscyBmcm9tIEV4Y2VsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MDY0NAorCisgICAgICAgIFN0cmlwIGJhc2UsIGxpbmssIG1l dGEsIHN0eWxlLCBhbmQgdGlsZSBlbGVtZW50cyBmcm9tIHRoZSBmcmFnbWVudCB0byBiZSBwYXN0 ZWQgcHJpb3IKKyAgICAgICAgdG8gdGhlIG1lcmdlLiBXZSBkb24ndCBoYXZlIHRvIHN0cmlwIHRo ZXNlIGVsZW1lbnRzIGluIHBlcmZvcm1Ucml2aWFsUmVwbGFjZSBiZWNhdXNlCisgICAgICAgIHRo ZSBmdW5jdGlvbiBvbmx5IGhhbmRsZXMgYSBmcmFnbWVudCB0aGF0IGNvbnNpc3RzIG9mIGV4YWN0 bHkgb25lIHRleHQgbm9kZS4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL3Bhc3RlYm9hcmQvcGFz dGUtaGVhZC1jb250ZW50cy5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL1JlcGxhY2VTZWxlY3Rp b25Db21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJlbW92ZUhlYWRDb250ZW50cyk6IEFk ZGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkp OiBDYWxscyByZW1vdmVIZWFkQ29udGVudHMgYmVmb3JlIGhhbmRpbmcKKyAgICAgICAgc3R5bGUg c3BhbnMuCisKIDIwMTEtMDUtMTEgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRp dGluZy9SZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC5jcHAKaW5kZXggY2UwYWIzMDZiMzk0ZGZkMDJi NTRmOTQ3YThiZDhkNmZiNDc0OGRjYy4uMzI5MmY5NTJjZjRjOGU1MjYyOTk5ZjY1YjdiZTNmZjEx MjM1MmVjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZXBsYWNlU2VsZWN0 aW9uQ29tbWFuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZXBsYWNlU2VsZWN0 aW9uQ29tbWFuZC5jcHAKQEAgLTU1MCw2ICs1NTAsMjIgQEAgVmlzaWJsZVBvc2l0aW9uIFJlcGxh Y2VTZWxlY3Rpb25Db21tYW5kOjpwb3NpdGlvbkF0U3RhcnRPZkluc2VydGVkQ29udGVudCgpCiAg ICAgcmV0dXJuIFZpc2libGVQb3NpdGlvbihuZXh0Q2FuZGlkYXRlKHBvc2l0aW9uSW5QYXJlbnRC ZWZvcmVOb2RlKG1fZmlyc3ROb2RlSW5zZXJ0ZWQuZ2V0KCkpKSk7CiB9CiAKK3N0YXRpYyB2b2lk IHJlbW92ZUhlYWRDb250ZW50cyhSZXBsYWNlbWVudEZyYWdtZW50JiBmcmFnbWVudCkKK3sKKyAg ICBOb2RlKiBuZXh0ID0gMDsKKyAgICBmb3IgKE5vZGUqIG5vZGUgPSBmcmFnbWVudC5maXJzdENo aWxkKCk7IG5vZGU7IG5vZGUgPSBuZXh0KSB7CisgICAgICAgIGlmIChub2RlLT5oYXNUYWdOYW1l KGJhc2VUYWcpCisgICAgICAgICAgICB8fCBub2RlLT5oYXNUYWdOYW1lKGxpbmtUYWcpCisgICAg ICAgICAgICB8fCBub2RlLT5oYXNUYWdOYW1lKG1ldGFUYWcpCisgICAgICAgICAgICB8fCBub2Rl LT5oYXNUYWdOYW1lKHN0eWxlVGFnKQorICAgICAgICAgICAgfHwgbm9kZS0+aGFzVGFnTmFtZSh0 aXRsZVRhZykpIHsKKyAgICAgICAgICAgIG5leHQgPSBub2RlLT50cmF2ZXJzZU5leHRTaWJsaW5n KCk7CisgICAgICAgICAgICBmcmFnbWVudC5yZW1vdmVOb2RlKG5vZGUpOworICAgICAgICB9IGVs c2UKKyAgICAgICAgICAgIG5leHQgPSBub2RlLT50cmF2ZXJzZU5leHROb2RlKCk7CisgICAgfQor fQorCiAvLyBSZW1vdmUgc3R5bGUgc3BhbnMgYmVmb3JlIGluc2VydGlvbiBpZiB0aGV5IGFyZSB1 bm5lY2Vzc2FyeS4gIEl0J3MgZmFzdGVyIGJlY2F1c2Ugd2UnbGwgCiAvLyBhdm9pZCBkb2luZyBh IGxheW91dC4KIHN0YXRpYyBib29sIGhhbmRsZVN0eWxlU3BhbnNCZWZvcmVJbnNlcnRpb24oUmVw bGFjZW1lbnRGcmFnbWVudCYgZnJhZ21lbnQsIGNvbnN0IFBvc2l0aW9uJiBpbnNlcnRpb25Qb3Mp CkBAIC05MzYsNyArOTUyLDkgQEAgdm9pZCBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6ZG9BcHBs eSgpCiAgICAgLy8gYW55IHdvcmsgcGVyZm9ybWVkIGFmdGVyIHRoaXMgdGhhdCBxdWVyaWVzIG9y IHVzZXMgdGhlIHR5cGluZyBzdHlsZS4KICAgICBpZiAoRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQo KS0+ZnJhbWUoKSkKICAgICAgICAgZnJhbWUtPnNlbGVjdGlvbigpLT5jbGVhclR5cGluZ1N0eWxl KCk7Ci0gICAgCisKKyAgICByZW1vdmVIZWFkQ29udGVudHMoZnJhZ21lbnQpOworCiAgICAgYm9v bCBoYW5kbGVkU3R5bGVTcGFucyA9IGhhbmRsZVN0eWxlU3BhbnNCZWZvcmVJbnNlcnRpb24oZnJh Z21lbnQsIGluc2VydGlvblBvcyk7CiAKICAgICAvLyBXZSBkb24ndCB3YW50IHRoZSBkZXN0aW5h dGlvbiB0byBlbmQgdXAgaW5zaWRlIG5vZGVzIHRoYXQgd2VyZW4ndCBzZWxlY3RlZC4gIFRvIGF2 b2lkIHRoYXQsIHdlIG1vdmUgdGhlCg==