12278 2007-01-15 01:22:29 -0800 REGRESSION(r13070): Dragged image size includes padding 2007-01-17 15:09:30 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 RESOLVED FIXED data:text/html,<img src="http://webkit.org/images/icon-gold.png" style="padding:100px; border:1px solid black"> HasReduction, InRadar, Regression P1 Normal --- 1 dev+webkit darin hyatt oldest_to_newest 34859 0 dev+webkit 2007-01-15 01:22:29 -0800 Dragged images seem to have any padding on them included when calculating the size of the semi-transparent drag image. Load the testcase at the URL on this bug report then drag the image. The WebKit logo is at fullsize and should therefore stay the same when dragged, but instead has the 100px padding applied to it. 34749 1 dev+webkit 2007-01-15 19:08:12 -0800 The rect the drag image size is calculated from includes borders as well. 34745 2 darin 2007-01-15 23:28:20 -0800 The bug here is in -[WebElementDictionary _imageRect], which calls HitTestResult::boundingBox. There's been an attempt to generalize things too much. An image's rect is not the same thing as the absoluteBoundingBoxRect, which is what HitTestResult::boundingBox computes. To find the image's rect, we need to take the margin and border into account as RenderImage::paint does. I suggest we add a function to HitTestResult called imageRect and use that. 34746 3 hyatt 2007-01-15 23:42:00 -0800 Custom HTML drag images should use the border box though. I think _imageRect may be set for those too? http://developer.apple.com/documentation/AppleApplications/Conceptual/SafariJSProgTopics/Tasks/DragAndDrop.html Note that setDragImage can be called with either an image object or an element, although haven't we now unified the two? In this API, the borders/padding should be included. It's really just our "built-in" image dragging that should exclude them. In the future we may want to enhance the API to specify which box to use. 34729 4 12477 darin 2007-01-16 00:00:06 -0800 Created attachment 12477 patch with change log 34605 5 12477 hyatt 2007-01-16 13:00:39 -0800 Comment on attachment 12477 patch with change log Is this only used for built-in images and not for custom drag images? 34559 6 darin 2007-01-16 13:41:37 -0800 (In reply to comment #5) > Is this only used for built-in images and not for custom drag images? Yes, that's right. Ultimately we could rewrite this to work in a simpler way. For this patch, I just fixed the regression in WebKit API that caused the bug rather than trying to remove this code path and unify with other dragging down at the WebCore level. 34553 7 mrowe 2007-01-16 19:55:45 -0800 <rdar://problem/4928705> 34536 8 12477 mjs 2007-01-17 01:34:59 -0800 Comment on attachment 12477 patch with change log r=me 34409 9 darin 2007-01-17 15:09:30 -0800 Committed revision 18918. 12477 2007-01-16 00:00:06 -0800 2007-01-17 01:34:59 -0800 patch with change log ImageDragPatch.txt text/plain 10983 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxODg4MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMDctMDEtMTUgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjc4CisgICAgICAgICAg UkVHUkVTU0lPTihyMTMwNzApOiBEcmFnZ2VkIGltYWdlIHNpemUgaW5jbHVkZXMgcGFkZGluZwor CisgICAgICAgICogV2ViQ29yZS5leHA6IEFkZGVkIEhpdFRlc3RSZXN1bHQ6OmltYWdlUmVjdCwK KyAgICAgICAgcmVtb3ZlZCBIaXRUZXN0UmVzdWx0Ojpib3VuZGluZ0JveC4KKworICAgICAgICAq IHJlbmRlcmluZy9IaXRUZXN0UmVzdWx0Lmg6CisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RS ZXN1bHQuY3BwOiAoV2ViQ29yZTo6SGl0VGVzdFJlc3VsdDo6aW1hZ2VSZWN0KToKKyAgICAgICAg QWRkZWQuIFJldHVybnMgdGhlIGNvbnRlbnQgcmVjdGFuZ2xlIG9mIHRoZSBpbWFnZS4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6YWJzb2x1dGVQ b3NpdGlvbik6IE1hZGUgY29uc3QuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNv bnRlbnRCb3gpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6YWJzb2x1 dGVDb250ZW50Qm94KTogQWRkZWQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6OmFic29sdXRlUG9zaXRpb24pOiBNYWRlIGNvbnN0LgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJs ZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjphYnNvbHV0ZVBv c2l0aW9uKTogTWFkZSBjb25zdC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3Lmg6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVmlldzo6YWJzb2x1dGVQb3NpdGlvbik6IE1hZGUgY29uc3QuCisKIDIwMDctMDEtMTUg IEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5leHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9X ZWJDb3JlLmV4cAkocmV2aXNpb24gMTg4NzYpCisrKyBXZWJDb3JlL1dlYkNvcmUuZXhwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NjQsNyArNDY0LDYgQEAgX19aTks3V2ViQ29yZTEyRXZlbnRIYW5kbGVy MjBjdXJyZW50S2V5YgogX19aTks3V2ViQ29yZTEyUmVuZGVyT2JqZWN0MjViYWNrc2xhc2hBc0N1 cnJlbmN5U3ltYm9sRXYKIF9fWk5LN1dlYkNvcmUxM0hpdFRlc3RSZXN1bHQxMGlzTGl2ZUxpbmtF dgogX19aTks3V2ViQ29yZTEzSGl0VGVzdFJlc3VsdDEwaXNTZWxlY3RlZEV2Ci1fX1pOSzdXZWJD b3JlMTNIaXRUZXN0UmVzdWx0MTFib3VuZGluZ0JveEV2CiBfX1pOSzdXZWJDb3JlMTNIaXRUZXN0 UmVzdWx0MTF0YXJnZXRGcmFtZUV2CiBfX1pOSzdXZWJDb3JlMTNIaXRUZXN0UmVzdWx0MTF0ZXh0 Q29udGVudEV2CiBfX1pOSzdXZWJDb3JlMTNIaXRUZXN0UmVzdWx0MTVhYnNvbHV0ZUxpbmtVUkxF dgpAQCAtNDc1LDYgKzQ3NCw3IEBAIF9fWk5LN1dlYkNvcmUxM0hpdFRlc3RSZXN1bHQxN2lzQ29u dGVudEUKIF9fWk5LN1dlYkNvcmUxM0hpdFRlc3RSZXN1bHQxOHRpdGxlRGlzcGxheVN0cmluZ0V2 CiBfX1pOSzdXZWJDb3JlMTNIaXRUZXN0UmVzdWx0NWltYWdlRXYKIF9fWk5LN1dlYkNvcmUxM0hp dFRlc3RSZXN1bHQ1dGl0bGVFdgorX19aTks3V2ViQ29yZTEzSGl0VGVzdFJlc3VsdDlpbWFnZVJl Y3RFdgogX19aTks3V2ViQ29yZTEzUmVzb3VyY2VFcnJvcmN2UDdOU0Vycm9yRXYKIF9fWk5LN1dl YkNvcmUxNERvY3VtZW50TG9hZGVyMTBpc1N0b3BwaW5nRXYKIF9fWk5LN1dlYkNvcmUxNERvY3Vt ZW50TG9hZGVyMTFmcmFtZUxvYWRlckV2CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0 UmVzdWx0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0 LmNwcAkocmV2aXNpb24gMTg4NzYpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk5LDYgKzE5OSwxMyBAQCBJbWFnZSogSGl0VGVzdFJl c3VsdDo6aW1hZ2UoKSBjb25zdAogICAgIHJldHVybiAwOwogfQogCitJbnRSZWN0IEhpdFRlc3RS ZXN1bHQ6OmltYWdlUmVjdCgpIGNvbnN0Cit7CisgICAgaWYgKCFpbWFnZSgpKQorICAgICAgICBy ZXR1cm4gSW50UmVjdCgpOworICAgIHJldHVybiBtX2lubmVyTm9uU2hhcmVkTm9kZS0+cmVuZGVy ZXIoKS0+YWJzb2x1dGVDb250ZW50Qm94KCk7Cit9CisKIEtVUkwgSGl0VGVzdFJlc3VsdDo6YWJz b2x1dGVJbWFnZVVSTCgpIGNvbnN0CiB7CiAgICAgaWYgKCEobV9pbm5lck5vblNoYXJlZE5vZGUg JiYgbV9pbm5lck5vblNoYXJlZE5vZGUtPmRvY3VtZW50KCkpKQpJbmRleDogV2ViQ29yZS9yZW5k ZXJpbmcvSGl0VGVzdFJlc3VsdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL0hp dFRlc3RSZXN1bHQuaAkocmV2aXNpb24gMTg4NzYpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9IaXRU ZXN0UmVzdWx0LmgJKHdvcmtpbmcgY29weSkKQEAgLTY0LDYgKzY0LDcgQEAgcHVibGljOgogICAg IFN0cmluZyB0aXRsZSgpIGNvbnN0OwogICAgIFN0cmluZyBhbHREaXNwbGF5U3RyaW5nKCkgY29u c3Q7CiAgICAgSW1hZ2UqIGltYWdlKCkgY29uc3Q7CisgICAgSW50UmVjdCBpbWFnZVJlY3QoKSBj b25zdDsKICAgICBLVVJMIGFic29sdXRlSW1hZ2VVUkwoKSBjb25zdDsKICAgICBLVVJMIGFic29s dXRlTGlua1VSTCgpIGNvbnN0OwogICAgIFN0cmluZyB0aXRsZURpc3BsYXlTdHJpbmcoKSBjb25z dDsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkocmV2aXNpb24gMTg4NzYpCisrKyBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MzksNyArNzM5 LDcgQEAgaW50IFJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrV2lkdGgoKSBjbwogICAgICAgICBy ZXR1cm4gY2ItPmF2YWlsYWJsZVdpZHRoKCk7CiB9CiAKLWJvb2wgUmVuZGVyQm94OjphYnNvbHV0 ZVBvc2l0aW9uKGludCAmeFBvcywgaW50ICZ5UG9zLCBib29sIGYpCitib29sIFJlbmRlckJveDo6 YWJzb2x1dGVQb3NpdGlvbihpbnQgJnhQb3MsIGludCAmeVBvcywgYm9vbCBmKSBjb25zdAogewog ICAgIGlmIChzdHlsZSgpLT5wb3NpdGlvbigpID09IEZpeGVkUG9zaXRpb24pCiAgICAgICAgIGYg PSB0cnVlOwpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHJldmlzaW9uIDE4ODc2KQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDcgKzUwLDcg QEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IG92ZXJyaWRlSGVpZ2h0KCkgY29uc3Q7CiAgICAg dmlydHVhbCB2b2lkIHNldE92ZXJyaWRlU2l6ZShpbnQgcykgeyBtX292ZXJyaWRlU2l6ZSA9IHM7 IH0KICAgICAKLSAgICB2aXJ0dWFsIGJvb2wgYWJzb2x1dGVQb3NpdGlvbihpbnQgJnhQb3MsIGlu dCAmeVBvcywgYm9vbCBmID0gZmFsc2UpOworICAgIHZpcnR1YWwgYm9vbCBhYnNvbHV0ZVBvc2l0 aW9uKGludCYgeCwgaW50JiB5LCBib29sIGZpeGVkID0gZmFsc2UpIGNvbnN0OwogCiAgICAgdmly dHVhbCB2b2lkIHNldFBvcyhpbnQgeCwgaW50IHkpOwogCkluZGV4OiBXZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHAJKHJldmlzaW9uIDE4ODc2KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy T2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjY4LDcgKzY2OCw2IEBAIGludCBSZW5kZXJP YmplY3Q6Omhvcml6b250YWxTY3JvbGxiYXJIZWkKIGludCBSZW5kZXJPYmplY3Q6OmNsaWVudFdp ZHRoKCkgY29uc3QKIHsKICAgICByZXR1cm4gd2lkdGgoKSAtIGJvcmRlckxlZnQoKSAtIGJvcmRl clJpZ2h0KCkgLSB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoKCk7Ci0gICAgICAgIAogfQogCiBpbnQg UmVuZGVyT2JqZWN0OjpjbGllbnRIZWlnaHQoKSBjb25zdApAQCAtMjM2OSw3ICsyMzY4LDcgQEAg SW50UmVjdCBSZW5kZXJPYmplY3Q6OnZpZXdSZWN0KCkgY29uc3QKICAgICByZXR1cm4gdmlldygp LT52aWV3UmVjdCgpOwogfQogCi1ib29sIFJlbmRlck9iamVjdDo6YWJzb2x1dGVQb3NpdGlvbihp bnQmIHhQb3MsIGludCYgeVBvcywgYm9vbCBmKQorYm9vbCBSZW5kZXJPYmplY3Q6OmFic29sdXRl UG9zaXRpb24oaW50JiB4UG9zLCBpbnQmIHlQb3MsIGJvb2wgZikgY29uc3QKIHsKICAgICBSZW5k ZXJPYmplY3QqIG8gPSBwYXJlbnQoKTsKICAgICBpZiAobykgewpAQCAtMzA5MSw2ICszMDkwLDIx IEBAIGludCBSZW5kZXJPYmplY3Q6Om1heEJvdHRvbU1hcmdpbihib29sIHAKICAgICByZXR1cm4g cG9zaXRpdmUgPyBtYXgoMCwgbWFyZ2luQm90dG9tKCkpIDogLW1pbigwLCBtYXJnaW5Cb3R0b20o KSk7CiB9CiAKK0ludFJlY3QgUmVuZGVyT2JqZWN0Ojpjb250ZW50Qm94KCkgY29uc3QKK3sKKyAg ICByZXR1cm4gSW50UmVjdChib3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpLCBib3JkZXJUb3Ao KSArIHBhZGRpbmdUb3AoKSwKKyAgICAgICAgY29udGVudFdpZHRoKCksIGNvbnRlbnRIZWlnaHQo KSk7Cit9CisKK0ludFJlY3QgUmVuZGVyT2JqZWN0OjphYnNvbHV0ZUNvbnRlbnRCb3goKSBjb25z dAoreworICAgIEludFJlY3QgcmVjdCA9IGNvbnRlbnRCb3goKTsKKyAgICBpbnQgeCwgeTsKKyAg ICBhYnNvbHV0ZVBvc2l0aW9uRm9yQ29udGVudCh4LCB5KTsKKyAgICByZWN0Lm1vdmUoeCwgeSk7 CisgICAgcmV0dXJuIHJlY3Q7Cit9CisKICNpZmRlZiBTVkdfU1VQUE9SVAogCiBGbG9hdFJlY3Qg UmVuZGVyT2JqZWN0OjpyZWxhdGl2ZUJCb3goYm9vbCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5oCShyZXZpc2lvbiAxODg3NikKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NTMsNyArNTUzLDkgQEAgcHVibGljOgogICAg IC8vIHJldHVybiBqdXN0IHRoZSBoZWlnaHQgb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2sKICAgICB2 aXJ0dWFsIGludCBjb250YWluaW5nQmxvY2tIZWlnaHQoKSBjb25zdDsKIAotICAgIC8vIHNpemUg b2YgdGhlIGNvbnRlbnQgYXJlYSAoYm94IHNpemUgbWludXMgcGFkZGluZy9ib3JkZXIpCisgICAg Ly8gY29udGVudCBhcmVhIChib3ggbWludXMgcGFkZGluZy9ib3JkZXIpCisgICAgSW50UmVjdCBj b250ZW50Qm94KCkgY29uc3Q7CisgICAgSW50UmVjdCBhYnNvbHV0ZUNvbnRlbnRCb3goKSBjb25z dDsKICAgICBpbnQgY29udGVudFdpZHRoKCkgY29uc3QgeyByZXR1cm4gY2xpZW50V2lkdGgoKSAt IHBhZGRpbmdMZWZ0KCkgLSBwYWRkaW5nUmlnaHQoKTsgfQogICAgIGludCBjb250ZW50SGVpZ2h0 KCkgY29uc3QgeyByZXR1cm4gY2xpZW50SGVpZ2h0KCkgLSBwYWRkaW5nVG9wKCkgLSBwYWRkaW5n Qm90dG9tKCk7IH0KIApAQCAtNTc2LDEyICs1NzgsMTIgQEAgcHVibGljOgogICAgIHZpcnR1YWwg aW50IHlQb3MoKSBjb25zdCB7IHJldHVybiAwOyB9CiAKICAgICAvLyBjYWxjdWxhdGUgY2xpZW50 IHBvc2l0aW9uIG9mIGJveAotICAgIHZpcnR1YWwgYm9vbCBhYnNvbHV0ZVBvc2l0aW9uKGludCYg Lyp4UG9zKi8sIGludCYgLyp5UG9zKi8sIGJvb2wgLypmaXhlZCovID0gZmFsc2UpOworICAgIHZp cnR1YWwgYm9vbCBhYnNvbHV0ZVBvc2l0aW9uKGludCYgeCwgaW50JiB5LCBib29sIGZpeGVkID0g ZmFsc2UpIGNvbnN0OwogCiAgICAgLy8gVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIGRlYWwgd2l0 aCB0aGUgZXh0cmEgdG9wIHNwYWNlIHRoYXQgY2FuIG9jY3VyIGluIHRhYmxlIGNlbGxzIChjYWxs ZWQgYm9yZGVyVG9wRXh0cmEpLgogICAgIC8vIFRoZSBjaGlsZHJlbiBvZiB0aGUgY2VsbCBkbyBu b3QgZmFjdG9yIHRoaXMgc3BhY2UgaW4sIHNvIHdlIGhhdmUgdG8gYWRkIGl0IGluLiAgQW55IGNv ZGUgdGhhdCB3YW50cyB0bwogICAgIC8vIGFjY3VyYXRlbHkgZGVhbCB3aXRoIHRoZSBjb250ZW50 cyBvZiBhIGNlbGwgbXVzdCBjYWxsIHRoaXMgZnVuY3Rpb24gaW5zdGFkIG9mIGFic29sdXRlUG9z aXRpb24uCi0gICAgdm9pZCBhYnNvbHV0ZVBvc2l0aW9uRm9yQ29udGVudChpbnQmIHhQb3MsIGlu dCYgeVBvcywgYm9vbCBmaXhlZCA9IGZhbHNlKQorICAgIHZvaWQgYWJzb2x1dGVQb3NpdGlvbkZv ckNvbnRlbnQoaW50JiB4UG9zLCBpbnQmIHlQb3MsIGJvb2wgZml4ZWQgPSBmYWxzZSkgY29uc3QK ICAgICB7CiAgICAgICAgIGFic29sdXRlUG9zaXRpb24oeFBvcywgeVBvcywgZml4ZWQpOwogICAg ICAgICB5UG9zICs9IGJvcmRlclRvcEV4dHJhKCk7CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUYWJsZUNlbGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRhYmxlQ2VsbC5jcHAJKHJldmlzaW9uIDE4ODc2KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGFibGVDZWxsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkwLDcgKzE5MCw3IEBAIHZvaWQg UmVuZGVyVGFibGVDZWxsOjpjb21wdXRlQWJzb2x1dGVSZXAKICAgICBSZW5kZXJCbG9jazo6Y29t cHV0ZUFic29sdXRlUmVwYWludFJlY3QociwgZml4ZWQpOwogfQogCi1ib29sIFJlbmRlclRhYmxl Q2VsbDo6YWJzb2x1dGVQb3NpdGlvbihpbnQmIHhQb3MsIGludCYgeVBvcywgYm9vbCBmaXhlZCkK K2Jvb2wgUmVuZGVyVGFibGVDZWxsOjphYnNvbHV0ZVBvc2l0aW9uKGludCYgeFBvcywgaW50JiB5 UG9zLCBib29sIGZpeGVkKSBjb25zdAogewogICAgIGJvb2wgcmVzdWx0ID0gUmVuZGVyQmxvY2s6 OmFic29sdXRlUG9zaXRpb24oeFBvcywgeVBvcywgZml4ZWQpOwogICAgIHhQb3MgLT0gcGFyZW50 KCktPnhQb3MoKTsgLy8gUm93cyBhcmUgaW4gdGhlIHNhbWUgY29vcmRpbmF0ZSBzcGFjZSwgc28g ZG9uJ3QgYWRkIHRoZWlyIG9mZnNldCBpbi4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRhYmxlQ2VsbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl Q2VsbC5oCShyZXZpc2lvbiAxODg3NikKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl Q2VsbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNyArMTAyLDcgQEAgcHVibGljOgogCiAgICAg dmlydHVhbCBJbnRSZWN0IGdldEFic29sdXRlUmVwYWludFJlY3QoKTsKICAgICB2aXJ0dWFsIHZv aWQgY29tcHV0ZUFic29sdXRlUmVwYWludFJlY3QoSW50UmVjdCYsIGJvb2wgZml4ZWQgPSBmYWxz ZSk7Ci0gICAgdmlydHVhbCBib29sIGFic29sdXRlUG9zaXRpb24oaW50JiB4UG9zLCBpbnQmIHlQ b3MsIGJvb2wgZml4ZWQgPSBmYWxzZSk7CisgICAgdmlydHVhbCBib29sIGFic29sdXRlUG9zaXRp b24oaW50JiB4LCBpbnQmIHksIGJvb2wgZml4ZWQgPSBmYWxzZSkgY29uc3Q7CiAKICAgICB2aXJ0 dWFsIHNob3J0IGJhc2VsaW5lUG9zaXRpb24oYm9vbCBmaXJzdExpbmUgPSBmYWxzZSwgYm9vbCBp c1Jvb3RMaW5lQm94ID0gZmFsc2UpIGNvbnN0OwogCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3 LmNwcAkocmV2aXNpb24gMTg4NzYpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTI3LDcgKzEyNyw3IEBAIHZvaWQgUmVuZGVyVmlldzo6bGF5 b3V0KCkKICAgICBzZXROZWVkc0xheW91dChmYWxzZSk7CiB9CiAKLWJvb2wgUmVuZGVyVmlldzo6 YWJzb2x1dGVQb3NpdGlvbihpbnQmIHhQb3MsIGludCYgeVBvcywgYm9vbCBmaXhlZCkKK2Jvb2wg UmVuZGVyVmlldzo6YWJzb2x1dGVQb3NpdGlvbihpbnQmIHhQb3MsIGludCYgeVBvcywgYm9vbCBm aXhlZCkgY29uc3QKIHsKICAgICBpZiAoZml4ZWQgJiYgbV9mcmFtZVZpZXcpIHsKICAgICAgICAg eFBvcyA9IG1fZnJhbWVWaWV3LT5jb250ZW50c1goKTsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3 LmgJKHJldmlzaW9uIDE4ODc2KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCSh3 b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg Y2FsY1dpZHRoKCk7CiAgICAgdmlydHVhbCB2b2lkIGNhbGNIZWlnaHQoKTsKICAgICB2aXJ0dWFs IHZvaWQgY2FsY01pbk1heFdpZHRoKCk7Ci0gICAgdmlydHVhbCBib29sIGFic29sdXRlUG9zaXRp b24oaW50JiB4UG9zLCBpbnQmIHlQb3MsIGJvb2wgZml4ZWQgPSBmYWxzZSk7CisgICAgdmlydHVh bCBib29sIGFic29sdXRlUG9zaXRpb24oaW50JiB4UG9zLCBpbnQmIHlQb3MsIGJvb2wgZml4ZWQg PSBmYWxzZSkgY29uc3Q7CiAKICAgICBpbnQgZG9jSGVpZ2h0KCkgY29uc3Q7CiAgICAgaW50IGRv Y1dpZHRoKCkgY29uc3Q7CkluZGV4OiBXZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODgxKQorKysgV2ViS2l0L0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDA3LTAxLTE1ICBEYXJpbiBBZGxlciAgPGRh cmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAtIGZpeCBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI3 OAorICAgICAgICAgIFJFR1JFU1NJT04ocjEzMDcwKTogRHJhZ2dlZCBpbWFnZSBzaXplIGluY2x1 ZGVzIHBhZGRpbmcKKworICAgICAgICAqIE1pc2MvV2ViRWxlbWVudERpY3Rpb25hcnkubW06ICgt W1dlYkVsZW1lbnREaWN0aW9uYXJ5IF9pbWFnZVJlY3RdKToKKyAgICAgICAgQ2FsbCBIaXRUZXN0 UmVzdWx0OjppbWFnZVJlY3QsIG5vdCBIaXRUZXN0UmVzdWx0Ojpib3VuZGluZ0JveC4KKwogMjAw Ny0wMS0xNSAgSnVzdGluIEdhcmNpYSAgPGp1c3Rpbi5nYXJjaWFAYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IG1qcwpJbmRleDogV2ViS2l0L01pc2MvV2ViRWxlbWVudERpY3Rpb25h cnkubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L01pc2MvV2ViRWxlbWVudERpY3Rpb25hcnkubW0J KHJldmlzaW9uIDE4ODc2KQorKysgV2ViS2l0L01pc2MvV2ViRWxlbWVudERpY3Rpb25hcnkubW0J KHdvcmtpbmcgY29weSkKQEAgLTE4OSw5ICsxODksOCBAQCBzdGF0aWMgTlNTdHJpbmcqIE5TU3Ry aW5nT3JOaWwoU3RyaW5nIGNvCiAKIC0gKE5TVmFsdWUgKilfaW1hZ2VSZWN0CiB7Ci0gICAgaWYg KFtzZWxmIG9iamVjdEZvcktleTpXZWJFbGVtZW50SW1hZ2VVUkxLZXldKQotICAgICAgICByZXR1 cm4gW05TVmFsdWUgdmFsdWVXaXRoUmVjdDpfcmVzdWx0LT5ib3VuZGluZ0JveCgpXTsKLSAgICBy ZXR1cm4gbmlsOworICAgIEludFJlY3QgcmVjdCA9IF9yZXN1bHQtPmltYWdlUmVjdCgpOworICAg IHJldHVybiByZWN0LmlzRW1wdHkoKSA/IG5pbCA6IFtOU1ZhbHVlIHZhbHVlV2l0aFJlY3Q6cmVj dF07CiB9CiAKIC0gKE5TVVJMICopX2Fic29sdXRlSW1hZ2VVUkwK