63004 2011-06-20 12:07:20 -0700 [Qt] Regression(60942) wrong default action for drag-and-drop. 2011-06-21 12:18:30 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 yael webkit-unassigned hausmann igor.oliveira kling webkit.review.bot oldest_to_newest 423840 0 yael 2011-06-20 12:07:20 -0700 The fix introduced in r60942 is not correct, it causes QtWebKit to ignore the drop action when the proposed drag operation is not defined. The real issues were 1. QDrag does not have an equivalent to DragOperationEvery. 2. We were not calling setDropAction() on the dropEvent. A patch is coming soon. 423844 1 97836 yael 2011-06-20 12:16:36 -0700 Created attachment 97836 Patch. Added special handling for the case that dragOperation is not initialized. Save the last dropOperation and pass it to the dropEvent, so that it can be accepted by QDrag. Call event->accepted() and not event->acceptProposedAction(), because the later ignores the dropAction specified in JavaScript. Tested with the test page attached to https://bugs.webkit.org/show_bug.cgi?id=40401 and did not see any issue. Also manually tested all combinations of LayoutTests/fast/events/drag-and-drop.html and they all pass. 423889 2 igor.oliveira 2011-06-20 13:07:02 -0700 It would be great to have a LayoutTest specially because you said in ChangeLog: "Call event->accepted() and not event->acceptProposedAction(), because the later ignores the dropAction specified in JavaScript." This behavior should be testable in LayoutTests. (In reply to comment #1) > Created an attachment (id=97836) [details] > Patch. > > Added special handling for the case that dragOperation is not initialized. > Save the last dropOperation and pass it to the dropEvent, so that it can be accepted by QDrag. > Call event->accepted() and not event->acceptProposedAction(), because the later ignores the dropAction specified in JavaScript. > > Tested with the test page attached to https://bugs.webkit.org/show_bug.cgi?id=40401 and did not see any issue. > Also manually tested all combinations of LayoutTests/fast/events/drag-and-drop.html and they all pass. 423937 3 yael 2011-06-20 14:13:38 -0700 (In reply to comment #2) > It would be great to have a LayoutTest specially because you said in ChangeLog: > "Call event->accepted() and not event->acceptProposedAction(), because the later ignores the dropAction specified in JavaScript." > This behavior should be testable in LayoutTests. > (In reply to comment #1) > > Created an attachment (id=97836) [details] [details] > > Patch. > > > > Added special handling for the case that dragOperation is not initialized. > > Save the last dropOperation and pass it to the dropEvent, so that it can be accepted by QDrag. > > Call event->accepted() and not event->acceptProposedAction(), because the later ignores the dropAction specified in JavaScript. > > > > Tested with the test page attached to https://bugs.webkit.org/show_bug.cgi?id=40401 and did not see any issue. > > Also manually tested all combinations of LayoutTests/fast/events/drag-and-drop.html and they all pass. Yes, it would have been great to have a layout test. Please see https://bugs.webkit.org/show_bug.cgi?id=31332#c7 why I do not have one. 423938 4 yael 2011-06-20 14:15:20 -0700 Please note that without my patch, running the test LayoutTests/fast/events/drag-and-drop.html will fail, so the issue is not about adding more tests, but about figuring out how to hook up DRT with QDrag. 424205 5 97915 yael 2011-06-20 20:06:03 -0700 Created attachment 97915 Patch. Scale back on the code changes. All the tests still pass as before. 424551 6 97915 kling 2011-06-21 10:46:42 -0700 Comment on attachment 97915 Patch. Huh. Looks like QWebPagePrivate::m_lastDropAction was unused before this change. Will dragMoveEvent() always be called before dropEvent()? If not, we'll be setting the drop action to an uninitialized value. 424577 7 yael 2011-06-21 11:11:55 -0700 (In reply to comment #6) > (From update of attachment 97915 [details]) > Huh. Looks like QWebPagePrivate::m_lastDropAction was unused before this change. > Will dragMoveEvent() always be called before dropEvent()? If not, we'll be setting the drop action to an uninitialized value. QDrag always sends a dragEvent when it starts, but for sake of clarity I will add the initialization. 424587 8 98015 yael 2011-06-21 11:21:12 -0700 Created attachment 98015 Patch. Address Kling's comment. 424589 9 98015 kling 2011-06-21 11:24:00 -0700 Comment on attachment 98015 Patch. LGTM 424655 10 98015 webkit.review.bot 2011-06-21 12:18:25 -0700 Comment on attachment 98015 Patch. Clearing flags on attachment: 98015 Committed r89369: <http://trac.webkit.org/changeset/89369> 424656 11 webkit.review.bot 2011-06-21 12:18:30 -0700 All reviewed patches have been landed. Closing bug. 97836 2011-06-20 12:16:36 -0700 2011-06-20 20:06:03 -0700 Patch. 63004.patch text/plain 4316 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4OTI2NykKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDYtMjAgIFlh ZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUmVncmVzc2lvbig2MDk0Mikgd3Jvbmcg ZGVmYXVsdCBhY3Rpb24gZm9yIGRyYWctYW5kLWRyb3AuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzAwNAorCisgICAgICAgIEFkZGVkIHNwZWNpYWwg aGFuZGxpbmcgZm9yIHRoZSBjYXNlIHRoYXQgZHJhZ09wZXJhdGlvbiBpcyBub3QgaW5pdGlhbGl6 ZWQuCisgICAgICAgIFNhdmUgdGhlIGxhc3QgZHJvcE9wZXJhdGlvbiBhbmQgcGFzcyBpdCB0byB0 aGUgZHJvcEV2ZW50LCBzbyB0aGF0IGl0IGNhbiAKKyAgICAgICAgYmUgYWNjZXB0ZWQgYnkgUURy YWcuCisgICAgICAgIENhbGwgZXZlbnQtPmFjY2VwdGVkKCkgYW5kIG5vdCBldmVudC0+YWNjZXB0 UHJvcG9zZWRBY3Rpb24oKSwgYmVjYXVzZSB0aGUKKyAgICAgICAgbGF0ZXIgaWdub3JlcyB0aGUg ZHJvcEFjdGlvbiBzcGVjaWZpZWQgaW4gSmF2YVNjcmlwdC4KKworICAgICAgICBUZXN0ZWQgd2l0 aCB0aGUgdGVzdCBwYWdlIGF0dGFjaGVkIHRvIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00MDQwMQorICAgICAgICBhbmQgZGlkIG5vdCBzZWUgYW55IGlzc3VlLgorICAg ICAgICBBbHNvIG1hbnVhbGx5IHRlc3RlZCBhbGwgY29tYmluYXRpb25zIG9mIExheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL2RyYWctYW5kLWRyb3AuaHRtbAorICAgICAgICBhbmQgdGhleSBhbGwgcGFz cy4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChkcm9wQWN0aW9uVG9E cmFnT3ApOgorICAgICAgICAoZHJhZ09wVG9Ecm9wQWN0aW9uKToKKyAgICAgICAgKFFXZWJQYWdl UHJpdmF0ZTo6ZHJhZ01vdmVFdmVudCk6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OmRyb3BF dmVudCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHJhZ0NsaWVudFF0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmRyYWdPcGVyYXRpb25zVG9Ecm9wQWN0aW9ucyk6CisgICAgICAgIChXZWJD b3JlOjpkcm9wQWN0aW9uVG9EcmFnT3BlcmF0aW9uKToKKwogMjAxMS0wNi0yMCAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5 IFNlbWlraGF0c2t5LgpJbmRleDogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24g ODkyNjQpCisrKyBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI2MCw2ICsyNjAsOSBAQCBjb25zdCBjaGFyKiBRV2ViUGFnZVByaXZhdGU6OmVkaXRv ckNvbW1hCiAKIHN0YXRpYyBpbmxpbmUgRHJhZ09wZXJhdGlvbiBkcm9wQWN0aW9uVG9EcmFnT3Ao UXQ6OkRyb3BBY3Rpb25zIGFjdGlvbnMpCiB7CisgICAgaWYgKGFjdGlvbnMgPT0gUXQ6OkFjdGlv bk1hc2spCisgICAgICAgIHJldHVybiBEcmFnT3BlcmF0aW9uRXZlcnk7CisKICAgICB1bnNpZ25l ZCByZXN1bHQgPSAwOwogICAgIGlmIChhY3Rpb25zICYgUXQ6OkNvcHlBY3Rpb24pCiAgICAgICAg IHJlc3VsdCB8PSBEcmFnT3BlcmF0aW9uQ29weTsKQEAgLTI3NCw2ICsyNzcsOSBAQCBzdGF0aWMg aW5saW5lIERyYWdPcGVyYXRpb24gZHJvcEFjdGlvblRvCiAKIHN0YXRpYyBpbmxpbmUgUXQ6OkRy b3BBY3Rpb24gZHJhZ09wVG9Ecm9wQWN0aW9uKHVuc2lnbmVkIGFjdGlvbnMpCiB7CisgICAgaWYg KGFjdGlvbnMgPT0gRHJhZ09wZXJhdGlvbkV2ZXJ5KQorICAgICAgICByZXR1cm4gUXQ6OkFjdGlv bk1hc2s7CisKICAgICBRdDo6RHJvcEFjdGlvbiByZXN1bHQgPSBRdDo6SWdub3JlQWN0aW9uOwog ICAgIGlmIChhY3Rpb25zICYgRHJhZ09wZXJhdGlvbkNvcHkpCiAgICAgICAgIHJlc3VsdCA9IFF0 OjpDb3B5QWN0aW9uOwpAQCAtMTAxNSwxMCArMTAyMSwxMCBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0 ZTo6ZHJhZ01vdmVFdmVudChUICplCiAjaWZuZGVmIFFUX05PX0RSQUdBTkREUk9QCiAgICAgRHJh Z0RhdGEgZHJhZ0RhdGEoZXYtPm1pbWVEYXRhKCksIFFQb2ludEYoZXYtPnBvcygpKS50b1BvaW50 KCksCiAgICAgICAgICAgICBRQ3Vyc29yOjpwb3MoKSwgZHJvcEFjdGlvblRvRHJhZ09wKGV2LT5w b3NzaWJsZUFjdGlvbnMoKSkpOwotICAgIFF0OjpEcm9wQWN0aW9uIGFjdGlvbiA9IGRyYWdPcFRv RHJvcEFjdGlvbihwYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnVXBkYXRlZCgmZHJhZ0RhdGEp KTsKLSAgICBldi0+c2V0RHJvcEFjdGlvbihhY3Rpb24pOwotICAgIGlmIChhY3Rpb24gIT0gUXQ6 Oklnbm9yZUFjdGlvbikKLSAgICAgICAgZXYtPmFjY2VwdFByb3Bvc2VkQWN0aW9uKCk7CisgICAg bV9sYXN0RHJvcEFjdGlvbiA9IGRyYWdPcFRvRHJvcEFjdGlvbihwYWdlLT5kcmFnQ29udHJvbGxl cigpLT5kcmFnVXBkYXRlZCgmZHJhZ0RhdGEpKTsKKyAgICBldi0+c2V0RHJvcEFjdGlvbihtX2xh c3REcm9wQWN0aW9uKTsKKyAgICBpZiAobV9sYXN0RHJvcEFjdGlvbiAhPSBRdDo6SWdub3JlQWN0 aW9uKQorICAgICAgICBldi0+YWNjZXB0KCk7CiAjZW5kaWYKIH0KIApAQCAtMTAyOCw4ICsxMDM0 LDEwIEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkcm9wRXZlbnQoVCAqZXYpCiAjaWZuZGVmIFFU X05PX0RSQUdBTkREUk9QCiAgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZXYtPm1pbWVEYXRhKCksIFFQ b2ludEYoZXYtPnBvcygpKS50b1BvaW50KCksCiAgICAgICAgICAgICBRQ3Vyc29yOjpwb3MoKSwg ZHJvcEFjdGlvblRvRHJhZ09wKGV2LT5wb3NzaWJsZUFjdGlvbnMoKSkpOwotICAgIGlmIChwYWdl LT5kcmFnQ29udHJvbGxlcigpLT5wZXJmb3JtRHJhZygmZHJhZ0RhdGEpKQotICAgICAgICBldi0+ YWNjZXB0UHJvcG9zZWRBY3Rpb24oKTsKKyAgICBpZiAocGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ cGVyZm9ybURyYWcoJmRyYWdEYXRhKSkgeworICAgICAgICBldi0+c2V0RHJvcEFjdGlvbihtX2xh c3REcm9wQWN0aW9uKTsKKyAgICAgICAgZXYtPmFjY2VwdCgpOworICAgIH0KICNlbmRpZgogfQog CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRRdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EcmFnQ2xpZW50 UXQuY3BwCShyZXZpc2lvbiA4OTI2NCkKKysrIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBv cnQvRHJhZ0NsaWVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksOSBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBpbmxpbmUgUXQ6OkRyb3BBY3Rpb25zIGRyYWdPcGVy YXRpb25zVG9Ecm9wQWN0aW9ucyh1bnNpZ25lZCBvcCkKIHsKKyAgICBpZiAob3AgPT0gRHJhZ09w ZXJhdGlvbkV2ZXJ5KQorICAgICAgICByZXR1cm4gUXQ6OkFjdGlvbk1hc2s7CisKICAgICBRdDo6 RHJvcEFjdGlvbnMgcmVzdWx0ID0gUXQ6Oklnbm9yZUFjdGlvbjsKICAgICBpZiAob3AgJiBEcmFn T3BlcmF0aW9uQ29weSkKICAgICAgICAgcmVzdWx0ID0gUXQ6OkNvcHlBY3Rpb247CkBAIC01Myw2 ICs1Niw5IEBAIHN0YXRpYyBpbmxpbmUgUXQ6OkRyb3BBY3Rpb25zIGRyYWdPcGVyYXQKIAogc3Rh dGljIGlubGluZSBEcmFnT3BlcmF0aW9uIGRyb3BBY3Rpb25Ub0RyYWdPcGVyYXRpb24oUXQ6OkRy b3BBY3Rpb25zIGFjdGlvbikKIHsKKyAgICBpZiAoYWN0aW9uID09IFF0OjpBY3Rpb25NYXNrKQor ICAgICAgICByZXR1cm4gRHJhZ09wZXJhdGlvbkV2ZXJ5OworCiAgICAgRHJhZ09wZXJhdGlvbiBy ZXN1bHQgPSBEcmFnT3BlcmF0aW9uTm9uZTsKICAgICBpZiAoYWN0aW9uICYgUXQ6OkNvcHlBY3Rp b24pCiAgICAgICAgIHJlc3VsdCA9IERyYWdPcGVyYXRpb25Db3B5Owo= 97915 2011-06-20 20:06:03 -0700 2011-06-21 11:21:12 -0700 Patch. 63004.patch text/plain 2990 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4OTMzMikKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDYtMjAgIFlh ZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUmVncmVzc2lvbig2MDk0Mikgd3Jvbmcg ZGVmYXVsdCBhY3Rpb24gZm9yIGRyYWctYW5kLWRyb3AuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzAwNAorCisgICAgICAgIEFkZGVkIHNwZWNpYWwg aGFuZGxpbmcgZm9yIHRoZSBjYXNlIHRoYXQgZHJhZ09wZXJhdGlvbiBpcyBub3QgaW5pdGlhbGl6 ZWQuCisgICAgICAgIFNhdmUgdGhlIGxhc3QgZHJvcE9wZXJhdGlvbiBhbmQgcGFzcyBpdCB0byB0 aGUgZHJvcEV2ZW50LCBzbyB0aGF0IGl0IGNhbiAKKyAgICAgICAgYmUgYWNjZXB0ZWQgYnkgUURy YWcuCisgICAgICAgIENhbGwgZXZlbnQtPmFjY2VwdGVkKCkgYW5kIG5vdCBldmVudC0+YWNjZXB0 UHJvcG9zZWRBY3Rpb24oKSwgYmVjYXVzZSB0aGUKKyAgICAgICAgbGF0ZXIgaWdub3JlcyB0aGUg ZHJvcEFjdGlvbiBzcGVjaWZpZWQgaW4gSmF2YVNjcmlwdC4KKworICAgICAgICBUZXN0ZWQgd2l0 aCB0aGUgdGVzdCBwYWdlIGF0dGFjaGVkIHRvIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00MDQwMQorICAgICAgICBhbmQgZGlkIG5vdCBzZWUgYW55IGlzc3VlLgorICAg ICAgICBBbHNvIG1hbnVhbGx5IHRlc3RlZCBhbGwgY29tYmluYXRpb25zIG9mIExheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL2RyYWctYW5kLWRyb3AuaHRtbAorICAgICAgICBhbmQgdGhleSBhbGwgcGFz cy4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChkcm9wQWN0aW9uVG9E cmFnT3ApOgorICAgICAgICAoUVdlYlBhZ2VQcml2YXRlOjpkcmFnTW92ZUV2ZW50KToKKyAgICAg ICAgKFFXZWJQYWdlUHJpdmF0ZTo6ZHJvcEV2ZW50KToKKwogMjAxMS0wNi0yMCAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5 IFNlbWlraGF0c2t5LgpJbmRleDogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24g ODkyNjQpCisrKyBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI2OSw2ICsyNjksOCBAQCBzdGF0aWMgaW5saW5lIERyYWdPcGVyYXRpb24gZHJvcEFj dGlvblRvCiAgICAgICAgIHJlc3VsdCB8PSAoRHJhZ09wZXJhdGlvbk1vdmUgfCBEcmFnT3BlcmF0 aW9uR2VuZXJpYyk7CiAgICAgaWYgKGFjdGlvbnMgJiBRdDo6TGlua0FjdGlvbikKICAgICAgICAg cmVzdWx0IHw9IERyYWdPcGVyYXRpb25MaW5rOworICAgIGlmIChyZXN1bHQgPT0gKERyYWdPcGVy YXRpb25Db3B5IHwgRHJhZ09wZXJhdGlvbk1vdmUgfCBEcmFnT3BlcmF0aW9uR2VuZXJpYyB8IERy YWdPcGVyYXRpb25MaW5rKSkKKyAgICAgICAgcmVzdWx0ID0gRHJhZ09wZXJhdGlvbkV2ZXJ5Owog ICAgIHJldHVybiAoRHJhZ09wZXJhdGlvbilyZXN1bHQ7CiB9CiAKQEAgLTEwMTUsMTAgKzEwMTcs MTAgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmRyYWdNb3ZlRXZlbnQoVCAqZQogI2lmbmRlZiBR VF9OT19EUkFHQU5ERFJPUAogICAgIERyYWdEYXRhIGRyYWdEYXRhKGV2LT5taW1lRGF0YSgpLCBR UG9pbnRGKGV2LT5wb3MoKSkudG9Qb2ludCgpLAogICAgICAgICAgICAgUUN1cnNvcjo6cG9zKCks IGRyb3BBY3Rpb25Ub0RyYWdPcChldi0+cG9zc2libGVBY3Rpb25zKCkpKTsKLSAgICBRdDo6RHJv cEFjdGlvbiBhY3Rpb24gPSBkcmFnT3BUb0Ryb3BBY3Rpb24ocGFnZS0+ZHJhZ0NvbnRyb2xsZXIo KS0+ZHJhZ1VwZGF0ZWQoJmRyYWdEYXRhKSk7Ci0gICAgZXYtPnNldERyb3BBY3Rpb24oYWN0aW9u KTsKLSAgICBpZiAoYWN0aW9uICE9IFF0OjpJZ25vcmVBY3Rpb24pCi0gICAgICAgIGV2LT5hY2Nl cHRQcm9wb3NlZEFjdGlvbigpOworICAgIG1fbGFzdERyb3BBY3Rpb24gPSBkcmFnT3BUb0Ryb3BB Y3Rpb24ocGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdEYXRhKSk7Cisg ICAgZXYtPnNldERyb3BBY3Rpb24obV9sYXN0RHJvcEFjdGlvbik7CisgICAgaWYgKG1fbGFzdERy b3BBY3Rpb24gIT0gUXQ6Oklnbm9yZUFjdGlvbikKKyAgICAgICAgZXYtPmFjY2VwdCgpOwogI2Vu ZGlmCiB9CiAKQEAgLTEwMjgsOCArMTAzMCwxMCBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6ZHJv cEV2ZW50KFQgKmV2KQogI2lmbmRlZiBRVF9OT19EUkFHQU5ERFJPUAogICAgIERyYWdEYXRhIGRy YWdEYXRhKGV2LT5taW1lRGF0YSgpLCBRUG9pbnRGKGV2LT5wb3MoKSkudG9Qb2ludCgpLAogICAg ICAgICAgICAgUUN1cnNvcjo6cG9zKCksIGRyb3BBY3Rpb25Ub0RyYWdPcChldi0+cG9zc2libGVB Y3Rpb25zKCkpKTsKLSAgICBpZiAocGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+cGVyZm9ybURyYWco JmRyYWdEYXRhKSkKLSAgICAgICAgZXYtPmFjY2VwdFByb3Bvc2VkQWN0aW9uKCk7CisgICAgaWYg KHBhZ2UtPmRyYWdDb250cm9sbGVyKCktPnBlcmZvcm1EcmFnKCZkcmFnRGF0YSkpIHsKKyAgICAg ICAgZXYtPnNldERyb3BBY3Rpb24obV9sYXN0RHJvcEFjdGlvbik7CisgICAgICAgIGV2LT5hY2Nl cHQoKTsKKyAgICB9CiAjZW5kaWYKIH0KIAo= 98015 2011-06-21 11:21:12 -0700 2011-06-21 12:18:25 -0700 Patch. 63004.patch text/plain 3282 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4OTMzMikKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDYtMjAgIFlh ZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUmVncmVzc2lvbig2MDk0Mikgd3Jvbmcg ZGVmYXVsdCBhY3Rpb24gZm9yIGRyYWctYW5kLWRyb3AuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzAwNAorCisgICAgICAgIEFkZGVkIHNwZWNpYWwg aGFuZGxpbmcgZm9yIHRoZSBjYXNlIHRoYXQgZHJhZ09wZXJhdGlvbiBpcyBub3QgaW5pdGlhbGl6 ZWQuCisgICAgICAgIFNhdmUgdGhlIGxhc3QgZHJvcE9wZXJhdGlvbiBhbmQgcGFzcyBpdCB0byB0 aGUgZHJvcEV2ZW50LCBzbyB0aGF0IGl0IGNhbiAKKyAgICAgICAgYmUgYWNjZXB0ZWQgYnkgUURy YWcuCisgICAgICAgIENhbGwgZXZlbnQtPmFjY2VwdGVkKCkgYW5kIG5vdCBldmVudC0+YWNjZXB0 UHJvcG9zZWRBY3Rpb24oKSwgYmVjYXVzZSB0aGUKKyAgICAgICAgbGF0ZXIgaWdub3JlcyB0aGUg ZHJvcEFjdGlvbiBzcGVjaWZpZWQgaW4gSmF2YVNjcmlwdC4KKworICAgICAgICBUZXN0ZWQgd2l0 aCB0aGUgdGVzdCBwYWdlIGF0dGFjaGVkIHRvIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00MDQwMQorICAgICAgICBhbmQgZGlkIG5vdCBzZWUgYW55IGlzc3VlLgorICAg ICAgICBBbHNvIG1hbnVhbGx5IHRlc3RlZCBhbGwgY29tYmluYXRpb25zIG9mIExheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL2RyYWctYW5kLWRyb3AuaHRtbAorICAgICAgICBhbmQgdGhleSBhbGwgcGFz cy4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChkcm9wQWN0aW9uVG9E cmFnT3ApOgorICAgICAgICAoUVdlYlBhZ2VQcml2YXRlOjpkcmFnTW92ZUV2ZW50KToKKyAgICAg ICAgKFFXZWJQYWdlUHJpdmF0ZTo6ZHJvcEV2ZW50KToKKwogMjAxMS0wNi0yMCAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5 IFNlbWlraGF0c2t5LgpJbmRleDogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24g ODkyNjQpCisrKyBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI2OSw2ICsyNjksOCBAQCBzdGF0aWMgaW5saW5lIERyYWdPcGVyYXRpb24gZHJvcEFj dGlvblRvCiAgICAgICAgIHJlc3VsdCB8PSAoRHJhZ09wZXJhdGlvbk1vdmUgfCBEcmFnT3BlcmF0 aW9uR2VuZXJpYyk7CiAgICAgaWYgKGFjdGlvbnMgJiBRdDo6TGlua0FjdGlvbikKICAgICAgICAg cmVzdWx0IHw9IERyYWdPcGVyYXRpb25MaW5rOworICAgIGlmIChyZXN1bHQgPT0gKERyYWdPcGVy YXRpb25Db3B5IHwgRHJhZ09wZXJhdGlvbk1vdmUgfCBEcmFnT3BlcmF0aW9uR2VuZXJpYyB8IERy YWdPcGVyYXRpb25MaW5rKSkKKyAgICAgICAgcmVzdWx0ID0gRHJhZ09wZXJhdGlvbkV2ZXJ5Owog ICAgIHJldHVybiAoRHJhZ09wZXJhdGlvbilyZXN1bHQ7CiB9CiAKQEAgLTMxNSw2ICszMTcsNyBA QCBRV2ViUGFnZVByaXZhdGU6OlFXZWJQYWdlUHJpdmF0ZShRV2ViUGFnCiAgICAgLCBpbnNwZWN0 b3JGcm9udGVuZCgwKQogICAgICwgaW5zcGVjdG9yKDApCiAgICAgLCBpbnNwZWN0b3JJc0ludGVy bmFsT25seShmYWxzZSkKKyAgICAsIG1fbGFzdERyb3BBY3Rpb24oUXQ6Oklnbm9yZUFjdGlvbikK IHsKICAgICBXZWJDb3JlOjpJbml0aWFsaXplTG9nZ2luZ0NoYW5uZWxzSWZOZWNlc3NhcnkoKTsK ICAgICBTY3JpcHRDb250cm9sbGVyOjppbml0aWFsaXplVGhyZWFkaW5nKCk7CkBAIC0xMDE1LDEw ICsxMDE4LDEwIEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkcmFnTW92ZUV2ZW50KFQgKmUKICNp Zm5kZWYgUVRfTk9fRFJBR0FORERST1AKICAgICBEcmFnRGF0YSBkcmFnRGF0YShldi0+bWltZURh dGEoKSwgUVBvaW50Rihldi0+cG9zKCkpLnRvUG9pbnQoKSwKICAgICAgICAgICAgIFFDdXJzb3I6 OnBvcygpLCBkcm9wQWN0aW9uVG9EcmFnT3AoZXYtPnBvc3NpYmxlQWN0aW9ucygpKSk7Ci0gICAg UXQ6OkRyb3BBY3Rpb24gYWN0aW9uID0gZHJhZ09wVG9Ecm9wQWN0aW9uKHBhZ2UtPmRyYWdDb250 cm9sbGVyKCktPmRyYWdVcGRhdGVkKCZkcmFnRGF0YSkpOwotICAgIGV2LT5zZXREcm9wQWN0aW9u KGFjdGlvbik7Ci0gICAgaWYgKGFjdGlvbiAhPSBRdDo6SWdub3JlQWN0aW9uKQotICAgICAgICBl di0+YWNjZXB0UHJvcG9zZWRBY3Rpb24oKTsKKyAgICBtX2xhc3REcm9wQWN0aW9uID0gZHJhZ09w VG9Ecm9wQWN0aW9uKHBhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdVcGRhdGVkKCZkcmFnRGF0 YSkpOworICAgIGV2LT5zZXREcm9wQWN0aW9uKG1fbGFzdERyb3BBY3Rpb24pOworICAgIGlmICht X2xhc3REcm9wQWN0aW9uICE9IFF0OjpJZ25vcmVBY3Rpb24pCisgICAgICAgIGV2LT5hY2NlcHQo KTsKICNlbmRpZgogfQogCkBAIC0xMDI4LDggKzEwMzEsMTAgQEAgdm9pZCBRV2ViUGFnZVByaXZh dGU6OmRyb3BFdmVudChUICpldikKICNpZm5kZWYgUVRfTk9fRFJBR0FORERST1AKICAgICBEcmFn RGF0YSBkcmFnRGF0YShldi0+bWltZURhdGEoKSwgUVBvaW50Rihldi0+cG9zKCkpLnRvUG9pbnQo KSwKICAgICAgICAgICAgIFFDdXJzb3I6OnBvcygpLCBkcm9wQWN0aW9uVG9EcmFnT3AoZXYtPnBv c3NpYmxlQWN0aW9ucygpKSk7Ci0gICAgaWYgKHBhZ2UtPmRyYWdDb250cm9sbGVyKCktPnBlcmZv cm1EcmFnKCZkcmFnRGF0YSkpCi0gICAgICAgIGV2LT5hY2NlcHRQcm9wb3NlZEFjdGlvbigpOwor ICAgIGlmIChwYWdlLT5kcmFnQ29udHJvbGxlcigpLT5wZXJmb3JtRHJhZygmZHJhZ0RhdGEpKSB7 CisgICAgICAgIGV2LT5zZXREcm9wQWN0aW9uKG1fbGFzdERyb3BBY3Rpb24pOworICAgICAgICBl di0+YWNjZXB0KCk7CisgICAgfQogI2VuZGlmCiB9CiAK