19331 2008-05-30 14:22:50 -0700 Drag and drop of links in edit mode violates assert in MoveSelectionCommand::doApply() 2008-10-12 16:01:47 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC Linux RESOLVED FIXED InRadar P2 Normal --- 19386 1 jonathon darin justin.garcia oliver pierre-luc.beaudoin oldest_to_newest 81977 0 jonathon 2008-05-30 14:22:50 -0700 When in edit mode (using QtWebKit), if I drag a live link with no text selected and then drop it somewhere else on the page, I hit an ASSERT in MoveSelectionCommand::doApply(). I sent a message to the mailing list about this (https://lists.webkit.org/pipermail/webkit-dev/2008-May/004044.html), but I'll copy it here for reference: I'm attempting to add editing support to QtWebKit (e.g. QWebPage::setEditable()), and it seems to work great for basic editing. But while playing around with it, I've noticed some bugs related to drag-and-drop that I'm having trouble chasing down and would appreciate a bit of guidance. The browser I'm testing with does not set anything special for editableLinkBehavior (so it's the default, which means that links are live in edit mode). The first problem that I'm running into is the following: - No text is selected - page is in edit mode - click and drag a link - drop the link somewhere else on the page -> hits ASSERT in MoveSelectionCommand::doApply() - ASSERT(selection.isRange()); So, as far as I can see, the problem is one of the following: A) we're using the wrong command in this situation (we shouldn't be using MoveSelectionCommand because there is no current selection) B) this command should handle the case where there's no selection instead of just asserting it C) the drag should not be allowed unless there is a selection (this one seems wrong to me -- if the editable link behavior is 'live', it seems they should behave just like normal links, which can be dragged without an active selection) D) When a user initiates a drag without anything selected, webkit should automatically expand the selection to the entire contents of the link E) something I haven't thought of.. Which one of the above is the right answer? As I'm relatively new to WebKit development and have very little experience with the editing internals, I would greatly appreciate some advice from people with more experience in this area. Also, if anybody can try to reproduce the behavior described above in any of the other ports (especially mac or windows), I'd be very interested to hear your results. 81978 1 21438 jonathon 2008-05-30 14:27:03 -0700 Created attachment 21438 Patch with a potential fix for link drag and drop ASSERT This patch seems to make things behave more as I would expect them to, but I don't know if this is really the 'right' solution. It seemed like the least bad option to me, but I don't know this code intimately so there may be better options. Feedback appreciated. 82233 2 21484 jonathon 2008-06-03 13:29:47 -0700 Created attachment 21484 An alternate patch that uses the enclosingAnchorElement() function from htmlediting.h instead of traversing the heirarchy manually 82272 3 21484 oliver 2008-06-03 21:06:40 -0700 Comment on attachment 21484 An alternate patch that uses the enclosingAnchorElement() function from htmlediting.h instead of traversing the heirarchy manually Any fix for this bug, whether it's valid or not, should be at the drag launch site, not the receiver. Eg. If the drag is starting inside a link, and the correct link mode is set, then the caret should be converted to a range containing that link. 82273 4 jonathon 2008-06-03 21:15:18 -0700 Great, thanks for the direction. When you say 'the caret should be converted to a range', do you mean that the link should actually be selected when you start a drag (similar to what it does when you drag an image?). Just trying to clarify whether you're referring to the specific 'Range' class or whether you mean 'range' in a generic sense. 82283 5 mrowe 2008-06-03 22:25:52 -0700 I can reproduce this on the Mac if I set the editable link behaviour to "Default" or "Always Live". 82284 6 mrowe 2008-06-03 22:26:17 -0700 <rdar://problem/5984433> 82302 7 jonathon 2008-06-04 10:08:53 -0700 Thanks for the info mark. Can I prod you for a bit more detail? Now we know that the mac version hits the ASSERT, but when you were not running a debug build (and therefore didn't hit the ASSERT), what was the behavior on mac when editable links were live? - Did the link get properly inserted into the drop location with the correct text and correct link URL? - Did the old link get deleted properly from the original location? - If the link was inserted properly in the drop location, was the new link selected after the drop? 82350 8 21509 jonathon 2008-06-05 08:11:38 -0700 Created attachment 21509 Expand the selection to the enclosing anchor element at the drag launch per comment by Olliver Well, Here's a modified patch that expands the selection at the drag launch site as you suggested. I'm not convinced this is the ideal solution however. In this case, if you start a drag and then abort it (e.g. by pressing 'esc'), you'll end with the link selected when it wasn't selected before the drag. This doesn't seem quite right to me, but I guess it doesn't seem too bad either as it's the same behavior that exists for images. 84110 9 21509 oliver 2008-06-22 22:39:38 -0700 Comment on attachment 21509 Expand the selection to the enclosing anchor element at the drag launch per comment by Olliver The selection should not be modified unless EditableLinkBehavior is set to an appropriate setting, otherwise the logic looks fine. Minor style issue -- if (node) ... should not have braces as it is a single line block Otherwise this looks good. 84139 10 jonathon 2008-06-23 08:25:22 -0700 I can change the logic to only expand the selection if we're in editing mode, however I was trying to match the behavior of dragging an image. When you start an image drag without any text selected, the image becomes automatically selected, even if you're not in edit mode. So before I update the patch, I just want to confirm that you want these behaviors to be different. Alternatively, I could change the image-dragging behavior to not expand selection if we're not in edit mode. (See prepareClipboardForImageDrag() in DragController.cpp for where the image selection is expanded) 84177 11 21888 jonathon 2008-06-23 13:09:28 -0700 Created attachment 21888 updated patch which only expands selection when in edit mode This patch is brought up-to-date with current trunk and doesn't expand unless we're in edit mode. I didn't touch anything related to images (see my previous comment), so images will still become selected on a drag even when not in edit mode. 84185 12 21889 jonathon 2008-06-23 13:50:10 -0700 Created attachment 21889 Updated coding style (remove braces on one-line if statement) Sorry, forgot your coding style comment on the previous patch. This one should be correct. 87595 13 21889 eric 2008-08-01 12:19:15 -0700 Comment on attachment 21889 Updated coding style (remove braces on one-line if statement) Oliver reviewed the last couple patches, assigning to him for final review on this one. 87596 14 21889 eric 2008-08-01 12:19:15 -0700 Comment on attachment 21889 Updated coding style (remove braces on one-line if statement) Oliver reviewed the last couple patches, assigning to him for final review on this one. 87708 15 21889 oliver 2008-08-02 23:40:59 -0700 Comment on attachment 21889 Updated coding style (remove braces on one-line if statement) r=me, on this, i'm not sure we can make an automated test for it unforunately due to the drag mode change. Also, my tree is dirty so i'd appreciate it if someone else could land this. 95094 16 darin 2008-10-12 15:56:00 -0700 We normally require a test no matter what -- a manual test if not an automated one. But since this was reviewed months ago I guess I will fudge the rules. 95096 17 darin 2008-10-12 16:01:47 -0700 http://trac.webkit.org/changeset/37534 21438 2008-05-30 14:27:03 -0700 2008-06-03 13:29:47 -0700 Patch with a potential fix for link drag and drop ASSERT 0001-Fix-ASSERT-violation-when-dragging-and-dropping-a-li.patch text/plain 3580 jonathon RnJvbSAyNjQxYjQ1NDg4M2U2NmJlZGEwZDdkNWI5ODIzMWNkMjY3MDY2Y2NlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhvbiBKb25nc21hIDxqb25hdGhvbi5qb25nc21hQGNv bGxhYm9yYS5jby51az4KRGF0ZTogRnJpLCAzMCBNYXkgMjAwOCAxNjoyNTo1NCAtMDUwMApTdWJq ZWN0OiBbUEFUQ0hdIEZpeCBBU1NFUlQgdmlvbGF0aW9uIHdoZW4gZHJhZ2dpbmcgYW5kIGRyb3Bw aW5nIGEgbGluayBpbiBlZGl0IG1vZGUgKCMxOTMzMSkKCiAgICAgICAgKiBwYWdlL0RyYWdDb250 cm9sbGVyLmNwcDoKICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OmNvbmNsdWRlRHJh Zyk6IFdoZW4gaW4gZWRpdCBtb2RlIGFuZCBsaW5rcyBhcmUKCQlsaXZlLCBhIHVzZXIgY2FuIGlu aXRpYXRlIGEgZHJhZyB3aXRob3V0IGFueSB0ZXh0IHNlbGVjdGVkLiAgVGhpcwoJCXJlc3VsdHMg aW4gYSB2aW9sYXRpb24gb2YgQVNTRVJUKHNlbGVjdGlvbi5pc1JhbmdlKCkpIGluCgkJTW92ZVNl bGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkoKS4gIFRvIGhhbmRsZSB0aGlzIGNhc2UsIGF0IHRoZSBl bmQgb2YgYQoJCWRyYWcsIGlmIHRoZXJlIGlzIG5vIHNlbGVjdGlvbiByYW5nZSwgbG9vayB1cCB0 aGUgaGVpcmFyY2h5IG9mIG5vZGVzCgkJZnJvbSB0aGUgY2FyZXQgbG9jYXRpb24gdG8gc2VlIGlm IHdlIHN0YXJ0ZWQgdGhlIGRyYWcgZnJvbSB3aXRoaW4gYQoJCWxpbmsuICBJZiB3ZSBkaWQsIHNl dCB0aGUgc2VsZWN0aW9uIHRvIHRoZSBsaW5rIG5vZGUgc28gdGhhdCBpdCBnZXRzCgkJcmVtb3Zl ZCBwcm9wZXJseSBpbiBNb3ZlU2VsZWN0aW9uQ29tbWFuZC4KLS0tCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgIHwgICAxNiArKysrKysrKysrKysrKysrCiBXZWJDb3JlL3BhZ2UvRHJh Z0NvbnRyb2xsZXIuY3BwIHwgICAxNiArKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQs IDMyIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9D aGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1MjdlZjk0Li40ZWZmNDc1IDEwMDY0 NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE5IEBACisyMDA4LTA1LTMwICBKb25hdGhvbiBKb25nc21hICA8am9uYXRob24uam9uZ3Nt YUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAg ICAgICAgKiBwYWdlL0RyYWdDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdD b250cm9sbGVyOjpjb25jbHVkZURyYWcpOiBXaGVuIGluIGVkaXQgbW9kZSBhbmQgbGlua3MgYXJl CisJCWxpdmUsIGEgdXNlciBjYW4gaW5pdGlhdGUgYSBkcmFnIHdpdGhvdXQgYW55IHRleHQgc2Vs ZWN0ZWQuICBUaGlzCisJCXJlc3VsdHMgaW4gYSB2aW9sYXRpb24gb2YgQVNTRVJUKHNlbGVjdGlv bi5pc1JhbmdlKCkpIGluCisJCU1vdmVTZWxlY3Rpb25Db21tYW5kOjpkb0FwcGx5KCkuICBUbyBo YW5kbGUgdGhpcyBjYXNlLCBhdCB0aGUgZW5kIG9mIGEKKwkJZHJhZywgaWYgdGhlcmUgaXMgbm8g c2VsZWN0aW9uIHJhbmdlLCBsb29rIHVwIHRoZSBoZWlyYXJjaHkgb2Ygbm9kZXMKKwkJZnJvbSB0 aGUgY2FyZXQgbG9jYXRpb24gdG8gc2VlIGlmIHdlIHN0YXJ0ZWQgdGhlIGRyYWcgZnJvbSB3aXRo aW4gYQorCQlsaW5rLiAgSWYgd2UgZGlkLCBzZXQgdGhlIHNlbGVjdGlvbiB0byB0aGUgbGluayBu b2RlIHNvIHRoYXQgaXQgZ2V0cworCQlyZW1vdmVkIHByb3Blcmx5IGluIE1vdmVTZWxlY3Rpb25D b21tYW5kLgorCiAyMDA4LTA1LTIwICBLZXZpbiBNY0N1bGxvdWdoICA8a21jY3VsbG91Z2hAYXBw bGUuY29tPgogCiAgICAgICAgIFJ1YmJlciBzdGFtcGVkIGJ5IEFkYW0uCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9s bGVyLmNwcAppbmRleCBiOTllNzUwLi5hYWE0NWQxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2Uv RHJhZ0NvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAK QEAgLTYxLDYgKzYxLDggQEAKICNpbmNsdWRlICJUZXh0LmgiCiAjaW5jbHVkZSAibWFya3VwLmgi CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorLy8gRklYTUU6IFJFTU9WRQorI2luY2x1ZGUgIkNT dHJpbmcuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00MDMsNiArNDA1LDIwIEBAIGJv b2wgRHJhZ0NvbnRyb2xsZXI6OmNvbmNsdWRlRHJhZyhEcmFnRGF0YSogZHJhZ0RhdGEsIERyYWdE ZXN0aW5hdGlvbkFjdGlvbiBhY3RpCiAgICAgICAgICAgICBib29sIHNtYXJ0TW92ZSA9IGlubmVy RnJhbWUtPnNlbGVjdGlvbkdyYW51bGFyaXR5KCkgPT0gV29yZEdyYW51bGFyaXR5IAogICAgICAg ICAgICAgICAgICAgICAgICAgICAmJiBpbm5lckZyYW1lLT5lZGl0b3IoKS0+c21hcnRJbnNlcnRE ZWxldGVFbmFibGVkKCkgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICYmIGRyYWdEYXRhLT5j YW5TbWFydFJlcGxhY2UoKTsKKyAgICAgICAgICAgIGlmIChpbm5lckZyYW1lLT5zZWxlY3Rpb25D b250cm9sbGVyKCktPmlzQ2FyZXQoKSkgeworICAgICAgICAgICAgICAgIC8vIGEgdXNlciBjYW4g aW5pdGlhdGUgYSBkcmFnIG9uIGEgbGluayB3aXRob3V0IGhhdmluZyBhbnkgdGV4dAorICAgICAg ICAgICAgICAgIC8vIHNlbGVjdGVkLiAgSW4gdGhpcyBjYXNlLCB3ZSBzaG91bGQgZXhwYW5kIHRo ZSBzZWxlY3Rpb24gdG8KKyAgICAgICAgICAgICAgICAvLyB0aGUgZW50aXJlIGxpbmsgYW5kIG1v dmUgdGhhdCB0byB0aGUgbmV3IGxvY2F0aW9uCisgICAgICAgICAgICAgICAgUG9zaXRpb24gcG9z ID0gaW5uZXJGcmFtZS0+c2VsZWN0aW9uQ29udHJvbGxlcigpLT5iYXNlKCk7CisgICAgICAgICAg ICAgICAgTm9kZSogbm9kZSA9IHBvcy5ub2RlKCk7CisgICAgICAgICAgICAgICAgd2hpbGUgKG5v ZGUpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKG5vZGUtPmlzTGluaygpKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICBpbm5lckZyYW1lLT5zZWxlY3Rpb25Db250cm9sbGVyKCktPnNldFNl bGVjdGlvbihTZWxlY3Rpb246OnNlbGVjdGlvbkZyb21Db250ZW50c09mTm9kZShub2RlKSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgICAgICBub2RlID0gbm9kZS0+cGFyZW50KCk7CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgfQogICAgICAgICAgICAgYXBwbHlDb21tYW5kKG5ldyBNb3ZlU2VsZWN0 aW9uQ29tbWFuZChmcmFnbWVudCwgZHJhZ0NhcmV0LmJhc2UoKSwgc21hcnRNb3ZlKSk7CiAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAoc2V0U2VsZWN0aW9uVG9EcmFnQ2FyZXQoaW5u ZXJGcmFtZSwgZHJhZ0NhcmV0LCByYW5nZSwgcG9pbnQpKQotLSAKMS41LjUKCg== 21484 2008-06-03 13:29:47 -0700 2008-06-05 08:11:38 -0700 An alternate patch that uses the enclosingAnchorElement() function from htmlediting.h instead of traversing the heirarchy manually 0001-Fix-ASSERT-violation-when-dragging-and-dropping-a-li.patch text/plain 3520 jonathon RnJvbSBhZWIwNjI4NTViNGJhYzBjMWI3YjQwOTg0MzQzMWIxZGZhZDlmNDUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhvbiBKb25nc21hIDxqb25hdGhvbi5qb25nc21hQGNv bGxhYm9yYS5jby51az4KRGF0ZTogRnJpLCAzMCBNYXkgMjAwOCAxNjoyNTo1NCAtMDUwMApTdWJq ZWN0OiBbUEFUQ0hdIEZpeCBBU1NFUlQgdmlvbGF0aW9uIHdoZW4gZHJhZ2dpbmcgYW5kIGRyb3Bw aW5nIGEgbGluayBpbiBlZGl0IG1vZGUgKCMxOTMzMSkKCiAgICAgICAgKiBwYWdlL0RyYWdDb250 cm9sbGVyLmNwcDoKICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OmNvbmNsdWRlRHJh Zyk6IFdoZW4gaW4gZWRpdCBtb2RlIGFuZCBsaW5rcyBhcmUKICAgICAgICBsaXZlLCBhIHVzZXIg Y2FuIGluaXRpYXRlIGEgZHJhZyB3aXRob3V0IGFueSB0ZXh0IHNlbGVjdGVkLiAgVGhpcwogICAg ICAgIHJlc3VsdHMgaW4gYSB2aW9sYXRpb24gb2YgQVNTRVJUKHNlbGVjdGlvbi5pc1JhbmdlKCkp IGluCiAgICAgICAgTW92ZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkoKS4gIFRvIGhhbmRsZSB0 aGlzIGNhc2UsIGF0IHRoZSBlbmQgb2YgYQogICAgICAgIGRyYWcsIGlmIHRoZXJlIGlzIG5vIHNl bGVjdGlvbiByYW5nZSwgbG9vayBmb3IgYW4gZW5jbG9zaW5nIGFuY2hvciB0bwogICAgICAgIHNl ZSBpZiB3ZSBzdGFydGVkIHRoZSBkcmFnIGZyb20gd2l0aGluIGEgbGluay4gIElmIHdlIGRpZCwg c2V0IHRoZQogICAgICAgIHNlbGVjdGlvbiB0byB0aGUgbGluayBub2RlIHNvIHRoYXQgaXQgZ2V0 cyByZW1vdmVkIHByb3Blcmx5IGluCiAgICAgICAgTW92ZVNlbGVjdGlvbkNvbW1hbmQuCi0tLQog V2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICB8ICAgMTYgKysrKysrKysrKysrKysrKwog V2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcCB8ICAgMTEgKysrKysrKysrKysKIDIgZmls ZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDUyN2VmOTQuLjRl ZmY0NzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDgtMDUtMzAgIEpvbmF0aG9uIEpvbmdzbWEgIDxqb25h dGhvbi5qb25nc21hQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXQVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENI QU5HRUQKKworICAgICAgICAqIHBhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RHJhZ0NvbnRyb2xsZXI6OmNvbmNsdWRlRHJhZyk6IFdoZW4gaW4gZWRpdCBtb2RlIGFu ZCBsaW5rcyBhcmUKKwkJbGl2ZSwgYSB1c2VyIGNhbiBpbml0aWF0ZSBhIGRyYWcgd2l0aG91dCBh bnkgdGV4dCBzZWxlY3RlZC4gIFRoaXMKKwkJcmVzdWx0cyBpbiBhIHZpb2xhdGlvbiBvZiBBU1NF UlQoc2VsZWN0aW9uLmlzUmFuZ2UoKSkgaW4KKwkJTW92ZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBw bHkoKS4gIFRvIGhhbmRsZSB0aGlzIGNhc2UsIGF0IHRoZSBlbmQgb2YgYQorCQlkcmFnLCBpZiB0 aGVyZSBpcyBubyBzZWxlY3Rpb24gcmFuZ2UsIGxvb2sgdXAgdGhlIGhlaXJhcmNoeSBvZiBub2Rl cworCQlmcm9tIHRoZSBjYXJldCBsb2NhdGlvbiB0byBzZWUgaWYgd2Ugc3RhcnRlZCB0aGUgZHJh ZyBmcm9tIHdpdGhpbiBhCisJCWxpbmsuICBJZiB3ZSBkaWQsIHNldCB0aGUgc2VsZWN0aW9uIHRv IHRoZSBsaW5rIG5vZGUgc28gdGhhdCBpdCBnZXRzCisJCXJlbW92ZWQgcHJvcGVybHkgaW4gTW92 ZVNlbGVjdGlvbkNvbW1hbmQuCisKIDIwMDgtMDUtMjAgIEtldmluIE1jQ3VsbG91Z2ggIDxrbWNj dWxsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkgQWRhbS4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL3BhZ2Uv RHJhZ0NvbnRyb2xsZXIuY3BwCmluZGV4IGI5OWU3NTAuLmUwNmJmNWUgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0RyYWdDb250 cm9sbGVyLmNwcApAQCAtNDQsNiArNDQsNyBAQAogI2luY2x1ZGUgIkZyYW1lTG9hZGVyLmgiCiAj aW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiSFRNTEFuY2hvckVsZW1lbnQuaCIKKyNp bmNsdWRlICJodG1sZWRpdGluZy5oIgogI2luY2x1ZGUgIkhUTUxJbnB1dEVsZW1lbnQuaCIKICNp bmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVzdWx0LmgiCkBAIC00MDMs NiArNDA0LDE2IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OmNvbmNsdWRlRHJhZyhEcmFnRGF0YSog ZHJhZ0RhdGEsIERyYWdEZXN0aW5hdGlvbkFjdGlvbiBhY3RpCiAgICAgICAgICAgICBib29sIHNt YXJ0TW92ZSA9IGlubmVyRnJhbWUtPnNlbGVjdGlvbkdyYW51bGFyaXR5KCkgPT0gV29yZEdyYW51 bGFyaXR5IAogICAgICAgICAgICAgICAgICAgICAgICAgICAmJiBpbm5lckZyYW1lLT5lZGl0b3Io KS0+c21hcnRJbnNlcnREZWxldGVFbmFibGVkKCkgCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICYmIGRyYWdEYXRhLT5jYW5TbWFydFJlcGxhY2UoKTsKKyAgICAgICAgICAgIGlmIChpbm5lckZy YW1lLT5zZWxlY3Rpb25Db250cm9sbGVyKCktPmlzQ2FyZXQoKSkgeworICAgICAgICAgICAgICAg IC8vIGEgdXNlciBjYW4gaW5pdGlhdGUgYSBkcmFnIG9uIGEgbGluayB3aXRob3V0IGhhdmluZyBh bnkgdGV4dAorICAgICAgICAgICAgICAgIC8vIHNlbGVjdGVkLiAgSW4gdGhpcyBjYXNlLCB3ZSBz aG91bGQgZXhwYW5kIHRoZSBzZWxlY3Rpb24gdG8KKyAgICAgICAgICAgICAgICAvLyB0aGUgZW50 aXJlIGxpbmsgYW5kIG1vdmUgdGhhdCB0byB0aGUgbmV3IGxvY2F0aW9uCisgICAgICAgICAgICAg ICAgUG9zaXRpb24gcG9zID0gaW5uZXJGcmFtZS0+c2VsZWN0aW9uQ29udHJvbGxlcigpLT5iYXNl KCk7CisgICAgICAgICAgICAgICAgTm9kZSogbm9kZSA9IGVuY2xvc2luZ0FuY2hvckVsZW1lbnQo cG9zKTsKKyAgICAgICAgICAgICAgICBpZiAobm9kZSkgeworICAgICAgICAgICAgICAgICAgICBp bm5lckZyYW1lLT5zZWxlY3Rpb25Db250cm9sbGVyKCktPnNldFNlbGVjdGlvbihTZWxlY3Rpb246 OnNlbGVjdGlvbkZyb21Db250ZW50c09mTm9kZShub2RlKSk7CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgfQogICAgICAgICAgICAgYXBwbHlDb21tYW5kKG5ldyBNb3ZlU2VsZWN0aW9u Q29tbWFuZChmcmFnbWVudCwgZHJhZ0NhcmV0LmJhc2UoKSwgc21hcnRNb3ZlKSk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAoc2V0U2VsZWN0aW9uVG9EcmFnQ2FyZXQoaW5uZXJG cmFtZSwgZHJhZ0NhcmV0LCByYW5nZSwgcG9pbnQpKQotLSAKMS41LjUKCg== 21509 2008-06-05 08:11:38 -0700 2008-06-23 13:09:28 -0700 Expand the selection to the enclosing anchor element at the drag launch per comment by Olliver 0001-2008-06-05-Jonathon-Jongsma-jonathon.jongsma-coll.patch text/plain 3436 jonathon RnJvbSA1ZjVjNDg2YmJiMTdmMmYxN2FkMzhkZGUxMTJmYWUxNTIwOWEzOTE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhvbiBKb25nc21hIDxqb25hdGhvbi5qb25nc21hQGNv bGxhYm9yYS5jby51az4KRGF0ZTogVGh1LCA1IEp1biAyMDA4IDEwOjA5OjMxIC0wNTAwClN1Ympl Y3Q6IFtQQVRDSF0gMjAwOC0wNi0wNSAgSm9uYXRob24gSm9uZ3NtYSAgPGpvbmF0aG9uLmpvbmdz bWFAY29sbGFib3JhLmNvLnVrPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CiAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECgogICAgICAg ICogcGFnZS9EcmFnQ29udHJvbGxlci5jcHA6CiAgICAgICAgKFdlYkNvcmU6OkRyYWdDb250cm9s bGVyOjpzdGFydERyYWcpOiBXaGVuIGEgbGluayBpcyBkcmFnZ2VkIHdpdGhvdXQgYW55CiAgICAg ICAgdGV4dCBzZWxlY3RlZCAobm90ZTogZm9yIHRoaXMgdG8gd29yaywgdGhlIEVkaXRhYmxlTGlu a0JlaGF2aW9yIHNldHRpbmcgbXVzdCBiZQogICAgICAgIHNldCB0byAnbGl2ZScgb3IgJ2RlZmF1 bHQnKSBhbmQgdGhlbiBkcm9wcGVkIGludG8gYW4gZWRpdGFibGUgaHRtbCBkb2N1bWVudCBpdAog ICAgICAgIHdpbGwgZXZlbnR1YWxseSB2aW9sYXRlIGFuIEFTU0VSVCBpbiBNb3ZlU2VsZWN0aW9u Q29tbWFuZCB0aGF0IHJlcXVpcmVzIHRoYXQgdGhlcmUKICAgICAgICBpcyBhIHNlbGVjdGlvbi4g IFRvIHByZXZlbnQgdGhpcywgZXhwYW5kIHRoZSBzZWxlY3Rpb24gdG8gdGhlIGVuY2xvc2luZyBh bmNob3IgdGFnCiAgICAgICAgd2hlbiB0aGUgZHJhZyBiZWdpbnMuCi0tLQogV2ViQ29yZS9DaGFu Z2VMb2cgICAgICAgICAgICAgICB8ICAgMTQgKysrKysrKysrKysrKysKIFdlYkNvcmUvcGFnZS9E cmFnQ29udHJvbGxlci5jcHAgfCAgIDE0ICsrKysrKysrKysrKystCiAyIGZpbGVzIGNoYW5nZWQs IDI3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9D aGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1NzAxZjM0Li5hYWVmNGQ3IDEwMDY0 NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDA4LTA2LTA1ICBKb25hdGhvbiBKb25nc21hICA8am9uYXRob24uam9uZ3Nt YUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAg ICAgICAgKiBwYWdlL0RyYWdDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdD b250cm9sbGVyOjpzdGFydERyYWcpOiBXaGVuIGEgbGluayBpcyBkcmFnZ2VkIHdpdGhvdXQgYW55 CisgICAgICAgIHRleHQgc2VsZWN0ZWQgKG5vdGU6IGZvciB0aGlzIHRvIHdvcmssIHRoZSBFZGl0 YWJsZUxpbmtCZWhhdmlvciBzZXR0aW5nIG11c3QgYmUKKyAgICAgICAgc2V0IHRvICdsaXZlJyBv ciAnZGVmYXVsdCcpIGFuZCB0aGVuIGRyb3BwZWQgaW50byBhbiBlZGl0YWJsZSBodG1sIGRvY3Vt ZW50IGl0CisgICAgICAgIHdpbGwgZXZlbnR1YWxseSB2aW9sYXRlIGFuIEFTU0VSVCBpbiBNb3Zl U2VsZWN0aW9uQ29tbWFuZCB0aGF0IHJlcXVpcmVzIHRoYXQgdGhlcmUKKyAgICAgICAgaXMgYSBz ZWxlY3Rpb24uICBUbyBwcmV2ZW50IHRoaXMsIGV4cGFuZCB0aGUgc2VsZWN0aW9uIHRvIHRoZSBl bmNsb3NpbmcgYW5jaG9yIHRhZworICAgICAgICB3aGVuIHRoZSBkcmFnIGJlZ2lucy4KKwogMjAw OC0wNi0wMyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIu Y3BwIGIvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAppbmRleCBiOTllNzUwLi43NTc3 MmRmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCisrKyBiL1dl YkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAKICNpbmNsdWRl ICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkhUTUxB bmNob3JFbGVtZW50LmgiCisjaW5jbHVkZSAiaHRtbGVkaXRpbmcuaCIKICNpbmNsdWRlICJIVE1M SW5wdXRFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSGl0VGVz dFJlc3VsdC5oIgpAQCAtNjQ5LDcgKzY1MCwxOCBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFy dERyYWcoRnJhbWUqIHNyYywgQ2xpcGJvYXJkKiBjbGlwYm9hcmQsIERyYWdPcGVyYXRpb24gcwog ICAgICAgICAgICAgLy8gU2ltcGxpZnkgd2hpdGVzcGFjZSBzbyB0aGUgdGl0bGUgcHV0IG9uIHRo ZSBjbGlwYm9hcmQgcmVzZW1ibGVzIHdoYXQgdGhlIHVzZXIgc2VlcwogICAgICAgICAgICAgLy8g b24gdGhlIHdlYiBwYWdlLiBUaGlzIGluY2x1ZGVzIHJlcGxhY2luZyBuZXdsaW5lcyB3aXRoIHNw YWNlcy4KICAgICAgICAgICAgIGNsaXBib2FyZC0+d3JpdGVVUkwobGlua1VSTCwgZHJhZ1NvdXJj ZS50ZXh0Q29udGVudCgpLnNpbXBsaWZ5V2hpdGVTcGFjZSgpLCBzcmMpOwotICAgICAgICAKKwor ICAgICAgICBpZiAoc3JjLT5zZWxlY3Rpb25Db250cm9sbGVyKCktPmlzQ2FyZXQoKSkgeworICAg ICAgICAgICAgLy8gYSB1c2VyIGNhbiBpbml0aWF0ZSBhIGRyYWcgb24gYSBsaW5rIHdpdGhvdXQg aGF2aW5nIGFueSB0ZXh0CisgICAgICAgICAgICAvLyBzZWxlY3RlZC4gIEluIHRoaXMgY2FzZSwg d2Ugc2hvdWxkIGV4cGFuZCB0aGUgc2VsZWN0aW9uIHRvCisgICAgICAgICAgICAvLyB0aGUgZW5j bG9zaW5nIGFuY2hvciBlbGVtZW50CisgICAgICAgICAgICBQb3NpdGlvbiBwb3MgPSBzcmMtPnNl bGVjdGlvbkNvbnRyb2xsZXIoKS0+YmFzZSgpOworICAgICAgICAgICAgTm9kZSogbm9kZSA9IGVu Y2xvc2luZ0FuY2hvckVsZW1lbnQocG9zKTsKKyAgICAgICAgICAgIGlmIChub2RlKSB7CisgICAg ICAgICAgICAgICAgc3JjLT5zZWxlY3Rpb25Db250cm9sbGVyKCktPnNldFNlbGVjdGlvbihTZWxl Y3Rpb246OnNlbGVjdGlvbkZyb21Db250ZW50c09mTm9kZShub2RlKSk7CisgICAgICAgICAgICB9 CisgICAgICAgIH0KKwogICAgICAgICBtX2NsaWVudC0+d2lsbFBlcmZvcm1EcmFnU291cmNlQWN0 aW9uKERyYWdTb3VyY2VBY3Rpb25MaW5rLCBkcmFnT3JpZ2luLCBjbGlwYm9hcmQpOwogICAgICAg ICBpZiAoIWRyYWdJbWFnZSkgewogICAgICAgICAgICAgZHJhZ0ltYWdlID0gbV9jbGllbnQtPmNy ZWF0ZURyYWdJbWFnZUZvckxpbmsobGlua1VSTCwgZHJhZ1NvdXJjZS50ZXh0Q29udGVudCgpLCBz cmMpOwotLSAKMS41LjUKCg== 21888 2008-06-23 13:09:28 -0700 2008-06-23 13:50:10 -0700 updated patch which only expands selection when in edit mode 0001-expand-link-selection-on-drag-start.patch text/plain 2836 jonathon RnJvbSBlOTMwYWJjMDQ0ZTcyNTljMDA2ODhiNTk5NmIzOTFiN2JiMTA0N2JiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhvbiBKb25nc21hIDxqb25hdGhvbi5qb25nc21hQGNv bGxhYm9yYS5jby51az4KRGF0ZTogVGh1LCA1IEp1biAyMDA4IDEwOjA5OjMxIC0wNTAwClN1Ympl Y3Q6IFtQQVRDSF0gZXhwYW5kIGxpbmsgc2VsZWN0aW9uIG9uIGRyYWcgc3RhcnQKCi0tLQogV2Vi Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICB8ICAgMTQgKysrKysrKysrKysrKysKIFdlYkNv cmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAgfCAgIDE0ICsrKysrKysrKysrKystCiAyIGZpbGVz IGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMzRjZDAxLi45OTkz ZjBkIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDA4LTA2LTA1ICBKb25hdGhvbiBKb25nc21hICA8am9uYXRo b24uam9uZ3NtYUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFO R0VECisKKyAgICAgICAgKiBwYWdlL0RyYWdDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRyYWdDb250cm9sbGVyOjpzdGFydERyYWcpOiBXaGVuIGEgbGluayBpcyBkcmFnZ2VkIHdp dGhvdXQgYW55CisgICAgICAgIHRleHQgc2VsZWN0ZWQgKG5vdGU6IGZvciB0aGlzIHRvIHdvcmss IHRoZSBFZGl0YWJsZUxpbmtCZWhhdmlvciBzZXR0aW5nIG11c3QgYmUKKyAgICAgICAgc2V0IHRv ICdsaXZlJyBvciAnZGVmYXVsdCcpIGFuZCB0aGVuIGRyb3BwZWQgaW50byBhbiBlZGl0YWJsZSBo dG1sIGRvY3VtZW50IGl0CisgICAgICAgIHdpbGwgZXZlbnR1YWxseSB2aW9sYXRlIGFuIEFTU0VS VCBpbiBNb3ZlU2VsZWN0aW9uQ29tbWFuZCB0aGF0IHJlcXVpcmVzIHRoYXQgdGhlcmUKKyAgICAg ICAgaXMgYSBzZWxlY3Rpb24uICBUbyBwcmV2ZW50IHRoaXMsIGV4cGFuZCB0aGUgc2VsZWN0aW9u IHRvIHRoZSBlbmNsb3NpbmcgYW5jaG9yIHRhZworICAgICAgICB3aGVuIHRoZSBkcmFnIGJlZ2lu cy4KKwogMjAwOC0wNi0yMyAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBSb3dlLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdl L0RyYWdDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKaW5k ZXggMzRiNmYwMi4uODVlYjkyNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9s bGVyLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCkBAIC00NCw2ICs0 NCw3IEBACiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIK ICNpbmNsdWRlICJIVE1MQW5jaG9yRWxlbWVudC5oIgorI2luY2x1ZGUgImh0bWxlZGl0aW5nLmgi CiAjaW5jbHVkZSAiSFRNTElucHV0RWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgog I2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIKQEAgLTY0OSw3ICs2NTAsMTggQEAgYm9vbCBEcmFn Q29udHJvbGxlcjo6c3RhcnREcmFnKEZyYW1lKiBzcmMsIENsaXBib2FyZCogY2xpcGJvYXJkLCBE cmFnT3BlcmF0aW9uIHMKICAgICAgICAgICAgIC8vIFNpbXBsaWZ5IHdoaXRlc3BhY2Ugc28gdGhl IHRpdGxlIHB1dCBvbiB0aGUgY2xpcGJvYXJkIHJlc2VtYmxlcyB3aGF0IHRoZSB1c2VyIHNlZXMK ICAgICAgICAgICAgIC8vIG9uIHRoZSB3ZWIgcGFnZS4gVGhpcyBpbmNsdWRlcyByZXBsYWNpbmcg bmV3bGluZXMgd2l0aCBzcGFjZXMuCiAgICAgICAgICAgICBjbGlwYm9hcmQtPndyaXRlVVJMKGxp bmtVUkwsIGRyYWdTb3VyY2UudGV4dENvbnRlbnQoKS5zaW1wbGlmeVdoaXRlU3BhY2UoKSwgc3Jj KTsKLSAgICAgICAgCisKKyAgICAgICAgaWYgKHNyYy0+c2VsZWN0aW9uKCktPmlzQ2FyZXQoKSAm JiBzcmMtPnNlbGVjdGlvbigpLT5pc0NvbnRlbnRFZGl0YWJsZSgpKSB7CisgICAgICAgICAgICAv LyBhIHVzZXIgY2FuIGluaXRpYXRlIGEgZHJhZyBvbiBhIGxpbmsgd2l0aG91dCBoYXZpbmcgYW55 IHRleHQKKyAgICAgICAgICAgIC8vIHNlbGVjdGVkLiAgSW4gdGhpcyBjYXNlLCB3ZSBzaG91bGQg ZXhwYW5kIHRoZSBzZWxlY3Rpb24gdG8KKyAgICAgICAgICAgIC8vIHRoZSBlbmNsb3NpbmcgYW5j aG9yIGVsZW1lbnQKKyAgICAgICAgICAgIFBvc2l0aW9uIHBvcyA9IHNyYy0+c2VsZWN0aW9uKCkt PmJhc2UoKTsKKyAgICAgICAgICAgIE5vZGUqIG5vZGUgPSBlbmNsb3NpbmdBbmNob3JFbGVtZW50 KHBvcyk7CisgICAgICAgICAgICBpZiAobm9kZSkgeworICAgICAgICAgICAgICAgIHNyYy0+c2Vs ZWN0aW9uKCktPnNldFNlbGVjdGlvbihTZWxlY3Rpb246OnNlbGVjdGlvbkZyb21Db250ZW50c09m Tm9kZShub2RlKSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAgICBtX2NsaWVu dC0+d2lsbFBlcmZvcm1EcmFnU291cmNlQWN0aW9uKERyYWdTb3VyY2VBY3Rpb25MaW5rLCBkcmFn T3JpZ2luLCBjbGlwYm9hcmQpOwogICAgICAgICBpZiAoIWRyYWdJbWFnZSkgewogICAgICAgICAg ICAgZHJhZ0ltYWdlID0gbV9jbGllbnQtPmNyZWF0ZURyYWdJbWFnZUZvckxpbmsobGlua1VSTCwg ZHJhZ1NvdXJjZS50ZXh0Q29udGVudCgpLCBzcmMpOwotLSAKMS41LjUKCg== 21889 2008-06-23 13:50:10 -0700 2008-08-02 23:40:59 -0700 Updated coding style (remove braces on one-line if statement) 0001-expand-link-selection-on-drag-start.patch text/plain 2818 jonathon RnJvbSAyMjJmZTE1YzM2NjNjNGFmMDhhOTIxN2UzNjcxNWE0NjQ4NjFkOGMyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhvbiBKb25nc21hIDxqb25hdGhvbi5qb25nc21hQGNv bGxhYm9yYS5jby51az4KRGF0ZTogVGh1LCA1IEp1biAyMDA4IDEwOjA5OjMxIC0wNTAwClN1Ympl Y3Q6IFtQQVRDSF0gZXhwYW5kIGxpbmsgc2VsZWN0aW9uIG9uIGRyYWcgc3RhcnQKCi0tLQogV2Vi Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICB8ICAgMTQgKysrKysrKysrKysrKysKIFdlYkNv cmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAgfCAgIDEzICsrKysrKysrKysrKy0KIDIgZmlsZXMg Y2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQzNGNkMDEuLjk5OTNm MGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMDYtMDUgIEpvbmF0aG9uIEpvbmdzbWEgIDxqb25hdGhv bi5qb25nc21hQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXQVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5H RUQKKworICAgICAgICAqIHBhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RHJhZ0NvbnRyb2xsZXI6OnN0YXJ0RHJhZyk6IFdoZW4gYSBsaW5rIGlzIGRyYWdnZWQgd2l0 aG91dCBhbnkKKyAgICAgICAgdGV4dCBzZWxlY3RlZCAobm90ZTogZm9yIHRoaXMgdG8gd29yaywg dGhlIEVkaXRhYmxlTGlua0JlaGF2aW9yIHNldHRpbmcgbXVzdCBiZQorICAgICAgICBzZXQgdG8g J2xpdmUnIG9yICdkZWZhdWx0JykgYW5kIHRoZW4gZHJvcHBlZCBpbnRvIGFuIGVkaXRhYmxlIGh0 bWwgZG9jdW1lbnQgaXQKKyAgICAgICAgd2lsbCBldmVudHVhbGx5IHZpb2xhdGUgYW4gQVNTRVJU IGluIE1vdmVTZWxlY3Rpb25Db21tYW5kIHRoYXQgcmVxdWlyZXMgdGhhdCB0aGVyZQorICAgICAg ICBpcyBhIHNlbGVjdGlvbi4gIFRvIHByZXZlbnQgdGhpcywgZXhwYW5kIHRoZSBzZWxlY3Rpb24g dG8gdGhlIGVuY2xvc2luZyBhbmNob3IgdGFnCisgICAgICAgIHdoZW4gdGhlIGRyYWcgYmVnaW5z LgorCiAyMDA4LTA2LTIzICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBNYXJrIFJvd2UuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2Uv RHJhZ0NvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAppbmRl eCAzNGI2ZjAyLi5kM2E1ZTVmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xs ZXIuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKQEAgLTQ0LDYgKzQ0 LDcgQEAKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgog I2luY2x1ZGUgIkhUTUxBbmNob3JFbGVtZW50LmgiCisjaW5jbHVkZSAiaHRtbGVkaXRpbmcuaCIK ICNpbmNsdWRlICJIVE1MSW5wdXRFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAj aW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgpAQCAtNjQ5LDcgKzY1MCwxNyBAQCBib29sIERyYWdD b250cm9sbGVyOjpzdGFydERyYWcoRnJhbWUqIHNyYywgQ2xpcGJvYXJkKiBjbGlwYm9hcmQsIERy YWdPcGVyYXRpb24gcwogICAgICAgICAgICAgLy8gU2ltcGxpZnkgd2hpdGVzcGFjZSBzbyB0aGUg dGl0bGUgcHV0IG9uIHRoZSBjbGlwYm9hcmQgcmVzZW1ibGVzIHdoYXQgdGhlIHVzZXIgc2Vlcwog ICAgICAgICAgICAgLy8gb24gdGhlIHdlYiBwYWdlLiBUaGlzIGluY2x1ZGVzIHJlcGxhY2luZyBu ZXdsaW5lcyB3aXRoIHNwYWNlcy4KICAgICAgICAgICAgIGNsaXBib2FyZC0+d3JpdGVVUkwobGlu a1VSTCwgZHJhZ1NvdXJjZS50ZXh0Q29udGVudCgpLnNpbXBsaWZ5V2hpdGVTcGFjZSgpLCBzcmMp OwotICAgICAgICAKKworICAgICAgICBpZiAoc3JjLT5zZWxlY3Rpb24oKS0+aXNDYXJldCgpICYm IHNyYy0+c2VsZWN0aW9uKCktPmlzQ29udGVudEVkaXRhYmxlKCkpIHsKKyAgICAgICAgICAgIC8v IGEgdXNlciBjYW4gaW5pdGlhdGUgYSBkcmFnIG9uIGEgbGluayB3aXRob3V0IGhhdmluZyBhbnkg dGV4dAorICAgICAgICAgICAgLy8gc2VsZWN0ZWQuICBJbiB0aGlzIGNhc2UsIHdlIHNob3VsZCBl eHBhbmQgdGhlIHNlbGVjdGlvbiB0bworICAgICAgICAgICAgLy8gdGhlIGVuY2xvc2luZyBhbmNo b3IgZWxlbWVudAorICAgICAgICAgICAgUG9zaXRpb24gcG9zID0gc3JjLT5zZWxlY3Rpb24oKS0+ YmFzZSgpOworICAgICAgICAgICAgTm9kZSogbm9kZSA9IGVuY2xvc2luZ0FuY2hvckVsZW1lbnQo cG9zKTsKKyAgICAgICAgICAgIGlmIChub2RlKQorICAgICAgICAgICAgICAgIHNyYy0+c2VsZWN0 aW9uKCktPnNldFNlbGVjdGlvbihTZWxlY3Rpb246OnNlbGVjdGlvbkZyb21Db250ZW50c09mTm9k ZShub2RlKSk7CisgICAgICAgIH0KKwogICAgICAgICBtX2NsaWVudC0+d2lsbFBlcmZvcm1EcmFn U291cmNlQWN0aW9uKERyYWdTb3VyY2VBY3Rpb25MaW5rLCBkcmFnT3JpZ2luLCBjbGlwYm9hcmQp OwogICAgICAgICBpZiAoIWRyYWdJbWFnZSkgewogICAgICAgICAgICAgZHJhZ0ltYWdlID0gbV9j bGllbnQtPmNyZWF0ZURyYWdJbWFnZUZvckxpbmsobGlua1VSTCwgZHJhZ1NvdXJjZS50ZXh0Q29u dGVudCgpLCBzcmMpOwotLSAKMS41LjUKCg==