131844 2014-04-18 09:37:50 -0700 REGRESSION (r155700): Pasting an image into content-editable regions is broken 2014-06-04 03:29:03 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac All NEW InRadar P2 Normal --- 1 beidson webkit-unassigned darin enrica oldest_to_newest 1001925 0 beidson 2014-04-18 09:37:50 -0700 REGRESSION (r155700): Pasting an image into content-editable regions is broken 1. Create a page with a content editable region 2. Open an image in Preview.app 3. Copy that image onto your pasteboard (so your pasteboard has *only* an image type on it) 4. Select-all in the content editable region, then paste. You see the broken image icon instead of the image you pasted. In radar <rdar://problem/16654156> 1001926 1 beidson 2014-04-18 09:40:39 -0700 This happens because 155700 reorders the "get document fragment from image resource" code to add the image resource to the DocumentLoader *after* creating the document fragment that uses it. Previously we added it before. Attaching the small patch that fixes the bug by restoring the previous behavior. Seems like this can be layout testable, but I don't have the cycles to follow through with the test today. 1001928 2 229648 beidson 2014-04-18 09:41:03 -0700 Created attachment 229648 Fix without test 1001998 3 beidson 2014-04-18 13:14:40 -0700 I've messed around trying to get a test for this for about 3 hours so I could land it. The test obviously works in the browser. But no matter what I do I can't get it to work in TestWebKitAPI. I literally can't spend anymore time on this right now. It'd be awesome if somebody could figure it out to land. 1001999 4 229669 beidson 2014-04-18 13:15:27 -0700 Created attachment 229669 Fix with attempted test. 1002065 5 beidson 2014-04-18 16:27:10 -0700 We should land this without the test for now. The fix is restoring old working behavior, and this bug is blocking more important work. r? on the first patch. 1002066 6 enrica 2014-04-18 16:28:20 -0700 Please add the ChangeLog 1002067 7 beidson 2014-04-18 16:29:29 -0700 Of course. 1002068 8 beidson 2014-04-18 16:31:02 -0700 Landed the fix itself in https://trac.webkit.org/changeset/167517 Will leave this bug open for future exploration into getting the test working. 1013289 9 229648 ossy 2014-06-04 03:29:03 -0700 Comment on attachment 229648 Fix without test Cleared Enrica Casucci's review+ from obsolete attachment 229648 so that this bug does not appear in http://webkit.org/pending-commit. 229648 2014-04-18 09:41:03 -0700 2014-06-04 03:29:02 -0700 Fix without test patch text/plain 1177 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbSBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbQppbmRleCA1OTM1MTAwLi5lYTI1 MDY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JNYWMubW0K KysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCkBAIC01ODgsMTYg KzU4OCwxNiBAQCBQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IEVkaXRvcjo6Y3JlYXRlRnJh Z21lbnRGb3JJbWFnZVJlc291cmNlQW5kQWRkUmVzb3VyYwogICAgIGlmICghcmVzb3VyY2UpCiAg ICAgICAgIHJldHVybiBudWxscHRyOwogCisgICAgLy8gRklYTUU6IFRoZSBjb2RlIGluIGNyZWF0 ZUZyYWdtZW50QW5kQWRkUmVzb3VyY2VzIGNhbGxzIHNldERlZmVyc0xvYWRpbmcodHJ1ZSkuIERv bid0IHdlIG5lZWQgdGhhdCBoZXJlPworICAgIGlmIChEb2N1bWVudExvYWRlciogbG9hZGVyID0g bV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpKQorICAgICAgICBsb2FkZXItPmFkZEFy Y2hpdmVSZXNvdXJjZShyZXNvdXJjZS5nZXQoKSk7CisKICAgICBSZWZQdHI8RWxlbWVudD4gaW1h Z2VFbGVtZW50ID0gZG9jdW1lbnQoKS5jcmVhdGVFbGVtZW50KEhUTUxOYW1lczo6aW1nVGFnLCBm YWxzZSk7CiAgICAgaW1hZ2VFbGVtZW50LT5zZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpzcmNBdHRy LCByZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkpOwogCiAgICAgUmVmUHRyPERvY3VtZW50RnJhZ21l bnQ+IGZyYWdtZW50ID0gZG9jdW1lbnQoKS5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CiAgICAg ZnJhZ21lbnQtPmFwcGVuZENoaWxkKGltYWdlRWxlbWVudC5yZWxlYXNlKCkpOwogCi0gICAgLy8g RklYTUU6IFRoZSBjb2RlIGluIGNyZWF0ZUZyYWdtZW50QW5kQWRkUmVzb3VyY2VzIGNhbGxzIHNl dERlZmVyc0xvYWRpbmcodHJ1ZSkuIERvbid0IHdlIG5lZWQgdGhhdCBoZXJlPwotICAgIGlmIChE b2N1bWVudExvYWRlciogbG9hZGVyID0gbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigp KQotICAgICAgICBsb2FkZXItPmFkZEFyY2hpdmVSZXNvdXJjZShyZXNvdXJjZS5nZXQoKSk7Ci0K ICAgICByZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOwogfQogCg== 229669 2014-04-18 13:15:27 -0700 2014-04-18 13:15:27 -0700 Fix with attempted test. patch text/plain 11818 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbSBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbQppbmRleCA1OTM1MTAwLi5lYTI1 MDY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JNYWMubW0K KysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCkBAIC01ODgsMTYg KzU4OCwxNiBAQCBQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IEVkaXRvcjo6Y3JlYXRlRnJh Z21lbnRGb3JJbWFnZVJlc291cmNlQW5kQWRkUmVzb3VyYwogICAgIGlmICghcmVzb3VyY2UpCiAg ICAgICAgIHJldHVybiBudWxscHRyOwogCisgICAgLy8gRklYTUU6IFRoZSBjb2RlIGluIGNyZWF0 ZUZyYWdtZW50QW5kQWRkUmVzb3VyY2VzIGNhbGxzIHNldERlZmVyc0xvYWRpbmcodHJ1ZSkuIERv bid0IHdlIG5lZWQgdGhhdCBoZXJlPworICAgIGlmIChEb2N1bWVudExvYWRlciogbG9hZGVyID0g bV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpKQorICAgICAgICBsb2FkZXItPmFkZEFy Y2hpdmVSZXNvdXJjZShyZXNvdXJjZS5nZXQoKSk7CisKICAgICBSZWZQdHI8RWxlbWVudD4gaW1h Z2VFbGVtZW50ID0gZG9jdW1lbnQoKS5jcmVhdGVFbGVtZW50KEhUTUxOYW1lczo6aW1nVGFnLCBm YWxzZSk7CiAgICAgaW1hZ2VFbGVtZW50LT5zZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpzcmNBdHRy LCByZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkpOwogCiAgICAgUmVmUHRyPERvY3VtZW50RnJhZ21l bnQ+IGZyYWdtZW50ID0gZG9jdW1lbnQoKS5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CiAgICAg ZnJhZ21lbnQtPmFwcGVuZENoaWxkKGltYWdlRWxlbWVudC5yZWxlYXNlKCkpOwogCi0gICAgLy8g RklYTUU6IFRoZSBjb2RlIGluIGNyZWF0ZUZyYWdtZW50QW5kQWRkUmVzb3VyY2VzIGNhbGxzIHNl dERlZmVyc0xvYWRpbmcodHJ1ZSkuIERvbid0IHdlIG5lZWQgdGhhdCBoZXJlPwotICAgIGlmIChE b2N1bWVudExvYWRlciogbG9hZGVyID0gbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigp KQotICAgICAgICBsb2FkZXItPmFkZEFyY2hpdmVSZXNvdXJjZShyZXNvdXJjZS5nZXQoKSk7Ci0K ICAgICByZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CmluZGV4IGM3MjdjY2EuLjViZWRmODcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC05NCw2 ICs5NCw4IEBACiAJCTUxMzkzRTIyMTUyMzk1MkQwMDVGMzlDNSAvKiBET01XaW5kb3dFeHRlbnNp b25CYXNpY19CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNTEzOTNFMUQxNTIzOTQ0QTAwNUYzOUM1IC8qIERPTVdpbmRvd0V4dGVuc2lvbkJh c2ljX0J1bmRsZS5jcHAgKi87IH07CiAJCTUxNDJCMjcxMTUxN0M4OEIwMEMzMkIxOSAvKiBDb250 ZXh0TWVudUNhbkNvcHlVUkwubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA1MTQyQjI3MDE1MTdDODhCMDBDMzJCMTkgLyogQ29udGV4dE1lbnVDYW5Db3B5 VVJMLm1tICovOyB9OwogCQk1MTQyQjI3MzE1MTdDOEM4MDBDMzJCMTkgLyogQ29udGV4dE1lbnVD YW5Db3B5VVJMLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gNTE0MkIyNzIxNTE3Qzg5MTAwQzMyQjE5IC8qIENvbnRleHRNZW51Q2FuQ29w eVVSTC5odG1sICovOyB9OworCQk1MTU2MTAwQzE5MDFBM0UzMDA3RTkyNkQgLyogUGFzdGVOYXRp dmVQTkcubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1 MTU2MTAwQjE5MDFBM0UzMDA3RTkyNkQgLyogUGFzdGVOYXRpdmVQTkcubW0gKi87IH07CisJCTUx NTYxMDBGMTkwMUE4NjgwMDdFOTI2RCAvKiBQYXN0ZU5hdGl2ZVBORy5odG1sIGluIENvcHkgUmVz b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxNTYxMDBFMTkwMUE3 MDQwMDdFOTI2RCAvKiBQYXN0ZU5hdGl2ZVBORy5odG1sICovOyB9OwogCQk1MTdFN0RGQzE1MTEw RUE2MDBEMEIwMDggLyogTWVtb3J5Q2FjaGVQcnVuZVdpdGhpblJlc291cmNlTG9hZERlbGVnYXRl Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTE3RTdE RkIxNTExMEVBNjAwRDBCMDA4IC8qIE1lbW9yeUNhY2hlUHJ1bmVXaXRoaW5SZXNvdXJjZUxvYWRE ZWxlZ2F0ZS5tbSAqLzsgfTsKIAkJNTE3RTdFMDQxNTExMTlDMTAwRDBCMDA4IC8qIE1lbW9yeUNh Y2hlUHJ1bmVXaXRoaW5SZXNvdXJjZUxvYWREZWxlZ2F0ZS5odG1sIGluIENvcHkgUmVzb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxN0U3RTAzMTUxMTE4NzUwMEQw QjAwOCAvKiBNZW1vcnlDYWNoZVBydW5lV2l0aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUuaHRtbCAq LzsgfTsKIAkJNTFFOTMwMTcxNTZCMTNFMTAwNEM5OURGIC8qIFdLUGFnZUdldFNjYWxlRmFjdG9y Tm90WmVyby5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA1MUU5MzAxNjE1NkIxM0UxMDA0Qzk5REYgLyogV0tQYWdlR2V0U2NhbGVGYWN0b3JOb3RaZXJv LmNwcCAqLzsgfTsKQEAgLTMxOCw2ICszMjAsNyBAQAogCQkJCTUxN0U3RTA0MTUxMTE5QzEwMEQw QjAwOCAvKiBNZW1vcnlDYWNoZVBydW5lV2l0aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUuaHRtbCBp biBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkzM0U3OUUwNjEzN0I1RkQ5MDBFMzJEOTkgLyogbW91 c2UtbW92ZS1saXN0ZW5lci5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUE1N0EzNEYy MTZBRjZCMkIwMEMyNTAxRiAvKiBQYWdlVmlzaWJpbGl0eVN0YXRlV2l0aFdpbmRvd0NoYW5nZXMu aHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKKwkJCQk1MTU2MTAwRjE5MDFBODY4MDA3RTkyNkQg LyogUGFzdGVOYXRpdmVQTkcuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlGNkZERERE NjE0MjQxQzZGMDA0RjE3MjkgLyogcHVzaC1zdGF0ZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICov LAogCQkJCTUyQjhDRjk4MTU4NjhEOTEwMDI4MTA1MyAvKiBTZXREb2N1bWVudFVSSS5odG1sIGlu IENvcHkgUmVzb3VyY2VzICovLAogCQkJCTFBREJFRkUzMTMwQzZBQTEwMEQ2MUQxOSAvKiBzaW1w bGUtYWNjZWxlcmF0ZWQtY29tcG9zaXRpbmcuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKQEAg LTQyNCw2ICs0MjcsOCBAQAogCQk1MTM5M0UxRTE1MjM5NDRBMDA1RjM5QzUgLyogRE9NV2luZG93 RXh0ZW5zaW9uQmFzaWMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g RE9NV2luZG93RXh0ZW5zaW9uQmFzaWMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQk1MTQyQjI3MDE1MTdDODhCMDBDMzJCMTkgLyogQ29udGV4dE1lbnVDYW5Db3B5VVJMLm1tICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQ29udGV4dE1lbnVDYW5Db3B5 VVJMLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MTQyQjI3MjE1MTdDODkxMDBD MzJCMTkgLyogQ29udGV4dE1lbnVDYW5Db3B5VVJMLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7 IHBhdGggPSBDb250ZXh0TWVudUNhbkNvcHlVUkwuaHRtbDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKKwkJNTE1NjEwMEIxOTAxQTNFMzAwN0U5MjZEIC8qIFBhc3RlTmF0aXZlUE5HLm1tICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gUGFzdGVOYXRpdmVQTkcubW07 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTUxNTYxMDBFMTkwMUE3MDQwMDdFOTI2RCAv KiBQYXN0ZU5hdGl2ZVBORy5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gUGFzdGVO YXRpdmVQTkcuaHRtbDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTE3RTdERkIxNTEx MEVBNjAwRDBCMDA4IC8qIE1lbW9yeUNhY2hlUHJ1bmVXaXRoaW5SZXNvdXJjZUxvYWREZWxlZ2F0 ZS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IE1lbW9yeUNhY2hl UHJ1bmVXaXRoaW5SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNTE3RTdFMDMxNTExMTg3NTAwRDBCMDA4IC8qIE1lbW9yeUNhY2hlUHJ1bmVXaXRo aW5SZXNvdXJjZUxvYWREZWxlZ2F0ZS5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0g TWVtb3J5Q2FjaGVQcnVuZVdpdGhpblJlc291cmNlTG9hZERlbGVnYXRlLmh0bWw7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxRTkzMDE2MTU2QjEzRTEwMDRDOTlERiAvKiBXS1BhZ2VH ZXRTY2FsZUZhY3Rvck5vdFplcm8uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gV0tQYWdlR2V0U2NhbGVGYWN0b3JOb3RaZXJvLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKQEAgLTk3OCw2ICs5ODMsNyBAQAogCQkJCUUxMjIwRDlGMTU1QjI1NDgwMDEzRTJG QyAvKiBNZW1vcnlDYWNoZURpc2FibGVXaXRoaW5SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbSAqLywK IAkJCQk1MTdFN0RGQjE1MTEwRUE2MDBEMEIwMDggLyogTWVtb3J5Q2FjaGVQcnVuZVdpdGhpblJl c291cmNlTG9hZERlbGVnYXRlLm1tICovLAogCQkJCUE1N0EzNEVGMTZBRjY3NzIwMEMyNTAxRiAv KiBQYWdlVmlzaWJpbGl0eVN0YXRlV2l0aFdpbmRvd0NoYW5nZXMubW0gKi8sCisJCQkJNTE1NjEw MEIxOTAxQTNFMzAwN0U5MjZEIC8qIFBhc3RlTmF0aXZlUE5HLm1tICovLAogCQkJCTAwQkMxNjg1 MTY4MEZFODEwMDY1RjFFNSAvKiBQdWJsaWNTdWZmaXgubW0gKi8sCiAJCQkJMzcyMkM4NjgxNDYx RTAzRTAwQzQ1RDAwIC8qIFJlbmRlcmVkSW1hZ2VGcm9tRE9NUmFuZ2UubW0gKi8sCiAJCQkJMjYx NTE2RDUxNUIwRTYwNTAwQTJDMjAxIC8qIFNldEFuZFVwZGF0ZUNhY2hlTW9kZWwubW0gKi8sCkBA IC0xMDIyLDYgKzEwMjgsNyBAQAogCQkJCTUxN0U3RTAzMTUxMTE4NzUwMEQwQjAwOCAvKiBNZW1v cnlDYWNoZVBydW5lV2l0aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUuaHRtbCAqLywKIAkJCQkyOTBB OUJCODE3MzVGNDIzMDBENzFCQkMgLyogT3Blbk5ld1dpbmRvdy5odG1sICovLAogCQkJCUE1N0Ez NEYxMTZBRjY5RTIwMEMyNTAxRiAvKiBQYWdlVmlzaWJpbGl0eVN0YXRlV2l0aFdpbmRvd0NoYW5n ZXMuaHRtbCAqLywKKwkJCQk1MTU2MTAwRTE5MDFBNzA0MDA3RTkyNkQgLyogUGFzdGVOYXRpdmVQ TkcuaHRtbCAqLywKIAkJCQk1MkI4Q0Y5NDE1ODY4Q0YwMDAyODEwNTMgLyogU2V0RG9jdW1lbnRV UkkuaHRtbCAqLywKIAkJCQlFMTk0RTFCQzE3N0U1MzRBMDA5QzRENEUgLyogU3RvcExvYWRpbmdG cm9tRGlkUmVjZWl2ZVJlc3BvbnNlLmh0bWwgKi8sCiAJCQkJQzU0MEY3ODMxNTJFNUE3ODAwQTQw QzhDIC8qIHZlcmJvc2VNYXJrdXAuaHRtbCAqLywKQEAgLTEyMzMsNiArMTI0MCw3IEBACiAJCQkJ RTEyMjBEQTAxNTVCMjU0ODAwMTNFMkZDIC8qIE1lbW9yeUNhY2hlRGlzYWJsZVdpdGhpblJlc291 cmNlTG9hZERlbGVnYXRlLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMUE3RThCMzQxODEyMDhERTAw QUVCNzRBIC8qIEZyYWdtZW50TmF2aWdhdGlvbi5tbSBpbiBTb3VyY2VzICovLAogCQkJCTUxN0U3 REZDMTUxMTBFQTYwMEQwQjAwOCAvKiBNZW1vcnlDYWNoZVBydW5lV2l0aGluUmVzb3VyY2VMb2Fk RGVsZWdhdGUubW0gaW4gU291cmNlcyAqLywKKwkJCQk1MTU2MTAwQzE5MDFBM0UzMDA3RTkyNkQg LyogUGFzdGVOYXRpdmVQTkcubW0gaW4gU291cmNlcyAqLywKIAkJCQkwRkM2QzRDRjE0MTAzNEFE MDA1QjdGMEMgLyogTWV0YUFsbG9jYXRvci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkzM0JFNUFG NTEzN0I1QTZDMDA3MDU4MTMgLyogTW91c2VNb3ZlQWZ0ZXJDcmFzaC5jcHAgaW4gU291cmNlcyAq LywKIAkJCQk5M0YxREIzMTE0REEyMDc2MDAyNEMzNjIgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVt cHR5TGF5b3V0LmNwcCBpbiBTb3VyY2VzICovLApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9tYWMvUGFzdGVOYXRpdmVQTkcuaHRtbCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvbWFjL1Bhc3RlTmF0aXZlUE5HLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uMjAwMzg5OAotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvbWFjL1Bhc3RlTmF0aXZlUE5HLmh0bWwKQEAgLTAsMCArMSwxOCBAQAorPGRpdiBpZD0i ZWRpdGFibGVEaXYiIGNvbnRlbnRlZGl0YWJsZT5UaGlzIGlzIGVkaXRhYmxlIGNvbnRlbnQ8L2Rp dj48YnI+Cis8YnV0dG9uIG9uY2xpY2s9ImNsaWNrZWQoKSI+Q2xpY2s8L2J1dHRvbj4KKworPHNj cmlwdD4KK3ZhciBkaXYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZWRpdGFibGVEaXYiKTsK K2Rpdi5mb2N1cygpOworZG9jdW1lbnQuZXhlY0NvbW1hbmQoInNlbGVjdEFsbCIpOworCitmdW5j dGlvbiBjbGlja2VkKCkKK3sKKwlhbGVydChkb2N1bWVudC5pbWFnZXNbMF0pOworCWFsZXJ0KGRv Y3VtZW50LmltYWdlc1swXS5zdHlsZSk7CisJYWxlcnQoZG9jdW1lbnQuaW1hZ2VzWzBdLm9mZnNl dFdpZHRoKTsKKwkKKwlhbGVydCh3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5pbWFn ZXNbMF0sIG51bGwpLmdldFByb3BlcnR5VmFsdWUoImhlaWdodCIpKTsKKwkKK30KKzwvc2NyaXB0 PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvbWFjL1Bhc3RlTmF0aXZlUE5HLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9tYWMvUGFzdGVOYXRpdmVQTkcubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uZGU3MzgxMgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvbWFjL1Bhc3RlTmF0aXZlUE5HLm1tCkBAIC0wLDAgKzEsOTEgQEAKKy8qCisgKiBDb3B5cmln aHQgKEMpIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4K KyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoK KyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRS SUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJ VFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisj aW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKKyNpbmNs dWRlICJQbGF0Zm9ybVdlYlZpZXcuaCIKKyNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CisKKyNp bXBvcnQgPFdlYktpdC9ET00uaD4KKyNpbXBvcnQgPFdlYktpdC9ET01Qcml2YXRlLmg+CisjaW1w b3J0IDxXZWJLaXQvV2ViVmlld1ByaXZhdGUuaD4KKworQGludGVyZmFjZSBQYXN0ZU5hdGl2ZVBO R1Rlc3QgOiBOU09iamVjdCB7Cit9CitAZW5kCisKK3N0YXRpYyBib29sIGRpZEZpbmlzaExvYWQ7 CisKK0BpbXBsZW1lbnRhdGlvbiBQYXN0ZU5hdGl2ZVBOR1Rlc3QKKworLSAodm9pZCl3ZWJWaWV3 OihXZWJWaWV3ICopc2VuZGVyIGRpZEZpbmlzaExvYWRGb3JGcmFtZTooV2ViRnJhbWUgKilmcmFt ZQoreworICAgIGRpZEZpbmlzaExvYWQgPSB0cnVlOworfQorQGVuZAorCituYW1lc3BhY2UgVGVz dFdlYktpdEFQSSB7CisKK1RFU1QoV2ViS2l0MSwgUGFzdGVOYXRpdmVQTkdUZXN0KQoreworICAg IFJldGFpblB0cjxXZWJWaWV3PiB3ZWJWaWV3ID0gYWRvcHROUyhbW1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCAxMjAsIDIwMCkgZnJhbWVOYW1lOm5pbCBncm91 cE5hbWU6bmlsXSk7CisgICAgUmV0YWluUHRyPFBhc3RlTmF0aXZlUE5HVGVzdD4gdGVzdENvbnRy b2xsZXIgPSBhZG9wdE5TKFtQYXN0ZU5hdGl2ZVBOR1Rlc3QgbmV3XSk7CisgICAgCisgICAgd2Vi Vmlldy5nZXQoKS5mcmFtZUxvYWREZWxlZ2F0ZSA9IHRlc3RDb250cm9sbGVyLmdldCgpOworICAg IFtbd2ViVmlldy5nZXQoKSBtYWluRnJhbWVdIGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVx dWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAIlBhc3Rl TmF0aXZlUE5HIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktp dEFQSS5yZXNvdXJjZXMiXV1dOworICAgIAorICAgIFV0aWw6OnJ1bigmZGlkRmluaXNoTG9hZCk7 CisgICAgZGlkRmluaXNoTG9hZCA9IGZhbHNlOworCisgICAgTlNEYXRhICppbWFnZURhdGEgPSBb W05TRGF0YSBhbGxvY10gaW5pdFdpdGhDb250ZW50c09mVVJMOltbTlNCdW5kbGUgbWFpbkJ1bmRs ZV0gVVJMRm9yUmVzb3VyY2U6QCJpY29uIiB3aXRoRXh0ZW5zaW9uOkAicG5nIiBzdWJkaXJlY3Rv cnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXTsKKyAgICBOU0ltYWdlICpleHBlY3RlZElt YWdlID0gW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aERhdGE6aW1hZ2VEYXRhXTsKKworICAgIE5T UGFzdGVib2FyZCAqcGFzdGVib2FyZCA9IFtOU1Bhc3RlYm9hcmQgcGFzdGVib2FyZFdpdGhOYW1l Ok5TR2VuZXJhbFBib2FyZF07CisgICAgW3Bhc3RlYm9hcmQgZGVjbGFyZVR5cGVzOltOU0FycmF5 IGFycmF5V2l0aE9iamVjdDpOU1Bhc3RlYm9hcmRUeXBlUE5HXSBvd25lcjpuaWxdOworICAgIFtw YXN0ZWJvYXJkIHNldERhdGE6aW1hZ2VEYXRhIGZvclR5cGU6TlNQYXN0ZWJvYXJkVHlwZVBOR107 CisKKyAgICBET01Eb2N1bWVudCAqZG9jdW1lbnQgPSB3ZWJWaWV3LmdldCgpLm1haW5GcmFtZURv Y3VtZW50OworCisgICBbd2ViVmlldy5nZXQoKSBwYXN0ZTp0ZXN0Q29udHJvbGxlci5nZXQoKV07 CisKKyAgICAvLyBUcnkgZm9yY2luZyBhIGxheW91dCB0byBnZXQgZXZlcnl0aGluZyBjYWxjdWxh dGVkIGFuZCByZW5kZXJlZC4KKyAgICBbW1tbd2ViVmlldy5nZXQoKSBtYWluRnJhbWVdIGZyYW1l Vmlld10gZG9jdW1lbnRWaWV3XSBsYXlvdXRdOworCisgICAgLy8gVHJ5IGdldHRpbmcgYSByZW5k ZXJlZCBpbWFnZSBmb3IgdGhlIHJhbmdlIC0gVGhpcyBzaG91bGQgYmUgdGhlIHNpemUgb2YgaWNv bi5wbmcsIGJ1dCBpbnN0ZWFkIGlzIDB4MC4KKyAgICBET01SYW5nZSAqcmFuZ2UgPSBbZG9jdW1l bnQgY3JlYXRlUmFuZ2VdOworICAgIERPTU5vZGUgKnRhcmdldCA9IFtbZG9jdW1lbnQgaW1hZ2Vz XSBpdGVtOjBdOworICAgIFtyYW5nZSBzZWxlY3ROb2RlOnRhcmdldF07CisgICAgW3dlYlZpZXcu Z2V0KCkgc2V0U2VsZWN0ZWRET01SYW5nZTpyYW5nZSBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmlu aXR5RG93bnN0cmVhbV07CisgICAgTlNJbWFnZSAqYWN0dWFsSW1hZ2UgPSBbcmFuZ2UgcmVuZGVy ZWRJbWFnZUZvcmNpbmdCbGFja1RleHQ6WUVTXTsKKworICAgIC8vIFdlIHNob3VsZCBiZSBjb21h cHJpbmcgYWN0dWFsL2V4cGVjdGVkIGltYWdlIGRpbWVuc2lvbnMsIGJ1dCBhY3R1YWwgaXMgYWx3 YXlzIDB4MC4KKyAgICBhY3R1YWxJbWFnZSA9IG5pbDsKKyAgICBleHBlY3RlZEltYWdlID0gbmls OworCisgICAgLy8gVHJ5IGdldHRpbmcgdGhlIGNvbXB1dGVkIGhlaWdodC4gIEluIHRoZSBicm93 c2VyIHRoaXMgcmV0dXJucyAxNzRweCEgIEluIHRoZSB0ZXN0LCBpdCByZXR1cm5zIDBweC4KKyAg ICBOU0xvZyhAIiVAIiwgW3dlYlZpZXcuZ2V0KCkgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw dEZyb21TdHJpbmc6QCJ3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5pbWFnZXNbMF0s IG51bGwpLmdldFByb3BlcnR5VmFsdWUoXCJoZWlnaHRcIik7Il0pOworfQorCit9IC8vIG5hbWVz cGFjZSBUZXN0V2ViS2l0QVBJCg==