13782 2007-05-18 14:00:43 -0700 REGRESSION (r21528-r21533): Failing editing/selection/drag-in-iframe in pixel mode 2007-05-18 19:29:49 -0700 1 1 1 Unclassified WebKit HTML Editing 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED http://build.webkit.org/results/post-commit-pixel-powerpc-mac-os-x/4082/editing/selection/drag-in-iframe-diffs.html LayoutTestFailure, Regression P1 Normal --- 1 mitz oliver justin.garcia oldest_to_newest 9651 0 mitz 2007-05-18 14:00:43 -0700 editing/selection/drag-in-iframe.html is a pixel-only test for rendering the drag-caret in an iframe. It is failing in TOT, although when following the instructions manually the drag-caret is visible as expected. 9637 1 14618 oliver 2007-05-18 18:47:58 -0700 Created attachment 14618 Fix for bug Whoops, the r21533 patch required holding on to a DOMElement for the duration of the drag in order to produce promised content. To avoid keeping an entire Document around ad infinitum i explicitly cleared the pasteboard after the drag. This doesn't work well with DRT, and tim suggests other apps may behave similarly to DRT, so i've removed the pastebaord clearing. Most of this patch is basically replacing a domelement reference with the underlying CachedImage instead. 9631 2 oliver 2007-05-18 19:29:49 -0700 Fix landed r21596 14618 2007-05-18 18:47:58 -0700 2007-05-18 19:09:32 -0700 Fix for bug fixdragcaret.patch text/plain 11723 oliver SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5leHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3Jl LmV4cAkocmV2aXNpb24gMjE1ODEpCisrKyBXZWJDb3JlL1dlYkNvcmUuZXhwCSh3b3JraW5nIGNv cHkpCkBAIC0yMzUsNiArMjM1LDcgQEAgX19aTjdXZWJDb3JlMTNIaXRUZXN0UmVzdWx0RDFFdgog X19aTjdXZWJDb3JlMTNLZXlib2FyZEV2ZW50QzFFUktOU18xMkF0b21pY1N0cmluZ0ViYlBOU185 RE9NV2luZG93RVJLTlNfNlN0cmluZ0VqYmJiYmIKIF9fWk43V2ViQ29yZTEzUmVzb3VyY2VFcnJv cjE5dW5wYWNrUGxhdGZvcm1FcnJvckV2CiBfX1pON1dlYkNvcmUxM3RvRGV2aWNlU3BhY2VFUktO U185RmxvYXRSZWN0RVA4TlNXaW5kb3cKK19fWk43V2ViQ29yZTE0Q2FjaGVkUmVzb3VyY2U1ZGVy ZWZFUE5TXzIwQ2FjaGVkUmVzb3VyY2VDbGllbnRFCiBfX1pON1dlYkNvcmUxNERvY3VtZW50TG9h ZGVyMTJzZXRDb21taXR0ZWRFYgogX19aTjdXZWJDb3JlMTREb2N1bWVudExvYWRlcjEzYXR0YWNo VG9GcmFtZUV2CiBfX1pON1dlYkNvcmUxNERvY3VtZW50TG9hZGVyMTVkZXRhY2hGcm9tRnJhbWVF dgpJbmRleDogV2ViS2l0L01pc2MvV2ViTlNQYXN0ZWJvYXJkRXh0cmFzLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9NaXNjL1dlYk5TUGFzdGVib2FyZEV4dHJhcy5tbQkocmV2aXNpb24gMjE1ODEp CisrKyBXZWJLaXQvTWlzYy9XZWJOU1Bhc3RlYm9hcmRFeHRyYXMubW0JKHdvcmtpbmcgY29weSkK QEAgLTMwLDEzICszMCwxNiBAQAogCiAjaW1wb3J0ICJXZWJBcmNoaXZlLmgiCiAjaW1wb3J0ICJX ZWJGcmFtZUJyaWRnZS5oIgotI2ltcG9ydCAiV2ViSFRNTFZpZXdQcml2YXRlLmgiCisjaW1wb3J0 ICJXZWJGcmFtZUludGVybmFsLmgiCisjaW1wb3J0ICJXZWJIVE1MVmlld0ludGVybmFsLmgiCiAj aW1wb3J0ICJXZWJOU1VSTEV4dHJhcy5oIgogI2ltcG9ydCAiV2ViUmVzb3VyY2VQcml2YXRlLmgi CiAjaW1wb3J0ICJXZWJVUkxzV2l0aFRpdGxlcy5oIgogI2ltcG9ydCAiV2ViVmlld1ByaXZhdGUu aCIKICNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL0Fzc2VydGlvbnMuaD4KKyNpbXBvcnQgPFdlYkNv cmUvSFRNTEltYWdlRWxlbWVudC5oPgogI2ltcG9ydCA8V2ViQ29yZS9NaW1lVHlwZVJlZ2lzdHJ5 Lmg+CisjaW1wb3J0IDxXZWJDb3JlL1JlbmRlckltYWdlLmg+CiAjaW1wb3J0IDxXZWJLaXQvRE9N RXh0ZW5zaW9ucy5oPgogI2ltcG9ydCA8V2ViS2l0L0RPTVByaXZhdGUuaD4KICNpbXBvcnQgPHd0 Zi9SZXRhaW5QdHIuaD4KQEAgLTI0Miw2ICsyNDUsMTggQEAgc3RhdGljIE5TQXJyYXkgKl93cml0 YWJsZVR5cGVzRm9ySW1hZ2VXaQogICAgIAogfQogCitDYWNoZWRJbWFnZSogaW1hZ2VGcm9tRWxl bWVudChET01FbGVtZW50ICpkb21FbGVtZW50KSB7CisgICAgRWxlbWVudCogZWxlbWVudCA9IGNv cmUoZG9tRWxlbWVudCk7CisgICAgaWYgKCFlbGVtZW50KQorICAgICAgICByZXR1cm4gMDsKKyAg ICAKKyAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gZWxlbWVudC0+cmVuZGVyZXIoKTsKKyAg ICBSZW5kZXJJbWFnZSogaW1hZ2VSZW5kZXJlciA9IHN0YXRpY19jYXN0PFJlbmRlckltYWdlKj4o cmVuZGVyZXIpOworICAgIGlmICghaW1hZ2VSZW5kZXJlci0+Y2FjaGVkSW1hZ2UoKSB8fCBpbWFn ZVJlbmRlcmVyLT5jYWNoZWRJbWFnZSgpLT5lcnJvck9jY3VycmVkKCkpIAorICAgICAgICByZXR1 cm4gMDsgICAgICAgIAorICAgIHJldHVybiBpbWFnZVJlbmRlcmVyLT5jYWNoZWRJbWFnZSgpOwor fQorCiAtICh2b2lkKV93ZWJfd3JpdGVJbWFnZTooTlNJbWFnZSAqKWltYWdlCiAgICAgICAgICAg ICAgICAgZWxlbWVudDooRE9NRWxlbWVudCAqKWVsZW1lbnQKICAgICAgICAgICAgICAgICAgICAg VVJMOihOU1VSTCAqKVVSTCAKQEAgLTI1OSw4ICsyNzQsOCBAQCBzdGF0aWMgTlNBcnJheSAqX3dy aXRhYmxlVHlwZXNGb3JJbWFnZVdpCiAgICAgICAgIGlmIChpbWFnZSkKICAgICAgICAgICAgIFtz ZWxmIHNldERhdGE6W2ltYWdlIFRJRkZSZXByZXNlbnRhdGlvbl0gZm9yVHlwZTpOU1RJRkZQYm9h cmRUeXBlXTsKICAgICAgICAgZWxzZSBpZiAoc291cmNlICYmIGVsZW1lbnQpCi0gICAgICAgICAg ICBbc291cmNlIHNldFByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlOmVsZW1lbnRdOwotICAgICAg ICBlbHNlCisgICAgICAgICAgICBbc291cmNlIHNldFByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNl OmltYWdlRnJvbUVsZW1lbnQoZWxlbWVudCldOworICAgICAgICBlbHNlIGlmIChlbGVtZW50KQog ICAgICAgICAgICAgW3NlbGYgc2V0RGF0YTpbZWxlbWVudCBfaW1hZ2VUSUZGUmVwcmVzZW50YXRp b25dIGZvclR5cGU6TlNUSUZGUGJvYXJkVHlwZV07CiAgICAgfQogICAgIApJbmRleDogV2ViS2l0 L1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L1dl YkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQubW0JKHJldmlzaW9uIDIxNTgxKQorKysgV2ViS2l0 L1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTEwNCwx MSArMTA0LDYgQEAgdm9pZCBXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcoRHJhZ0ltYWdlUgogICAg ICAgICBbVUlEZWxlZ2F0ZSB3ZWJWaWV3Om1fd2ViVmlldyBkcmFnSW1hZ2U6ZHJhZ0ltYWdlLmdl dCgpIGF0OihOU1BvaW50KWF0IG9mZnNldDpOU01ha2VTaXplKDAsIDApIGV2ZW50OmV2ZW50IHBh c3RlYm9hcmQ6cGFzdGVib2FyZCBzb3VyY2U6aHRtbFZpZXcuZ2V0KCkgc2xpZGVCYWNrOllFUyBm b3JWaWV3OnRvcEhUTUxWaWV3XTsKICAgICBlbHNlCiAgICAgICAgIFt0b3BIVE1MVmlldyBkcmFn SW1hZ2U6ZHJhZ0ltYWdlLmdldCgpIGF0OihOU1BvaW50KWF0IG9mZnNldDpOU01ha2VTaXplKDAs IDApIGV2ZW50OmV2ZW50IHBhc3RlYm9hcmQ6cGFzdGVib2FyZCBzb3VyY2U6aHRtbFZpZXcuZ2V0 KCkgc2xpZGVCYWNrOllFU107Ci0gICAgCi0gICAgLy8gRm9yY2libHkgY2xlYXIgdGhlIHBhc3Rl Ym9hcmQgYXQgdGhlIGVuZCBvZiBkcmFnLCB0aGlzIHN0b3BzIHVzIGZyb20gd3JpdGluZyAKLSAg ICAvLyBkZWxheWVkIGRhdGEgKFJURi9pbWFnZXMsIGV0Yykgb24gYXBwIHF1aXQsIHdoaWNoIHdl IGRvbid0IHdhbnQgdG8gZG8gZ2l2ZW4gCi0gICAgLy8gdGhlIGxpZmUgdGltZSBmb3IgdGhpcyBk YXRhIHNob3VsZCBvbmx5IGJlIHRoZSBsaWZldGltZSBvZiB0aGUgZHJhZy4KLSAgICBbcGFzdGVi b2FyZCBkZWNsYXJlVHlwZXM6bmlsIG93bmVyOm5pbF07CiB9CiAKIERyYWdJbWFnZVJlZiBXZWJE cmFnQ2xpZW50OjpjcmVhdGVEcmFnSW1hZ2VGb3JMaW5rKEtVUkwmIHVybCwgY29uc3QgU3RyaW5n JiB0aXRsZSwgRnJhbWUqIGZyYW1lKQpJbmRleDogV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagkocmV2aXNpb24gMjE1ODEpCisrKyBXZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTEzMTcsNyArMTMxNyw2IEBACiAJCTA4 NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLyA9IHsKIAkJCWlzYSA9 IFBCWFByb2plY3Q7CiAJCQlidWlsZENvbmZpZ3VyYXRpb25MaXN0ID0gMTQ5QzI4MzIwODkwMkIw RjAwOEE5RUZDIC8qIEJ1aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBmb3IgUEJYUHJvamVjdCAiV2Vi S2l0IiAqLzsKLQkJCWNvbXBhdGliaWxpdHlWZXJzaW9uID0gIlhjb2RlIDIuNCI7CiAJCQloYXNT Y2FubmVkRm9yRW5jb2RpbmdzID0gMTsKIAkJCWtub3duUmVnaW9ucyA9ICgKIAkJCQlFbmdsaXNo LApAQCAtMTMzMiw3ICsxMzMxLDYgQEAKIAkJCXByb2R1Y3RSZWZHcm91cCA9IDAzNDc2OERGRkYz OEE1MDQxMURCOUM4QiAvKiBQcm9kdWN0cyAqLzsKIAkJCXByb2plY3REaXJQYXRoID0gIiI7CiAJ CQlwcm9qZWN0Um9vdCA9ICIiOwotCQkJc2hvdWxkQ2hlY2tDb21wYXRpYmlsaXR5ID0gMTsKIAkJ CXRhcmdldHMgPSAoCiAJCQkJOTM5ODEwMEEwODI0QkYwMTAwOERGMDM4IC8qIFdlYktpdCAqLywK IAkJCSk7CkluZGV4OiBXZWJLaXQvV2ViVmlldy9XZWJIVE1MVmlldy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gMjE1ODEpCisrKyBXZWJL aXQvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNzAsNiArNzAsOCBA QAogI2ltcG9ydCA8QXBwS2l0L05TQWNjZXNzaWJpbGl0eS5oPgogI2ltcG9ydCA8QXBwbGljYXRp b25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CiAjaW1wb3J0IDxkbGZjbi5oPgorI2lt cG9ydCA8V2ViQ29yZS9DYWNoZWRJbWFnZS5oPgorI2ltcG9ydCA8V2ViQ29yZS9DYWNoZWRSZXNv dXJjZUNsaWVudC5oPgogI2ltcG9ydCA8V2ViQ29yZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuaD4K ICNpbXBvcnQgPFdlYkNvcmUvRG9jdW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvRWRpdG9yLmg+ CkBAIC04Niw3ICs4OCw2IEBACiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2ltcG9y dCA8V2ViQ29yZS9IaXRUZXN0UmVzdWx0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxOYW1lcy5o PgotI2ltcG9ydCA8V2ViQ29yZS9IVE1MSW1hZ2VFbGVtZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3Jl L0ltYWdlLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0tleWJvYXJkRXZlbnQuaD4KICNpbXBvcnQgPFdl YkNvcmUvTWltZVR5cGVSZWdpc3RyeS5oPgpAQCAtOTQsNyArOTUsNiBAQAogI2ltcG9ydCA8V2Vi Q29yZS9QbGF0Zm9ybUtleWJvYXJkRXZlbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvUGxhdGZvcm1N b3VzZUV2ZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1JhbmdlLmg+Ci0jaW1wb3J0IDxXZWJDb3Jl L1JlbmRlckltYWdlLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1NlbGVjdGlvbkNvbnRyb2xsZXIuaD4K ICNpbXBvcnQgPFdlYkNvcmUvU2hhcmVkQnVmZmVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1dlYkNv cmVPYmpDRXh0cmFzLmg+CkBAIC0yMjEsNiArMjIxLDkgQEAgc3RhdGljIEJPT0wgZm9yY2VXZWJI VE1MVmlld0hpdFRlc3Q7CiAKIHN0YXRpYyBXZWJIVE1MVmlldyAqbGFzdEhpdFZpZXc7CiAKKy8v IFdlIG5lZWQgdGhpcyB0byBiZSBhYmxlIHRvIHNhZmVseSByZWZlcmVuY2UgdGhlIENhY2hlZElt YWdlIGZvciB0aGUgcHJvbWlzZWQgZHJhZyBkYXRhCitzdGF0aWMgQ2FjaGVkUmVzb3VyY2VDbGll bnQgcHJvbWlzZWREYXRhQ2xpZW50OworCiBAaW50ZXJmYWNlIFdlYkhUTUxWaWV3IChXZWJUZXh0 U2l6aW5nKSA8X1dlYkRvY3VtZW50VGV4dFNpemluZz4KIEBlbmQKIApAQCAtMzA5LDcgKzMxMiw4 IEBAIHN0cnVjdCBXZWJIVE1MVmlld0ludGVycHJldEtleUV2ZW50c1BhcmEKICAgICBbZmlyc3RS ZXNwb25kZXJUZXh0Vmlld0F0TW91c2VEb3duVGltZSByZWxlYXNlXTsKICAgICBbZGF0YVNvdXJj ZSByZWxlYXNlXTsKICAgICBbaGlnaGxpZ2h0ZXJzIHJlbGVhc2VdOwotICAgIFtwcm9taXNlZERy YWdUSUZGRGF0YVNvdXJjZSByZWxlYXNlXTsKKyAgICBpZiAocHJvbWlzZWREcmFnVElGRkRhdGFT b3VyY2UpCisgICAgICAgIHByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlLT5kZXJlZigmcHJvbWlz ZWREYXRhQ2xpZW50KTsKICAgICBbc3VwZXIgZGVhbGxvY107CiB9CiAKQEAgLTMyMyw3ICszMjcs OCBAQCBzdHJ1Y3QgV2ViSFRNTFZpZXdJbnRlcnByZXRLZXlFdmVudHNQYXJhCiAgICAgW2ZpcnN0 UmVzcG9uZGVyVGV4dFZpZXdBdE1vdXNlRG93blRpbWUgcmVsZWFzZV07CiAgICAgW2RhdGFTb3Vy Y2UgcmVsZWFzZV07CiAgICAgW2hpZ2hsaWdodGVycyByZWxlYXNlXTsKLSAgICBbcHJvbWlzZWRE cmFnVElGRkRhdGFTb3VyY2UgcmVsZWFzZV07CisgICAgaWYgKHByb21pc2VkRHJhZ1RJRkZEYXRh U291cmNlKQorICAgICAgICBwcm9taXNlZERyYWdUSUZGRGF0YVNvdXJjZS0+ZGVyZWYoJnByb21p c2VkRGF0YUNsaWVudCk7CiAKICAgICBtb3VzZURvd25FdmVudCA9IG5pbDsKICAgICBrZXlEb3du RXZlbnQgPSBuaWw7CkBAIC0zMzMsNyArMzM4LDcgQEAgc3RydWN0IFdlYkhUTUxWaWV3SW50ZXJw cmV0S2V5RXZlbnRzUGFyYQogICAgIGZpcnN0UmVzcG9uZGVyVGV4dFZpZXdBdE1vdXNlRG93blRp bWUgPSBuaWw7CiAgICAgZGF0YVNvdXJjZSA9IG5pbDsKICAgICBoaWdobGlnaHRlcnMgPSBuaWw7 Ci0gICAgcHJvbWlzZWREcmFnVElGRkRhdGFTb3VyY2UgPSBuaWw7CisgICAgcHJvbWlzZWREcmFn VElGRkRhdGFTb3VyY2UgPSAwOwogfQogCiBAZW5kCkBAIC0xMjkyLDcgKzEyOTcsNyBAQCBzdGF0 aWMgTlNVUkwqIHVuaXF1ZVVSTFdpdGhSZWxhdGl2ZVBhcnQoCiAKIC0gKHZvaWQpcGFzdGVib2Fy ZENoYW5nZWRPd25lcjooTlNQYXN0ZWJvYXJkICopcGFzdGVib2FyZAogewotICAgIFtzZWxmIHNl dFByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlOm5pbF07CisgICAgW3NlbGYgc2V0UHJvbWlzZWRE cmFnVElGRkRhdGFTb3VyY2U6MF07CiB9CiAKIC0gKHZvaWQpcGFzdGVib2FyZDooTlNQYXN0ZWJv YXJkICopcGFzdGVib2FyZCBwcm92aWRlRGF0YUZvclR5cGU6KE5TU3RyaW5nICopdHlwZQpAQCAt MTMwMiw4ICsxMzA3LDkgQEAgc3RhdGljIE5TVVJMKiB1bmlxdWVVUkxXaXRoUmVsYXRpdmVQYXJ0 KAogICAgICAgICBbcGFzdGVib2FyZCBfd2ViX3dyaXRlUHJvbWlzZWRSVEZERnJvbUFyY2hpdmU6 YXJjaGl2ZSBjb250YWluc0ltYWdlOltbcGFzdGVib2FyZCB0eXBlc10gY29udGFpbnNPYmplY3Q6 TlNUSUZGUGJvYXJkVHlwZV1dOwogICAgICAgICBbYXJjaGl2ZSByZWxlYXNlXTsKICAgICB9IGVs c2UgaWYgKFt0eXBlIGlzRXF1YWw6TlNUSUZGUGJvYXJkVHlwZV0gJiYgW3NlbGYgcHJvbWlzZWRE cmFnVElGRkRhdGFTb3VyY2VdKSB7Ci0gICAgICAgIFtwYXN0ZWJvYXJkIHNldERhdGE6W1tzZWxm IHByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlXSBfaW1hZ2VUSUZGUmVwcmVzZW50YXRpb25dIGZv clR5cGU6TlNUSUZGUGJvYXJkVHlwZV07Ci0gICAgICAgIFtzZWxmIHNldFByb21pc2VkRHJhZ1RJ RkZEYXRhU291cmNlOm5pbF07CisgICAgICAgIGlmIChJbWFnZSogaW1hZ2UgPSBbc2VsZiBwcm9t aXNlZERyYWdUSUZGRGF0YVNvdXJjZV0tPmltYWdlKCkpCisgICAgICAgICAgICBbcGFzdGVib2Fy ZCBzZXREYXRhOihOU0RhdGEgKilpbWFnZS0+Z2V0VElGRlJlcHJlc2VudGF0aW9uKCkgZm9yVHlw ZTpOU1RJRkZQYm9hcmRUeXBlXTsKKyAgICAgICAgW3NlbGYgc2V0UHJvbWlzZWREcmFnVElGRkRh dGFTb3VyY2U6MF07CiAgICAgfQogfQogCkBAIC0xNzYzLDE5ICsxNzY5LDYgQEAgc3RhdGljIE5T VVJMKiB1bmlxdWVVUkxXaXRoUmVsYXRpdmVQYXJ0KAogICAgIHJldHVybiBuaWw7CiB9CiAKLS0g KERPTUVsZW1lbnQgKilwcm9taXNlZERyYWdUSUZGRGF0YVNvdXJjZSAKLXsKLSAgICByZXR1cm4g X3ByaXZhdGUtPnByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlOwotfQotCi0tICh2b2lkKXNldFBy b21pc2VkRHJhZ1RJRkZEYXRhU291cmNlOihET01FbGVtZW50ICopc291cmNlCi17Ci0gICAgW3Nv dXJjZSByZXRhaW5dOwotICAgIGlmIChfcHJpdmF0ZS0+cHJvbWlzZWREcmFnVElGRkRhdGFTb3Vy Y2UpCi0gICAgICAgIFtfcHJpdmF0ZS0+cHJvbWlzZWREcmFnVElGRkRhdGFTb3VyY2UgcmVsZWFz ZV07Ci0gICAgX3ByaXZhdGUtPnByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlID0gc291cmNlOwot fQotCiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBOU1ZpZXcgKFdlYkhUTUxWaWV3RmlsZUludGVy bmFsKQpAQCAtMjkzNiwyMiArMjkyOSwxNCBAQCBkb25lOgogewogICAgIE5TRmlsZVdyYXBwZXIg KndyYXBwZXIgPSBuaWw7CiAgICAgCi0gICAgaWYgKERPTUVsZW1lbnQgKnRpZmZTb3VyY2UgPSBb c2VsZiBwcm9taXNlZERyYWdUSUZGRGF0YVNvdXJjZV0pIHsKLSAgICAgICAgRWxlbWVudCAqZWxl bWVudCA9IGNvcmUodGlmZlNvdXJjZSk7Ci0gICAgICAgIGlmICghZWxlbWVudC0+aGFzVGFnTmFt ZShpbWdUYWcpKQotICAgICAgICAgICAgZ290byBub1Byb21pc2VkRGF0YTsKKyAgICBpZiAoV2Vi Q29yZTo6Q2FjaGVkUmVzb3VyY2UqIHRpZmZSZXNvdXJjZSA9IFtzZWxmIHByb21pc2VkRHJhZ1RJ RkZEYXRhU291cmNlXSkgewogICAgICAgICAKLSAgICAgICAgSFRNTEltYWdlRWxlbWVudCAqaW1h Z2VFbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTEltYWdlRWxlbWVudCAqPihlbGVtZW50KTsKLSAg ICAgICAgaWYgKCFpbWFnZUVsZW1lbnQtPmNhY2hlZEltYWdlKCkgfHwgaW1hZ2VFbGVtZW50LT5j YWNoZWRJbWFnZSgpLT5lcnJvck9jY3VycmVkKCkpIAotICAgICAgICAgICAgZ290byBub1Byb21p c2VkRGF0YTsKLSAgICAgICAgCi0gICAgICAgIENhY2hlZFJlc291cmNlICpyZXNvdXJjZSA9IGlt YWdlRWxlbWVudC0+Y2FjaGVkSW1hZ2UoKTsKLSAgICAgICAgU2hhcmVkQnVmZmVyICpidWZmZXIg PSByZXNvdXJjZS0+ZGF0YSgpOworICAgICAgICBTaGFyZWRCdWZmZXIgKmJ1ZmZlciA9IHRpZmZS ZXNvdXJjZS0+ZGF0YSgpOwogICAgICAgICBpZiAoIWJ1ZmZlcikKICAgICAgICAgICAgIGdvdG8g bm9Qcm9taXNlZERhdGE7CiAgICAgICAgIAogICAgICAgICBOU0RhdGEgKmRhdGEgPSBidWZmZXIt PmNyZWF0ZU5TRGF0YSgpOwotICAgICAgICBOU1VSTFJlc3BvbnNlICpyZXNwb25zZSA9IHJlc291 cmNlLT5yZXNwb25zZSgpLm5zVVJMUmVzcG9uc2UoKTsKKyAgICAgICAgTlNVUkxSZXNwb25zZSAq cmVzcG9uc2UgPSB0aWZmUmVzb3VyY2UtPnJlc3BvbnNlKCkubnNVUkxSZXNwb25zZSgpOwogICAg ICAgICAKICAgICAgICAgd3JhcHBlciA9IFtbW05TRmlsZVdyYXBwZXIgYWxsb2NdIGluaXRSZWd1 bGFyRmlsZVdpdGhDb250ZW50czpkYXRhXSBhdXRvcmVsZWFzZV07CiAgICAgICAgIFt3cmFwcGVy IHNldFByZWZlcnJlZEZpbGVuYW1lOltyZXNwb25zZSBzdWdnZXN0ZWRGaWxlbmFtZV1dOwpAQCAt NTIwMyw2ICs1MTg4LDIxIEBAIHN0YXRpYyBDR1BvaW50IGNvcmVHcmFwaGljc1NjcmVlblBvaW50 Rm8KICAgICByZXR1cm4gcGFyYW1ldGVycy5ldmVudFdhc0hhbmRsZWQ7CiB9CiAKKy0gKFdlYkNv cmU6OkNhY2hlZEltYWdlKilwcm9taXNlZERyYWdUSUZGRGF0YVNvdXJjZSAKK3sKKyAgICByZXR1 cm4gX3ByaXZhdGUtPnByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlOworfQorCistICh2b2lkKXNl dFByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlOihXZWJDb3JlOjpDYWNoZWRJbWFnZSopc291cmNl Cit7CisgICAgaWYgKHNvdXJjZSkKKyAgICAgICAgc291cmNlLT5yZWYoJnByb21pc2VkRGF0YUNs aWVudCk7CisgICAgCisgICAgaWYgKF9wcml2YXRlLT5wcm9taXNlZERyYWdUSUZGRGF0YVNvdXJj ZSkKKyAgICAgICAgX3ByaXZhdGUtPnByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlLT5kZXJlZigm cHJvbWlzZWREYXRhQ2xpZW50KTsKKyAgICBfcHJpdmF0ZS0+cHJvbWlzZWREcmFnVElGRkRhdGFT b3VyY2UgPSBzb3VyY2U7Cit9CisKIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdlYkhUTUxWaWV3 IChXZWJOU1RleHRJbnB1dFN1cHBvcnQpCkluZGV4OiBXZWJLaXQvV2ViVmlldy9XZWJIVE1MVmll d0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L1dlYlZpZXcvV2ViSFRNTFZpZXdJbnRl cm5hbC5oCShyZXZpc2lvbiAyMTU4MSkKKysrIFdlYktpdC9XZWJWaWV3L1dlYkhUTUxWaWV3SW50 ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsNyBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgY2xhc3MgS2V5Ym9hcmRFdmVudDsKKyAgICBjbGFzcyBDYWNoZWRJbWFnZTsK IH0KIAogc3RydWN0IFdlYkhUTUxWaWV3SW50ZXJwcmV0S2V5RXZlbnRzUGFyYW1ldGVyczsKQEAg LTkwLDcgKzkxLDcgQEAgc3RydWN0IFdlYkhUTUxWaWV3SW50ZXJwcmV0S2V5RXZlbnRzUGFyYQog ICAgIE5TVGV4dFZpZXcgKmZpcnN0UmVzcG9uZGVyVGV4dFZpZXdBdE1vdXNlRG93blRpbWU7CiAg ICAgCiAgICAgV2ViRGF0YVNvdXJjZSAqZGF0YVNvdXJjZTsKLSAgICBET01FbGVtZW50ICpwcm9t aXNlZERyYWdUSUZGRGF0YVNvdXJjZTsKKyAgICBXZWJDb3JlOjpDYWNoZWRJbWFnZSAqcHJvbWlz ZWREcmFnVElGRkRhdGFTb3VyY2U7CiB9CiAtICh2b2lkKWNsZWFyOwogQGVuZApAQCAtMTIwLDUg KzEyMSw3IEBAIHN0cnVjdCBXZWJIVE1MVmlld0ludGVycHJldEtleUV2ZW50c1BhcmEKIC0gKHZv aWQpc2V0R3JhbW1hckNoZWNraW5nRW5hYmxlZDooQk9PTClmbGFnOwogLSAodm9pZCl0b2dnbGVH cmFtbWFyQ2hlY2tpbmc6KGlkKXNlbmRlcjsKICNlbmRpZgorLSAoV2ViQ29yZTo6Q2FjaGVkSW1h Z2UqKXByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlOworLSAodm9pZClzZXRQcm9taXNlZERyYWdU SUZGRGF0YVNvdXJjZTooV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqKXNvdXJjZTsKIEBlbmQKIApJbmRl eDogV2ViS2l0L1dlYlZpZXcvV2ViSFRNTFZpZXdQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L1dlYlZpZXcvV2ViSFRNTFZpZXdQcml2YXRlLmgJKHJldmlzaW9uIDIxNTgxKQorKysgV2Vi S2l0L1dlYlZpZXcvV2ViSFRNTFZpZXdQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDcg KzM3LDcgQEAKIEBjbGFzcyBXZWJWaWV3OwogQGNsYXNzIFdlYkZyYW1lOwogQGNsYXNzIFdlYlBs dWdpbkNvbnRyb2xsZXI7Ci0gCisKIEBwcm90b2NvbCBXZWJIVE1MSGlnaGxpZ2h0ZXIKIC0gKE5T UmVjdCloaWdobGlnaHRSZWN0Rm9yTGluZTooTlNSZWN0KWxpbmVSZWN0IHJlcHJlc2VudGVkTm9k ZTooRE9NTm9kZSAqKW5vZGU7CiAtICh2b2lkKXBhaW50SGlnaGxpZ2h0Rm9yQm94OihOU1JlY3Qp Ym94UmVjdCBvbkxpbmU6KE5TUmVjdClsaW5lUmVjdCBiZWhpbmRUZXh0OihCT09MKXRleHQgZW50 aXJlTGluZTooQk9PTClsaW5lIHJlcHJlc2VudGVkTm9kZTooRE9NTm9kZSAqKW5vZGU7CkBAIC0x MjIsNyArMTIyLDQgQEAKIC0gKHZvaWQpc2V0TWFya2VkVGV4dE1hdGNoZXNBcmVIaWdobGlnaHRl ZDooQk9PTCluZXdWYWx1ZTsKIC0gKEJPT0wpbWFya2VkVGV4dE1hdGNoZXNBcmVIaWdobGlnaHRl ZDsKIC0gKE5TQXJyYXkgKilyZWN0c0ZvclRleHRNYXRjaGVzOwotCi0tIChET01FbGVtZW50ICop cHJvbWlzZWREcmFnVElGRkRhdGFTb3VyY2U7Ci0tICh2b2lkKXNldFByb21pc2VkRHJhZ1RJRkZE YXRhU291cmNlOihET01FbGVtZW50ICopc291cmNlOwogQGVuZAo=