40784 2010-06-17 09:28:19 -0700 Remove older versions of custom Carbon events in npapi.h 2010-10-18 12:36:52 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 stuartmorgan stuartmorgan abarth andersca commit-queue eric joshmoz webkit.review.bot oldest_to_newest 239421 0 stuartmorgan 2010-06-17 09:28:19 -0700 WebKit's npapi.h defines three events for Carbon plugin event structures: #define getFocusEvent (osEvt + 16) #define loseFocusEvent (osEvt + 17) #define adjustCursorEvent (osEvt + 18) But the upstream copy uses an enum for those values: enum NPEventType { NPEventType_GetFocusEvent = (osEvt + 16), NPEventType_LoseFocusEvent, NPEventType_AdjustCursorEvent, ... Use of the former should be removed from WebKit, and the #defines removed from the header. 239598 1 59040 stuartmorgan 2010-06-17 15:18:11 -0700 Created attachment 59040 fix v1 Note that the test plugin is still using the old names; the value of having them match seemed minimal, and this means test expectations don't have to all change. 271183 2 59040 darin 2010-08-29 12:29:01 -0700 Comment on attachment 59040 fix v1 Seems great to fix everything in our own code. But why are we removing these macros from a public header? Are you sure this is OK? Did Netscape already do this in their copy of npapi.h? Setting review+ assuming the answer to all those questions is "a good reason", yes, and yes. 271453 3 stuartmorgan 2010-08-30 09:03:09 -0700 The answers are: - To bring WebKit's copy of the header more in line with http://code.google.com/p/npapi-headers/ in order to minimize confusion both for people writing plugins ("which header should I build my plugin against?") and for browser developers (when updating the headers for NPAPI changes). - People building plugins against the WebKit version of the header will have to make minor code changes when building against the new header, but that will be an easy change; I think the benefits outweigh the cost. (And hopefully plugin vendors will start using the central repository instead of an individual browser's copy anyway.) - Mozilla already did this. 271477 4 65928 stuartmorgan 2010-08-30 10:01:52 -0700 Created attachment 65928 fix, unbitrotted Same patch, but with bitrot from the move of TestNetscapePlugIn's main.cpp addressed. 274935 5 59040 eric 2010-09-07 03:19:29 -0700 Comment on attachment 59040 fix v1 Cleared Darin Adler's review+ from obsolete attachment 59040 so that this bug does not appear in http://webkit.org/pending-commit. 275084 6 stuartmorgan 2010-09-07 09:34:29 -0700 Could you also set commit-queue+ then, since it is in fact a pending commit? It would be nice not to have to un-bit-rot this a second time. 295618 7 stuartmorgan 2010-10-18 11:05:00 -0700 Sigh; these defines have now spread to WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h Can someone explain why this has been commit-queue? for almost two months? If there's something wrong with the patch I'd be happy to fix it. 295628 8 65928 eric 2010-10-18 11:09:14 -0700 Comment on attachment 65928 fix, unbitrotted OK. 295666 9 commit-queue 2010-10-18 11:51:46 -0700 The commit-queue encountered the following flaky tests while processing attachment 65928: fast/workers/storage/use-same-database-in-page-and-workers.html Please file bugs against the tests. The commit-queue is continuing to process your patch. 295667 10 65928 commit-queue 2010-10-18 11:54:24 -0700 Comment on attachment 65928 fix, unbitrotted Clearing flags on attachment: 65928 Committed r69979: <http://trac.webkit.org/changeset/69979> 295668 11 commit-queue 2010-10-18 11:54:29 -0700 All reviewed patches have been landed. Closing bug. 295699 12 webkit.review.bot 2010-10-18 12:36:52 -0700 http://trac.webkit.org/changeset/69979 might have broken Leopard Intel Debug (Tests) 59040 2010-06-17 15:18:11 -0700 2010-09-07 03:19:29 -0700 fix v1 40784.patch text/plain 7058 stuartmorgan SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTM1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDYtMTcgIFN0dWFydCBNb3JnYW4gIDxzdHVhcnRtb3JnYW5A Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFN3aXRjaCB0byB1c2luZyB0aGUgbmV3IENhcmJvbiBOUEFQSSBldmVudCBkZWNsYXJh dGlvbnMsIGFuZCByZW1vdmUKKyAgICAgICAgdGhlIG9sZCBvbmVzLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDc4NAorCisgICAgICAgICogYnJp ZGdlL25wYXBpLmg6CisgICAgICAgICogcGx1Z2lucy9tYWMvUGx1Z2luVmlld01hYy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnNldEZvY3VzKToKKyAgICAgICAgKFdlYkNvcmU6 OlBsdWdpblZpZXc6OmhhbmRsZU1vdXNlRXZlbnQpOgorCiAyMDEwLTA2LTE2ICBEdW1pdHJ1IERh bmlsaXVjICA8ZHVtaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRy aSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9icmlkZ2UvbnBhcGkuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2JyaWRnZS9ucGFwaS5oCShyZXZpc2lvbiA2MTMyNykKKysrIFdlYkNvcmUvYnJpZGdl L25wYXBpLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3NiwxMCArNjc2LDYgQEAgZW51bSBOUEV2ZW50 VHlwZSB7CiAgIE5QRXZlbnRUeXBlX1Njcm9sbGluZ0JlZ2luc0V2ZW50ID0gMTAwMCwKICAgTlBF dmVudFR5cGVfU2Nyb2xsaW5nRW5kc0V2ZW50CiB9OwotLyogT2Jzb2xldGUgdmVyc2lvbnMgb2Yg dGhlIGFib3ZlICovCi0jZGVmaW5lIGdldEZvY3VzRXZlbnQgICAgICAgIChvc0V2dCArIDE2KQot I2RlZmluZSBsb3NlRm9jdXNFdmVudCAgICAgICAgKG9zRXZ0ICsgMTcpCi0jZGVmaW5lIGFkanVz dEN1cnNvckV2ZW50ICAgKG9zRXZ0ICsgMTgpCiAjZW5kaWYgLyogTlBfTk9fQ0FSQk9OICovCiAK ICNlbmRpZiAvKiBYUF9NQUNPU1ggKi8KSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9tYWMvUGx1Z2lu Vmlld01hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvbWFjL1BsdWdpblZpZXdN YWMubW0JKHJldmlzaW9uIDYxMzI3KQorKysgV2ViQ29yZS9wbHVnaW5zL21hYy9QbHVnaW5WaWV3 TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNTYsNyArMzU2LDcgQEAgdm9pZCBQbHVnaW5WaWV3 OjpzZXRGb2N1cyhib29sIGZvY3VzZWQpCiAKICNpZm5kZWYgTlBfTk9fQ0FSQk9OCiAgICAgRXZl bnRSZWNvcmQgcmVjb3JkOwotICAgIHJlY29yZC53aGF0ID0gZ2V0Rm9jdXNFdmVudDsKKyAgICBy ZWNvcmQud2hhdCA9IE5QRXZlbnRUeXBlX0dldEZvY3VzRXZlbnQ7CiAgICAgcmVjb3JkLm1lc3Nh Z2UgPSAwOwogICAgIHJlY29yZC53aGVuID0gVGlja0NvdW50KCk7CiAgICAgcmVjb3JkLndoZXJl ID0gZ2xvYmFsTW91c2VQb3NGb3JQbHVnaW4oKTsKQEAgLTU3Myw5ICs1NzMsOSBAQCB2b2lkIFBs dWdpblZpZXc6OmhhbmRsZU1vdXNlRXZlbnQoTW91c2VFCiAgICAgICAgIG1fbGFzdE1vdXNlUG9z ID0gbW91c2VQb3NGb3JQbHVnaW4oZXZlbnQpOwogICAgICAgICByZXR1cm47CiAgICAgfSBlbHNl IGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCkgewotICAg ICAgICByZWNvcmQud2hhdCA9IGFkanVzdEN1cnNvckV2ZW50OworICAgICAgICByZWNvcmQud2hh dCA9IE5QRXZlbnRUeXBlX0FkanVzdEN1cnNvckV2ZW50OwogICAgIH0gZWxzZSBpZiAoZXZlbnQt PnR5cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2VvdXRFdmVudCkgewotICAgICAgICByZWNvcmQu d2hhdCA9IGFkanVzdEN1cnNvckV2ZW50OworICAgICAgICByZWNvcmQud2hhdCA9IE5QRXZlbnRU eXBlX0FkanVzdEN1cnNvckV2ZW50OwogICAgIH0gZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9PSBl dmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQpIHsKICAgICAgICAgcmVjb3JkLndoYXQgPSBtb3Vz ZURvd247CiAgICAgICAgIC8vIFRoZSBwbHVnaW4gbmVlZHMgZm9jdXMgdG8gcmVjZWl2ZSBrZXli b2FyZCBldmVudHMKQEAgLTU5Nyw3ICs1OTcsNyBAQCB2b2lkIFBsdWdpblZpZXc6OmhhbmRsZU1v dXNlRXZlbnQoTW91c2VFCiAgICAgICAgIHJlY29yZC5tb2RpZmllcnMgfD0gY29udHJvbEtleTsK IAogICAgIGlmICghZGlzcGF0Y2hOUEV2ZW50KHJlY29yZCkpIHsKLSAgICAgICAgaWYgKHJlY29y ZC53aGF0ID09IGFkanVzdEN1cnNvckV2ZW50KQorICAgICAgICBpZiAocmVjb3JkLndoYXQgPT0g TlBFdmVudFR5cGVfQWRqdXN0Q3Vyc29yRXZlbnQpCiAgICAgICAgICAgICByZXR1cm47IC8vIFNp Z25hbHMgdGhhdCB0aGUgcGx1Z2luIHdhbnRzIGEgbm9ybWFsIGN1cnNvcgogCiAgICAgICAgIExP RyhFdmVudHMsICJQbHVnaW5WaWV3OjpoYW5kbGVNb3VzZUV2ZW50KCk6IE1vdXNlIGV2ZW50IHR5 cGUgJWQgYXQgJWQsJWQgbm90IGFjY2VwdGVkIiwKSW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2MTM1MikKKysr IFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTAtMDYtMTcgIFN0dWFydCBNb3JnYW4gIDxzdHVhcnRtb3JnYW5AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5lZWQgYSBzaG9y dCBkZXNjcmlwdGlvbiBhbmQgYnVnIFVSTCAoT09QUyEpCisKKyAgICAgICAgKiBQbHVnaW5zL1dl Yk5ldHNjYXBlUGx1Z2luRXZlbnRIYW5kbGVyQ2FyYm9uLm1tOgorICAgICAgICAoV2ViTmV0c2Nh cGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib246Om1vdXNlRW50ZXJlZCk6CisgICAgICAgIChXZWJO ZXRzY2FwZVBsdWdpbkV2ZW50SGFuZGxlckNhcmJvbjo6bW91c2VFeGl0ZWQpOgorICAgICAgICAo V2ViTmV0c2NhcGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib246Om1vdXNlTW92ZWQpOgorICAgICAg ICAoV2ViTmV0c2NhcGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib246OmZvY3VzQ2hhbmdlZCk6CisK IDIwMTAtMDYtMTcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2Nh cGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9Q bHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luRXZlbnRIYW5kbGVyQ2FyYm9uLm1tCShyZXZpc2lvbiA2 MTMyNykKKysrIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpbkV2ZW50SGFuZGxl ckNhcmJvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMTc0LDcgKzE3NCw3IEBAIHZvaWQgV2ViTmV0 c2NhcGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib24KICAgICBFdmVudFJlY29yZCBldmVudDsKICAg ICAKICAgICBnZXRDYXJib25FdmVudCgmZXZlbnQsIHRoZUV2ZW50KTsKLSAgICBldmVudC53aGF0 ID0gYWRqdXN0Q3Vyc29yRXZlbnQ7CisgICAgZXZlbnQud2hhdCA9IE5QRXZlbnRUeXBlX0FkanVz dEN1cnNvckV2ZW50OwogICAgIAogICAgIEJPT0wgYWNjZXB0ZWRFdmVudDsKICAgICBhY2NlcHRl ZEV2ZW50ID0gc2VuZEV2ZW50KCZldmVudCk7CkBAIC0xODcsNyArMTg3LDcgQEAgdm9pZCBXZWJO ZXRzY2FwZVBsdWdpbkV2ZW50SGFuZGxlckNhcmJvbgogICAgIEV2ZW50UmVjb3JkIGV2ZW50Owog ICAgIAogICAgIGdldENhcmJvbkV2ZW50KCZldmVudCwgdGhlRXZlbnQpOwotICAgIGV2ZW50Lndo YXQgPSBhZGp1c3RDdXJzb3JFdmVudDsKKyAgICBldmVudC53aGF0ID0gTlBFdmVudFR5cGVfQWRq dXN0Q3Vyc29yRXZlbnQ7CiAgICAgCiAgICAgQk9PTCBhY2NlcHRlZEV2ZW50OwogICAgIGFjY2Vw dGVkRXZlbnQgPSBzZW5kRXZlbnQoJmV2ZW50KTsKQEAgLTIwNCw3ICsyMDQsNyBAQCB2b2lkIFdl Yk5ldHNjYXBlUGx1Z2luRXZlbnRIYW5kbGVyQ2FyYm9uCiAgICAgRXZlbnRSZWNvcmQgZXZlbnQ7 CiAgICAgCiAgICAgZ2V0Q2FyYm9uRXZlbnQoJmV2ZW50LCB0aGVFdmVudCk7Ci0gICAgZXZlbnQu d2hhdCA9IGFkanVzdEN1cnNvckV2ZW50OworICAgIGV2ZW50LndoYXQgPSBOUEV2ZW50VHlwZV9B ZGp1c3RDdXJzb3JFdmVudDsKICAgICAKICAgICBCT09MIGFjY2VwdGVkRXZlbnQ7CiAgICAgYWNj ZXB0ZWRFdmVudCA9IHNlbmRFdmVudCgmZXZlbnQpOwpAQCAtMjcxLDE0ICsyNzEsMTQgQEAgdm9p ZCBXZWJOZXRzY2FwZVBsdWdpbkV2ZW50SGFuZGxlckNhcmJvbgogICAgIGdldENhcmJvbkV2ZW50 KCZldmVudCk7CiAgICAgYm9vbCBhY2NlcHRlZEV2ZW50OwogICAgIGlmIChoYXNGb2N1cykgewot ICAgICAgICBldmVudC53aGF0ID0gZ2V0Rm9jdXNFdmVudDsKKyAgICAgICAgZXZlbnQud2hhdCA9 IE5QRXZlbnRUeXBlX0dldEZvY3VzRXZlbnQ7CiAgICAgICAgIGFjY2VwdGVkRXZlbnQgPSBzZW5k RXZlbnQoJmV2ZW50KTsKLSAgICAgICAgTE9HKFBsdWdpbkV2ZW50cywgIk5QUF9IYW5kbGVFdmVu dChnZXRGb2N1c0V2ZW50KTogJWQiLCBhY2NlcHRlZEV2ZW50KTsKKyAgICAgICAgTE9HKFBsdWdp bkV2ZW50cywgIk5QUF9IYW5kbGVFdmVudChOUEV2ZW50VHlwZV9HZXRGb2N1c0V2ZW50KTogJWQi LCBhY2NlcHRlZEV2ZW50KTsKICAgICAgICAgaW5zdGFsbEtleUV2ZW50SGFuZGxlcigpOwogICAg IH0gZWxzZSB7Ci0gICAgICAgIGV2ZW50LndoYXQgPSBsb3NlRm9jdXNFdmVudDsKKyAgICAgICAg ZXZlbnQud2hhdCA9IE5QRXZlbnRUeXBlX0xvc2VGb2N1c0V2ZW50OwogICAgICAgICBhY2NlcHRl ZEV2ZW50ID0gc2VuZEV2ZW50KCZldmVudCk7Ci0gICAgICAgIExPRyhQbHVnaW5FdmVudHMsICJO UFBfSGFuZGxlRXZlbnQobG9zZUZvY3VzRXZlbnQpOiAlZCIsIGFjY2VwdGVkRXZlbnQpOworICAg ICAgICBMT0coUGx1Z2luRXZlbnRzLCAiTlBQX0hhbmRsZUV2ZW50KE5QRXZlbnRUeXBlX0xvc2VG b2N1c0V2ZW50KTogJWQiLCBhY2NlcHRlZEV2ZW50KTsKICAgICAgICAgcmVtb3ZlS2V5RXZlbnRI YW5kbGVyKCk7CiAgICAgfQogfQpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gNjEzNTIpCisrKyBXZWJLaXRU b29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNi0x NyAgU3R1YXJ0IE1vcmdhbiAgPHN0dWFydG1vcmdhbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3dpdGNoIHRvIHVzaW5nIHRo ZSBuZXcgQ2FyYm9uIE5QQVBJIGV2ZW50IGRlY2xhcmF0aW9ucywgYW5kIHJlbW92ZQorICAgICAg ICB0aGUgb2xkIG9uZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQwNzg0CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQ bHVnSW4uc3VicHJvai9tYWluLmNwcDoKKyAgICAgICAgKGhhbmRsZUV2ZW50Q2FyYm9uKToKKwog MjAxMC0wNi0xNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgT25l IG1vcmUgdHJ5IGF0IGZpeCBmb3IgQ2hyb21pdW0gYnVpbGQuCkluZGV4OiBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4uc3VicHJvai9tYWluLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4uc3Vi cHJvai9tYWluLmNwcAkocmV2aXNpb24gNjEzMjcpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4uc3VicHJvai9tYWluLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzI3LDEzICszMjcsMTMgQEAgc3RhdGljIGludDE2X3QgaGFuZGxlRXZlbnRDYXJib24oTlBQ IGlucwogICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAia0hpZ2hMZXZlbEV2ZW50Iik7 CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgLy8gTlBBUEkgZXZlbnRzCi0gICAgICAgIGNh c2UgZ2V0Rm9jdXNFdmVudDoKKyAgICAgICAgY2FzZSBOUEV2ZW50VHlwZV9Mb3NlRm9jdXNFdmVu dDoKICAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgImdldEZvY3VzRXZlbnQiKTsKICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIGxvc2VGb2N1c0V2ZW50OgorICAgICAgICBj YXNlIE5QRXZlbnRUeXBlX0xvc2VGb2N1c0V2ZW50OgogICAgICAgICAgICAgcGx1Z2luTG9nKGlu c3RhbmNlLCAibG9zZUZvY3VzRXZlbnQiKTsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBj YXNlIGFkanVzdEN1cnNvckV2ZW50OgorICAgICAgICBjYXNlIE5QRXZlbnRUeXBlX0FkanVzdEN1 cnNvckV2ZW50OgogICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAiYWRqdXN0Q3Vyc29y RXZlbnQiKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0Ogo= 65928 2010-08-30 10:01:52 -0700 2010-10-18 11:54:24 -0700 fix, unbitrotted 40784v2.patch text/plain 7186 stuartmorgan SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjM5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDgtMzAgIFN0dWFydCBNb3JnYW4gIDxzdHVhcnRtb3JnYW5A Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFN3aXRjaCB0byB1c2luZyB0aGUgbmV3IENhcmJvbiBOUEFQSSBldmVudCBkZWNsYXJh dGlvbnMsIGFuZCByZW1vdmUKKyAgICAgICAgdGhlIG9sZCBvbmVzLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDc4NAorCisgICAgICAgICogYnJp ZGdlL25wYXBpLmg6CisgICAgICAgICogcGx1Z2lucy9tYWMvUGx1Z2luVmlld01hYy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnNldEZvY3VzKToKKyAgICAgICAgKFdlYkNvcmU6 OlBsdWdpblZpZXc6OmhhbmRsZU1vdXNlRXZlbnQpOgorCiAyMDEwLTA4LTMwICBNYXJ0aW4gUm9i aW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBCdWlsZCBmaXguIEFkZCB0 aGUgbmV3IGZpbGVhcGkgZGlyZWN0b3J5IHRvIHRoZSBJREwgdnBhdGguCkluZGV4OiBXZWJDb3Jl L2JyaWRnZS9ucGFwaS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL25wYXBpLmgJKHJl dmlzaW9uIDY2MzkwKQorKysgV2ViQ29yZS9icmlkZ2UvbnBhcGkuaAkod29ya2luZyBjb3B5KQpA QCAtNjc2LDEwICs2NzYsNiBAQCBlbnVtIE5QRXZlbnRUeXBlIHsKICAgTlBFdmVudFR5cGVfU2Ny b2xsaW5nQmVnaW5zRXZlbnQgPSAxMDAwLAogICBOUEV2ZW50VHlwZV9TY3JvbGxpbmdFbmRzRXZl bnQKIH07Ci0vKiBPYnNvbGV0ZSB2ZXJzaW9ucyBvZiB0aGUgYWJvdmUgKi8KLSNkZWZpbmUgZ2V0 Rm9jdXNFdmVudCAgICAgICAgKG9zRXZ0ICsgMTYpCi0jZGVmaW5lIGxvc2VGb2N1c0V2ZW50ICAg ICAgICAob3NFdnQgKyAxNykKLSNkZWZpbmUgYWRqdXN0Q3Vyc29yRXZlbnQgICAob3NFdnQgKyAx OCkKICNlbmRpZiAvKiBOUF9OT19DQVJCT04gKi8KIAogI2VuZGlmIC8qIFhQX01BQ09TWCAqLwpJ bmRleDogV2ViQ29yZS9wbHVnaW5zL21hYy9QbHVnaW5WaWV3TWFjLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGx1Z2lucy9tYWMvUGx1Z2luVmlld01hYy5tbQkocmV2aXNpb24gNjYzOTApCisr KyBXZWJDb3JlL3BsdWdpbnMvbWFjL1BsdWdpblZpZXdNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg LTM1OSw3ICszNTksNyBAQCB2b2lkIFBsdWdpblZpZXc6OnNldEZvY3VzKGJvb2wgZm9jdXNlZCkK IAogI2lmbmRlZiBOUF9OT19DQVJCT04KICAgICBFdmVudFJlY29yZCByZWNvcmQ7Ci0gICAgcmVj b3JkLndoYXQgPSBnZXRGb2N1c0V2ZW50OworICAgIHJlY29yZC53aGF0ID0gTlBFdmVudFR5cGVf R2V0Rm9jdXNFdmVudDsKICAgICByZWNvcmQubWVzc2FnZSA9IDA7CiAgICAgcmVjb3JkLndoZW4g PSBUaWNrQ291bnQoKTsKICAgICByZWNvcmQud2hlcmUgPSBnbG9iYWxNb3VzZVBvc0ZvclBsdWdp bigpOwpAQCAtNTc2LDkgKzU3Niw5IEBAIHZvaWQgUGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVu dChNb3VzZUUKICAgICAgICAgbV9sYXN0TW91c2VQb3MgPSBtb3VzZVBvc0ZvclBsdWdpbihldmVu dCk7CiAgICAgICAgIHJldHVybjsKICAgICB9IGVsc2UgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZl bnROYW1lcygpLm1vdXNlb3ZlckV2ZW50KSB7Ci0gICAgICAgIHJlY29yZC53aGF0ID0gYWRqdXN0 Q3Vyc29yRXZlbnQ7CisgICAgICAgIHJlY29yZC53aGF0ID0gTlBFdmVudFR5cGVfQWRqdXN0Q3Vy c29yRXZlbnQ7CiAgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5t b3VzZW91dEV2ZW50KSB7Ci0gICAgICAgIHJlY29yZC53aGF0ID0gYWRqdXN0Q3Vyc29yRXZlbnQ7 CisgICAgICAgIHJlY29yZC53aGF0ID0gTlBFdmVudFR5cGVfQWRqdXN0Q3Vyc29yRXZlbnQ7CiAg ICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVu dCkgewogICAgICAgICByZWNvcmQud2hhdCA9IG1vdXNlRG93bjsKICAgICAgICAgLy8gVGhlIHBs dWdpbiBuZWVkcyBmb2N1cyB0byByZWNlaXZlIGtleWJvYXJkIGV2ZW50cwpAQCAtNjAwLDcgKzYw MCw3IEBAIHZvaWQgUGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVudChNb3VzZUUKICAgICAgICAg cmVjb3JkLm1vZGlmaWVycyB8PSBjb250cm9sS2V5OwogCiAgICAgaWYgKCFkaXNwYXRjaE5QRXZl bnQocmVjb3JkKSkgewotICAgICAgICBpZiAocmVjb3JkLndoYXQgPT0gYWRqdXN0Q3Vyc29yRXZl bnQpCisgICAgICAgIGlmIChyZWNvcmQud2hhdCA9PSBOUEV2ZW50VHlwZV9BZGp1c3RDdXJzb3JF dmVudCkKICAgICAgICAgICAgIHJldHVybjsgLy8gU2lnbmFscyB0aGF0IHRoZSBwbHVnaW4gd2Fu dHMgYSBub3JtYWwgY3Vyc29yCiAKICAgICAgICAgTE9HKEV2ZW50cywgIlBsdWdpblZpZXc6Omhh bmRsZU1vdXNlRXZlbnQoKTogTW91c2UgZXZlbnQgdHlwZSAlZCBhdCAlZCwlZCBub3QgYWNjZXB0 ZWQiLApJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9DaGFuZ2VMb2cJKHJldmlzaW9uIDY2MzkzKQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOC0zMCAgU3R1YXJ0IE1vcmdhbiAg PHN0dWFydG1vcmdhbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU3dpdGNoIHRvIHVzaW5nIHRoZSBuZXcgQ2FyYm9uIE5QQVBJ IGV2ZW50IGRlY2xhcmF0aW9ucywgYW5kIHJlbW92ZQorICAgICAgICB0aGUgb2xkIG9uZXMuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNzg0CisK KyAgICAgICAgKiBQbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luRXZlbnRIYW5kbGVyQ2FyYm9uLm1t OgorICAgICAgICAoV2ViTmV0c2NhcGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib246Om1vdXNlRW50 ZXJlZCk6CisgICAgICAgIChXZWJOZXRzY2FwZVBsdWdpbkV2ZW50SGFuZGxlckNhcmJvbjo6bW91 c2VFeGl0ZWQpOgorICAgICAgICAoV2ViTmV0c2NhcGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib246 Om1vdXNlTW92ZWQpOgorICAgICAgICAoV2ViTmV0c2NhcGVQbHVnaW5FdmVudEhhbmRsZXJDYXJi b246OmZvY3VzQ2hhbmdlZCk6CisKIDIwMTAtMDgtMzAgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI2 NjE5OC4KSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpbkV2ZW50SGFu ZGxlckNhcmJvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2Nh cGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib24ubW0JKHJldmlzaW9uIDY2MzkwKQorKysgV2ViS2l0 L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luRXZlbnRIYW5kbGVyQ2FyYm9uLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNzQsNyArMTc0LDcgQEAgdm9pZCBXZWJOZXRzY2FwZVBsdWdpbkV2ZW50 SGFuZGxlckNhcmJvbgogICAgIEV2ZW50UmVjb3JkIGV2ZW50OwogICAgIAogICAgIGdldENhcmJv bkV2ZW50KCZldmVudCwgdGhlRXZlbnQpOwotICAgIGV2ZW50LndoYXQgPSBhZGp1c3RDdXJzb3JF dmVudDsKKyAgICBldmVudC53aGF0ID0gTlBFdmVudFR5cGVfQWRqdXN0Q3Vyc29yRXZlbnQ7CiAg ICAgCiAgICAgQk9PTCBhY2NlcHRlZEV2ZW50OwogICAgIGFjY2VwdGVkRXZlbnQgPSBzZW5kRXZl bnQoJmV2ZW50KTsKQEAgLTE4Nyw3ICsxODcsNyBAQCB2b2lkIFdlYk5ldHNjYXBlUGx1Z2luRXZl bnRIYW5kbGVyQ2FyYm9uCiAgICAgRXZlbnRSZWNvcmQgZXZlbnQ7CiAgICAgCiAgICAgZ2V0Q2Fy Ym9uRXZlbnQoJmV2ZW50LCB0aGVFdmVudCk7Ci0gICAgZXZlbnQud2hhdCA9IGFkanVzdEN1cnNv ckV2ZW50OworICAgIGV2ZW50LndoYXQgPSBOUEV2ZW50VHlwZV9BZGp1c3RDdXJzb3JFdmVudDsK ICAgICAKICAgICBCT09MIGFjY2VwdGVkRXZlbnQ7CiAgICAgYWNjZXB0ZWRFdmVudCA9IHNlbmRF dmVudCgmZXZlbnQpOwpAQCAtMjA0LDcgKzIwNCw3IEBAIHZvaWQgV2ViTmV0c2NhcGVQbHVnaW5F dmVudEhhbmRsZXJDYXJib24KICAgICBFdmVudFJlY29yZCBldmVudDsKICAgICAKICAgICBnZXRD YXJib25FdmVudCgmZXZlbnQsIHRoZUV2ZW50KTsKLSAgICBldmVudC53aGF0ID0gYWRqdXN0Q3Vy c29yRXZlbnQ7CisgICAgZXZlbnQud2hhdCA9IE5QRXZlbnRUeXBlX0FkanVzdEN1cnNvckV2ZW50 OwogICAgIAogICAgIEJPT0wgYWNjZXB0ZWRFdmVudDsKICAgICBhY2NlcHRlZEV2ZW50ID0gc2Vu ZEV2ZW50KCZldmVudCk7CkBAIC0yNzEsMTQgKzI3MSwxNCBAQCB2b2lkIFdlYk5ldHNjYXBlUGx1 Z2luRXZlbnRIYW5kbGVyQ2FyYm9uCiAgICAgZ2V0Q2FyYm9uRXZlbnQoJmV2ZW50KTsKICAgICBi b29sIGFjY2VwdGVkRXZlbnQ7CiAgICAgaWYgKGhhc0ZvY3VzKSB7Ci0gICAgICAgIGV2ZW50Lndo YXQgPSBnZXRGb2N1c0V2ZW50OworICAgICAgICBldmVudC53aGF0ID0gTlBFdmVudFR5cGVfR2V0 Rm9jdXNFdmVudDsKICAgICAgICAgYWNjZXB0ZWRFdmVudCA9IHNlbmRFdmVudCgmZXZlbnQpOwot ICAgICAgICBMT0coUGx1Z2luRXZlbnRzLCAiTlBQX0hhbmRsZUV2ZW50KGdldEZvY3VzRXZlbnQp OiAlZCIsIGFjY2VwdGVkRXZlbnQpOworICAgICAgICBMT0coUGx1Z2luRXZlbnRzLCAiTlBQX0hh bmRsZUV2ZW50KE5QRXZlbnRUeXBlX0dldEZvY3VzRXZlbnQpOiAlZCIsIGFjY2VwdGVkRXZlbnQp OwogICAgICAgICBpbnN0YWxsS2V5RXZlbnRIYW5kbGVyKCk7CiAgICAgfSBlbHNlIHsKLSAgICAg ICAgZXZlbnQud2hhdCA9IGxvc2VGb2N1c0V2ZW50OworICAgICAgICBldmVudC53aGF0ID0gTlBF dmVudFR5cGVfTG9zZUZvY3VzRXZlbnQ7CiAgICAgICAgIGFjY2VwdGVkRXZlbnQgPSBzZW5kRXZl bnQoJmV2ZW50KTsKLSAgICAgICAgTE9HKFBsdWdpbkV2ZW50cywgIk5QUF9IYW5kbGVFdmVudChs b3NlRm9jdXNFdmVudCk6ICVkIiwgYWNjZXB0ZWRFdmVudCk7CisgICAgICAgIExPRyhQbHVnaW5F dmVudHMsICJOUFBfSGFuZGxlRXZlbnQoTlBFdmVudFR5cGVfTG9zZUZvY3VzRXZlbnQpOiAlZCIs IGFjY2VwdGVkRXZlbnQpOwogICAgICAgICByZW1vdmVLZXlFdmVudEhhbmRsZXIoKTsKICAgICB9 CiB9CkluZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9v bHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NjM5MykKKysrIFdlYktpdFRvb2xzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEwLTA4LTMwICBTdHVhcnQgTW9yZ2Fu ICA8c3R1YXJ0bW9yZ2FuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTd2l0Y2ggdG8gdXNpbmcgdGhlIG5ldyBDYXJib24gTlBB UEkgZXZlbnQgZGVjbGFyYXRpb25zLCBhbmQgcmVtb3ZlCisgICAgICAgIHRoZSBvbGQgb25lcy4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA3ODQK KworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9tYWluLmNwcDoK KyAgICAgICAgKGhhbmRsZUV2ZW50Q2FyYm9uKToKKwogMjAxMC0wOC0zMCAgWm9sdGFuIEhvcnZh dGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJv aGRlIENocmlzdGlhbnNlbi4KSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RO ZXRzY2FwZVBsdWdJbi9tYWluLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vbWFpbi5jcHAJKHJldmlzaW9uIDY2MzkwKQorKysg V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL21haW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00NDMsMTMgKzQ0MywxMyBAQCBzdGF0aWMgaW50MTZfdCBoYW5kbGVF dmVudENhcmJvbihOUFAgaW5zCiAgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJrSGln aExldmVsRXZlbnQiKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAvLyBOUEFQSSBldmVu dHMKLSAgICAgICAgY2FzZSBnZXRGb2N1c0V2ZW50OgorICAgICAgICBjYXNlIE5QRXZlbnRUeXBl X0xvc2VGb2N1c0V2ZW50OgogICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAiZ2V0Rm9j dXNFdmVudCIpOwogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgbG9zZUZvY3VzRXZl bnQ6CisgICAgICAgIGNhc2UgTlBFdmVudFR5cGVfTG9zZUZvY3VzRXZlbnQ6CiAgICAgICAgICAg ICBwbHVnaW5Mb2coaW5zdGFuY2UsICJsb3NlRm9jdXNFdmVudCIpOwogICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgIGNhc2UgYWRqdXN0Q3Vyc29yRXZlbnQ6CisgICAgICAgIGNhc2UgTlBFdmVu dFR5cGVfQWRqdXN0Q3Vyc29yRXZlbnQ6CiAgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2Us ICJhZGp1c3RDdXJzb3JFdmVudCIpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1 bHQ6Cg==