69145 2011-09-30 06:53:01 -0700 [Qt][WK2] Change WebKitTestRunner to use QMouseEvents instead of QGraphicsSceneMouseEvents 2011-09-30 07:53:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zeno zeno cshu webkit.review.bot oldest_to_newest 476067 0 zeno 2011-09-30 06:53:01 -0700 [Qt][WK2] Change WebKitTestRunner to use QMouseEvents instead of QGraphicsSceneMouseEvents 476069 1 109293 zeno 2011-09-30 06:55:42 -0700 Created attachment 109293 Patch 476070 2 109293 zeno 2011-09-30 06:57:36 -0700 Comment on attachment 109293 Patch it seems i'm not yet really mastering webkit-patch script. - sorry. ;-) 476072 3 109293 cshu 2011-09-30 07:01:31 -0700 Comment on attachment 109293 Patch How come there's no ChangeLog? :) Can you put some comments there why we should choose mouseevents over graphicsscenemouseevents? 476073 4 cshu 2011-09-30 07:03:28 -0700 Sorry, I didn't realize you cancelled the review. :) 476074 5 109294 zeno 2011-09-30 07:03:37 -0700 Created attachment 109294 patch for review. 476079 6 109294 cshu 2011-09-30 07:15:55 -0700 Comment on attachment 109294 patch for review. View in context: https://bugs.webkit.org/attachment.cgi?id=109294&action=review thanks for the change. > Tools/ChangeLog:6 > + This is a follow up to https://bugs.webkit.org/show_bug.cgi?id=69105 i would suggest add more comments for the change. > Tools/WebKitTestRunner/EventSenderProxy.h:54 > + QMouseEvent* createMouseEvent(QEvent::Type, const QPoint& pos, const QPoint& screenPos, Qt::MouseButton, Qt::MouseButtons, Qt::KeyboardModifiers); We don't need a wrapper function any more. > Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp:261 > + event = new QMouseEvent(type, pos, button, buttons, modifiers); Simply remove the whole thing and change the calling site. 476084 7 109297 zeno 2011-09-30 07:38:34 -0700 Created attachment 109297 patch for review - updated according to feedback. 476089 8 109297 webkit.review.bot 2011-09-30 07:53:08 -0700 Comment on attachment 109297 patch for review - updated according to feedback. Clearing flags on attachment: 109297 Committed r96402: <http://trac.webkit.org/changeset/96402> 476090 9 webkit.review.bot 2011-09-30 07:53:13 -0700 All reviewed patches have been landed. Closing bug. 109293 2011-09-30 06:55:42 -0700 2011-09-30 07:01:30 -0700 Patch bug-69145-20110930155536.patch text/plain 3469 zeno U3VidmVyc2lvbiBSZXZpc2lvbjogOTYzOTcKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9FdmVudFNl bmRlclByb3h5LmgKaW5kZXggODU3YWQ0YTI4NDNmZGVjMGI1NGM3NzBlZmZlMDRhYjg3MDE4NDE2 NS4uMmVkOGU2ZjdjNjExYjU0MWRlN2Y4YTUyMzdhNzViZjQ3YTlkM2ZjMSAxMDA2NDQKLS0tIGEv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmgKKysrIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmgKQEAgLTUxLDcgKzUxLDcgQEAgcHJpdmF0 ZToKICNpZiBQTEFURk9STShRVCkKICAgICB2b2lkIHNlbmRPclF1ZXVlRXZlbnQoUUV2ZW50Kik7 CiAgICAgdm9pZCByZXBsYXlTYXZlZEV2ZW50cygpOwotICAgIFFHcmFwaGljc1NjZW5lTW91c2VF dmVudCogY3JlYXRlR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQoUUV2ZW50OjpUeXBlLCBjb25zdCBR UG9pbnQmIHBvcywgY29uc3QgUVBvaW50JiBzY3JlZW5Qb3MsIFF0OjpNb3VzZUJ1dHRvbiwgUXQ6 Ok1vdXNlQnV0dG9ucywgUXQ6OktleWJvYXJkTW9kaWZpZXJzKTsKKyAgICBRTW91c2VFdmVudCog Y3JlYXRlTW91c2VFdmVudChRRXZlbnQ6OlR5cGUsIGNvbnN0IFFQb2ludCYgcG9zLCBjb25zdCBR UG9pbnQmIHNjcmVlblBvcywgUXQ6Ok1vdXNlQnV0dG9uLCBRdDo6TW91c2VCdXR0b25zLCBRdDo6 S2V5Ym9hcmRNb2RpZmllcnMpOwogI2VuZGlmCiAKICAgICBkb3VibGUgbV90aW1lOwpkaWZmIC0t Z2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5UXQuY3BwIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5UXQuY3BwCmluZGV4IDA5 ZDQwYzYwMzYxMGJiMjY2NWQ0Zjg1Njk3NTZmNWU5N2VkN2Q3OTQuLjhkOTI2OGVjOTIyMWNkMmJh ODZmY2FkMGNlNzc0ZWQwYjI0NmY4N2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvcXQvRXZlbnRTZW5kZXJQcm94eVF0LmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L3F0L0V2ZW50U2VuZGVyUHJveHlRdC5jcHAKQEAgLTI1NSwxNiArMjU1LDEwIEBAIHZvaWQgRXZl bnRTZW5kZXJQcm94eTo6dXBkYXRlQ2xpY2tDb3VudEZvckJ1dHRvbihpbnQgYnV0dG9uKQogICAg IG1fY2xpY2tCdXR0b24gPSBidXR0b247CiB9CiAKLVFHcmFwaGljc1NjZW5lTW91c2VFdmVudCog RXZlbnRTZW5kZXJQcm94eTo6Y3JlYXRlR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQoUUV2ZW50OjpU eXBlIHR5cGUsIGNvbnN0IFFQb2ludCYgcG9zLCBjb25zdCBRUG9pbnQmIHNjcmVlblBvcywgUXQ6 Ok1vdXNlQnV0dG9uIGJ1dHRvbiwgUXQ6Ok1vdXNlQnV0dG9ucyBidXR0b25zLCBRdDo6S2V5Ym9h cmRNb2RpZmllcnMgbW9kaWZpZXJzKQorUU1vdXNlRXZlbnQqIEV2ZW50U2VuZGVyUHJveHk6OmNy ZWF0ZU1vdXNlRXZlbnQoUUV2ZW50OjpUeXBlIHR5cGUsIGNvbnN0IFFQb2ludCYgcG9zLCBjb25z dCBRUG9pbnQmIHNjcmVlblBvcywgUXQ6Ok1vdXNlQnV0dG9uIGJ1dHRvbiwgUXQ6Ok1vdXNlQnV0 dG9ucyBidXR0b25zLCBRdDo6S2V5Ym9hcmRNb2RpZmllcnMgbW9kaWZpZXJzKQogewotICAgIFFH cmFwaGljc1NjZW5lTW91c2VFdmVudCogZXZlbnQ7Ci0gICAgZXZlbnQgPSBuZXcgUUdyYXBoaWNz U2NlbmVNb3VzZUV2ZW50KHR5cGUpOwotICAgIGV2ZW50LT5zZXRQb3MocG9zKTsKLSAgICBldmVu dC0+c2V0U2NyZWVuUG9zKHNjcmVlblBvcyk7Ci0gICAgZXZlbnQtPnNldEJ1dHRvbihidXR0b24p OwotICAgIGV2ZW50LT5zZXRCdXR0b25zKGJ1dHRvbnMpOwotICAgIGV2ZW50LT5zZXRNb2RpZmll cnMobW9kaWZpZXJzKTsKLQorICAgIFFNb3VzZUV2ZW50KiBldmVudDsKKyAgICBldmVudCA9IG5l dyBRTW91c2VFdmVudCh0eXBlLCBwb3MsIGJ1dHRvbiwgYnV0dG9ucywgbW9kaWZpZXJzKTsKICAg ICByZXR1cm4gZXZlbnQ7CiB9CiAKQEAgLTI3OCw3ICsyNzIsNyBAQCB2b2lkIEV2ZW50U2VuZGVy UHJveHk6Om1vdXNlRG93bih1bnNpZ25lZCBidXR0b24sIFdLRXZlbnRNb2RpZmllcnMgd2tNb2Rp ZmllcnMpCiAgICAgbV9tb3VzZUJ1dHRvbnMgfD0gbW91c2VCdXR0b247CiAKICAgICBRUG9pbnQg bW91c2VQb3MobV9wb3NpdGlvbi54LCBtX3Bvc2l0aW9uLnkpOwotICAgIFFHcmFwaGljc1NjZW5l TW91c2VFdmVudCogZXZlbnQgPSBjcmVhdGVHcmFwaGljc1NjZW5lTW91c2VFdmVudCgobV9jbGlj a0NvdW50ID09IDIpID8gUUV2ZW50OjpHcmFwaGljc1NjZW5lTW91c2VEb3VibGVDbGljayA6IFFF dmVudDo6R3JhcGhpY3NTY2VuZU1vdXNlUHJlc3MsCisgICAgUU1vdXNlRXZlbnQqIGV2ZW50ID0g Y3JlYXRlTW91c2VFdmVudCgobV9jbGlja0NvdW50ID09IDIpID8gUUV2ZW50OjpNb3VzZUJ1dHRv bkRibENsaWNrIDogUUV2ZW50OjpNb3VzZUJ1dHRvblByZXNzLAogICAgICAgICBtb3VzZVBvcywg bW91c2VQb3MsIG1vdXNlQnV0dG9uLCBtX21vdXNlQnV0dG9ucywgbW9kaWZpZXJzKTsKIAogICAg IHNlbmRPclF1ZXVlRXZlbnQoZXZlbnQpOwpAQCAtMjkwLDcgKzI4NCw3IEBAIHZvaWQgRXZlbnRT ZW5kZXJQcm94eTo6bW91c2VVcCh1bnNpZ25lZCBidXR0b24sIFdLRXZlbnRNb2RpZmllcnMpCiAg ICAgbV9tb3VzZUJ1dHRvbnMgJj0gfm1vdXNlQnV0dG9uOwogCiAgICAgUVBvaW50IG1vdXNlUG9z KG1fcG9zaXRpb24ueCwgbV9wb3NpdGlvbi55KTsKLSAgICBRR3JhcGhpY3NTY2VuZU1vdXNlRXZl bnQqIGV2ZW50ID0gY3JlYXRlR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQoUUV2ZW50OjpHcmFwaGlj c1NjZW5lTW91c2VSZWxlYXNlLAorICAgIFFNb3VzZUV2ZW50KiBldmVudCA9IGNyZWF0ZU1vdXNl RXZlbnQoUUV2ZW50OjpNb3VzZUJ1dHRvblJlbGVhc2UsCiAgICAgICAgIG1vdXNlUG9zLCBtb3Vz ZVBvcywgbW91c2VCdXR0b24sIG1fbW91c2VCdXR0b25zLCBRdDo6Tm9Nb2RpZmllcik7CiAKICAg ICBzZW5kT3JRdWV1ZUV2ZW50KGV2ZW50KTsKQEAgLTMwMiw3ICsyOTYsNyBAQCB2b2lkIEV2ZW50 U2VuZGVyUHJveHk6Om1vdXNlTW92ZVRvKGRvdWJsZSB4LCBkb3VibGUgeSkKICAgICBtX3Bvc2l0 aW9uLnkgPSB5OwogCiAgICAgUVBvaW50IG1vdXNlUG9zKG1fcG9zaXRpb24ueCwgbV9wb3NpdGlv bi55KTsKLSAgICBRR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQqIGV2ZW50ID0gY3JlYXRlR3JhcGhp Y3NTY2VuZU1vdXNlRXZlbnQoUUV2ZW50OjpHcmFwaGljc1NjZW5lTW91c2VNb3ZlLAorICAgIFFN b3VzZUV2ZW50KiBldmVudCA9IGNyZWF0ZU1vdXNlRXZlbnQoUUV2ZW50OjpNb3VzZU1vdmUsCiAg ICAgICAgIG1vdXNlUG9zLCBtb3VzZVBvcywgUXQ6Ok5vQnV0dG9uLCBtX21vdXNlQnV0dG9ucywg UXQ6Ok5vTW9kaWZpZXIpOwogCiAgICAgc2VuZE9yUXVldWVFdmVudChldmVudCk7Cg== 109294 2011-09-30 07:03:37 -0700 2011-09-30 07:38:34 -0700 patch for review. 69145.patch text/plain 4210 zeno ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1MWMw ZTBiLi44OGMyMjg4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDktMzAgIFplbm8gQWxiaXNzZXIgIDx6ZW5v LmFsYmlzc2VyQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gQ2hhbmdlIFdlYktpdFRl c3RSdW5uZXIgdG8gdXNlIFFNb3VzZUV2ZW50cyBpbnN0ZWFkIG9mIFFHcmFwaGljc1NjZW5lTW91 c2VFdmVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY5MTQ1CisKKyAgICAgICAgVGhpcyBpcyBhIGZvbGxvdyB1cCB0byBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkxMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94 eS5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvcXQvRXZlbnRTZW5kZXJQcm94eVF0LmNw cDoKKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6Y3JlYXRlTW91c2VFdmVudCk6Cisg ICAgICAgIChXVFI6OkV2ZW50U2VuZGVyUHJveHk6Om1vdXNlRG93bik6CisgICAgICAgIChXVFI6 OkV2ZW50U2VuZGVyUHJveHk6Om1vdXNlVXApOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclBy b3h5Ojptb3VzZU1vdmVUbyk6CisKIDIwMTEtMDktMzAgIEphbWVzIFJvYmluc29uICA8amFtZXNy QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEFkZCBXZWJLaXQgQVBJIGZvciBz ZW5kaW5nIGlucHV0IGV2ZW50cyB0byB0aGUgY29tcG9zaXRvciB0aHJlYWQKZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmgKaW5kZXggODU3YWQ0YS4uMmVkOGU2ZiAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmgKKysrIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmgKQEAgLTUxLDcgKzUxLDcg QEAgcHJpdmF0ZToKICNpZiBQTEFURk9STShRVCkKICAgICB2b2lkIHNlbmRPclF1ZXVlRXZlbnQo UUV2ZW50Kik7CiAgICAgdm9pZCByZXBsYXlTYXZlZEV2ZW50cygpOwotICAgIFFHcmFwaGljc1Nj ZW5lTW91c2VFdmVudCogY3JlYXRlR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQoUUV2ZW50OjpUeXBl LCBjb25zdCBRUG9pbnQmIHBvcywgY29uc3QgUVBvaW50JiBzY3JlZW5Qb3MsIFF0OjpNb3VzZUJ1 dHRvbiwgUXQ6Ok1vdXNlQnV0dG9ucywgUXQ6OktleWJvYXJkTW9kaWZpZXJzKTsKKyAgICBRTW91 c2VFdmVudCogY3JlYXRlTW91c2VFdmVudChRRXZlbnQ6OlR5cGUsIGNvbnN0IFFQb2ludCYgcG9z LCBjb25zdCBRUG9pbnQmIHNjcmVlblBvcywgUXQ6Ok1vdXNlQnV0dG9uLCBRdDo6TW91c2VCdXR0 b25zLCBRdDo6S2V5Ym9hcmRNb2RpZmllcnMpOwogI2VuZGlmCiAKICAgICBkb3VibGUgbV90aW1l OwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5 UXQuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5UXQuY3Bw CmluZGV4IDA5ZDQwYzYuLjhkOTI2OGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvcXQvRXZlbnRTZW5kZXJQcm94eVF0LmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L3F0L0V2ZW50U2VuZGVyUHJveHlRdC5jcHAKQEAgLTI1NSwxNiArMjU1LDEwIEBAIHZvaWQgRXZl bnRTZW5kZXJQcm94eTo6dXBkYXRlQ2xpY2tDb3VudEZvckJ1dHRvbihpbnQgYnV0dG9uKQogICAg IG1fY2xpY2tCdXR0b24gPSBidXR0b247CiB9CiAKLVFHcmFwaGljc1NjZW5lTW91c2VFdmVudCog RXZlbnRTZW5kZXJQcm94eTo6Y3JlYXRlR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQoUUV2ZW50OjpU eXBlIHR5cGUsIGNvbnN0IFFQb2ludCYgcG9zLCBjb25zdCBRUG9pbnQmIHNjcmVlblBvcywgUXQ6 Ok1vdXNlQnV0dG9uIGJ1dHRvbiwgUXQ6Ok1vdXNlQnV0dG9ucyBidXR0b25zLCBRdDo6S2V5Ym9h cmRNb2RpZmllcnMgbW9kaWZpZXJzKQorUU1vdXNlRXZlbnQqIEV2ZW50U2VuZGVyUHJveHk6OmNy ZWF0ZU1vdXNlRXZlbnQoUUV2ZW50OjpUeXBlIHR5cGUsIGNvbnN0IFFQb2ludCYgcG9zLCBjb25z dCBRUG9pbnQmIHNjcmVlblBvcywgUXQ6Ok1vdXNlQnV0dG9uIGJ1dHRvbiwgUXQ6Ok1vdXNlQnV0 dG9ucyBidXR0b25zLCBRdDo6S2V5Ym9hcmRNb2RpZmllcnMgbW9kaWZpZXJzKQogewotICAgIFFH cmFwaGljc1NjZW5lTW91c2VFdmVudCogZXZlbnQ7Ci0gICAgZXZlbnQgPSBuZXcgUUdyYXBoaWNz U2NlbmVNb3VzZUV2ZW50KHR5cGUpOwotICAgIGV2ZW50LT5zZXRQb3MocG9zKTsKLSAgICBldmVu dC0+c2V0U2NyZWVuUG9zKHNjcmVlblBvcyk7Ci0gICAgZXZlbnQtPnNldEJ1dHRvbihidXR0b24p OwotICAgIGV2ZW50LT5zZXRCdXR0b25zKGJ1dHRvbnMpOwotICAgIGV2ZW50LT5zZXRNb2RpZmll cnMobW9kaWZpZXJzKTsKLQorICAgIFFNb3VzZUV2ZW50KiBldmVudDsKKyAgICBldmVudCA9IG5l dyBRTW91c2VFdmVudCh0eXBlLCBwb3MsIGJ1dHRvbiwgYnV0dG9ucywgbW9kaWZpZXJzKTsKICAg ICByZXR1cm4gZXZlbnQ7CiB9CiAKQEAgLTI3OCw3ICsyNzIsNyBAQCB2b2lkIEV2ZW50U2VuZGVy UHJveHk6Om1vdXNlRG93bih1bnNpZ25lZCBidXR0b24sIFdLRXZlbnRNb2RpZmllcnMgd2tNb2Rp ZmllcnMpCiAgICAgbV9tb3VzZUJ1dHRvbnMgfD0gbW91c2VCdXR0b247CiAKICAgICBRUG9pbnQg bW91c2VQb3MobV9wb3NpdGlvbi54LCBtX3Bvc2l0aW9uLnkpOwotICAgIFFHcmFwaGljc1NjZW5l TW91c2VFdmVudCogZXZlbnQgPSBjcmVhdGVHcmFwaGljc1NjZW5lTW91c2VFdmVudCgobV9jbGlj a0NvdW50ID09IDIpID8gUUV2ZW50OjpHcmFwaGljc1NjZW5lTW91c2VEb3VibGVDbGljayA6IFFF dmVudDo6R3JhcGhpY3NTY2VuZU1vdXNlUHJlc3MsCisgICAgUU1vdXNlRXZlbnQqIGV2ZW50ID0g Y3JlYXRlTW91c2VFdmVudCgobV9jbGlja0NvdW50ID09IDIpID8gUUV2ZW50OjpNb3VzZUJ1dHRv bkRibENsaWNrIDogUUV2ZW50OjpNb3VzZUJ1dHRvblByZXNzLAogICAgICAgICBtb3VzZVBvcywg bW91c2VQb3MsIG1vdXNlQnV0dG9uLCBtX21vdXNlQnV0dG9ucywgbW9kaWZpZXJzKTsKIAogICAg IHNlbmRPclF1ZXVlRXZlbnQoZXZlbnQpOwpAQCAtMjkwLDcgKzI4NCw3IEBAIHZvaWQgRXZlbnRT ZW5kZXJQcm94eTo6bW91c2VVcCh1bnNpZ25lZCBidXR0b24sIFdLRXZlbnRNb2RpZmllcnMpCiAg ICAgbV9tb3VzZUJ1dHRvbnMgJj0gfm1vdXNlQnV0dG9uOwogCiAgICAgUVBvaW50IG1vdXNlUG9z KG1fcG9zaXRpb24ueCwgbV9wb3NpdGlvbi55KTsKLSAgICBRR3JhcGhpY3NTY2VuZU1vdXNlRXZl bnQqIGV2ZW50ID0gY3JlYXRlR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQoUUV2ZW50OjpHcmFwaGlj c1NjZW5lTW91c2VSZWxlYXNlLAorICAgIFFNb3VzZUV2ZW50KiBldmVudCA9IGNyZWF0ZU1vdXNl RXZlbnQoUUV2ZW50OjpNb3VzZUJ1dHRvblJlbGVhc2UsCiAgICAgICAgIG1vdXNlUG9zLCBtb3Vz ZVBvcywgbW91c2VCdXR0b24sIG1fbW91c2VCdXR0b25zLCBRdDo6Tm9Nb2RpZmllcik7CiAKICAg ICBzZW5kT3JRdWV1ZUV2ZW50KGV2ZW50KTsKQEAgLTMwMiw3ICsyOTYsNyBAQCB2b2lkIEV2ZW50 U2VuZGVyUHJveHk6Om1vdXNlTW92ZVRvKGRvdWJsZSB4LCBkb3VibGUgeSkKICAgICBtX3Bvc2l0 aW9uLnkgPSB5OwogCiAgICAgUVBvaW50IG1vdXNlUG9zKG1fcG9zaXRpb24ueCwgbV9wb3NpdGlv bi55KTsKLSAgICBRR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQqIGV2ZW50ID0gY3JlYXRlR3JhcGhp Y3NTY2VuZU1vdXNlRXZlbnQoUUV2ZW50OjpHcmFwaGljc1NjZW5lTW91c2VNb3ZlLAorICAgIFFN b3VzZUV2ZW50KiBldmVudCA9IGNyZWF0ZU1vdXNlRXZlbnQoUUV2ZW50OjpNb3VzZU1vdmUsCiAg ICAgICAgIG1vdXNlUG9zLCBtb3VzZVBvcywgUXQ6Ok5vQnV0dG9uLCBtX21vdXNlQnV0dG9ucywg UXQ6Ok5vTW9kaWZpZXIpOwogCiAgICAgc2VuZE9yUXVldWVFdmVudChldmVudCk7Cg== 109297 2011-09-30 07:38:34 -0700 2011-09-30 07:53:08 -0700 patch for review - updated according to feedback. 69145_2.patch text/plain 4252 zeno ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1MWMw ZTBiLi43OGYwODBhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDktMzAgIFplbm8gQWxiaXNzZXIgIDx6ZW5v LmFsYmlzc2VyQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gQ2hhbmdlIFdlYktpdFRl c3RSdW5uZXIgdG8gdXNlIFFNb3VzZUV2ZW50cyBpbnN0ZWFkIG9mIFFHcmFwaGljc1NjZW5lTW91 c2VFdmVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY5MTQ1CisKKyAgICAgICAgVGhpcyBpcyBhIGZvbGxvdyB1cCB0byBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkxMDUKKyAgICAgICAgRHVlIHRvIHJlZmFjdG9yaW5n cyBpbiBRdDUsIFFNb3VzZUV2ZW50IG5vdyBzdXBwb3J0cyBmbG9hdGluZyBwb2ludCBjb29yZGlu YXRlcworICAgICAgICBhbmQgaXMgcGVyZmVjdGx5IHN1aXRhYmxlIGZvciBTY2VuZUdyYXBoIGFz IHdlbGwuIEdyYXBoaWNzU2NlbmUgZXZlbnRzCisgICAgICAgIHdpbGwgbm90IGJlIGF2YWlsYWJs ZSBpbiBRdEd1aSBhbnltb3JlIGluIGZ1dHVyZS4gVGhlcmVmb3JlIHdlIGFsc28gaGF2ZSB0byBj aGFuZ2UKKyAgICAgICAgUXRXZWJLaXQgdG8gdXNlIFFNb3VzZUV2ZW50cyBpbnN0ZWFkIG9mIFFH cmFwaGljc1NjZW5lTW91c2VFdmVudHMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaDoK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL3F0L0V2ZW50U2VuZGVyUHJveHlRdC5jcHA6Cisg ICAgICAgIChXVFI6OkV2ZW50U2VuZGVyUHJveHk6OmNyZWF0ZU1vdXNlRXZlbnQpOgorICAgICAg ICAoV1RSOjpFdmVudFNlbmRlclByb3h5Ojptb3VzZURvd24pOgorICAgICAgICAoV1RSOjpFdmVu dFNlbmRlclByb3h5Ojptb3VzZVVwKToKKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6 bW91c2VNb3ZlVG8pOgorCiAyMDExLTA5LTMwICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBBZGQgV2ViS2l0IEFQSSBmb3Igc2VuZGlu ZyBpbnB1dCBldmVudHMgdG8gdGhlIGNvbXBvc2l0b3IgdGhyZWFkCmRpZmYgLS1naXQgYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaCBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oCmluZGV4IDg1N2FkNGEuLmQ0ZWI5YzggMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oCisrKyBiL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oCkBAIC01MSw3ICs1MSw2IEBAIHBy aXZhdGU6CiAjaWYgUExBVEZPUk0oUVQpCiAgICAgdm9pZCBzZW5kT3JRdWV1ZUV2ZW50KFFFdmVu dCopOwogICAgIHZvaWQgcmVwbGF5U2F2ZWRFdmVudHMoKTsKLSAgICBRR3JhcGhpY3NTY2VuZU1v dXNlRXZlbnQqIGNyZWF0ZUdyYXBoaWNzU2NlbmVNb3VzZUV2ZW50KFFFdmVudDo6VHlwZSwgY29u c3QgUVBvaW50JiBwb3MsIGNvbnN0IFFQb2ludCYgc2NyZWVuUG9zLCBRdDo6TW91c2VCdXR0b24s IFF0OjpNb3VzZUJ1dHRvbnMsIFF0OjpLZXlib2FyZE1vZGlmaWVycyk7CiAjZW5kaWYKIAogICAg IGRvdWJsZSBtX3RpbWU7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L0V2 ZW50U2VuZGVyUHJveHlRdC5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L0V2ZW50U2Vu ZGVyUHJveHlRdC5jcHAKaW5kZXggMDlkNDBjNi4uZjg5N2I2MSAxMDA2NDQKLS0tIGEvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5UXQuY3BwCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvcXQvRXZlbnRTZW5kZXJQcm94eVF0LmNwcApAQCAtMjU1LDE5ICsyNTUs NiBAQCB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OnVwZGF0ZUNsaWNrQ291bnRGb3JCdXR0b24oaW50 IGJ1dHRvbikKICAgICBtX2NsaWNrQnV0dG9uID0gYnV0dG9uOwogfQogCi1RR3JhcGhpY3NTY2Vu ZU1vdXNlRXZlbnQqIEV2ZW50U2VuZGVyUHJveHk6OmNyZWF0ZUdyYXBoaWNzU2NlbmVNb3VzZUV2 ZW50KFFFdmVudDo6VHlwZSB0eXBlLCBjb25zdCBRUG9pbnQmIHBvcywgY29uc3QgUVBvaW50JiBz Y3JlZW5Qb3MsIFF0OjpNb3VzZUJ1dHRvbiBidXR0b24sIFF0OjpNb3VzZUJ1dHRvbnMgYnV0dG9u cywgUXQ6OktleWJvYXJkTW9kaWZpZXJzIG1vZGlmaWVycykKLXsKLSAgICBRR3JhcGhpY3NTY2Vu ZU1vdXNlRXZlbnQqIGV2ZW50OwotICAgIGV2ZW50ID0gbmV3IFFHcmFwaGljc1NjZW5lTW91c2VF dmVudCh0eXBlKTsKLSAgICBldmVudC0+c2V0UG9zKHBvcyk7Ci0gICAgZXZlbnQtPnNldFNjcmVl blBvcyhzY3JlZW5Qb3MpOwotICAgIGV2ZW50LT5zZXRCdXR0b24oYnV0dG9uKTsKLSAgICBldmVu dC0+c2V0QnV0dG9ucyhidXR0b25zKTsKLSAgICBldmVudC0+c2V0TW9kaWZpZXJzKG1vZGlmaWVy cyk7Ci0KLSAgICByZXR1cm4gZXZlbnQ7Ci19Ci0KIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6bW91 c2VEb3duKHVuc2lnbmVkIGJ1dHRvbiwgV0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycykKIHsK ICAgICBRdDo6S2V5Ym9hcmRNb2RpZmllcnMgbW9kaWZpZXJzID0gZ2V0TW9kaWZpZXJzKHdrTW9k aWZpZXJzKTsKQEAgLTI3OCw3ICsyNjUsNyBAQCB2b2lkIEV2ZW50U2VuZGVyUHJveHk6Om1vdXNl RG93bih1bnNpZ25lZCBidXR0b24sIFdLRXZlbnRNb2RpZmllcnMgd2tNb2RpZmllcnMpCiAgICAg bV9tb3VzZUJ1dHRvbnMgfD0gbW91c2VCdXR0b247CiAKICAgICBRUG9pbnQgbW91c2VQb3MobV9w b3NpdGlvbi54LCBtX3Bvc2l0aW9uLnkpOwotICAgIFFHcmFwaGljc1NjZW5lTW91c2VFdmVudCog ZXZlbnQgPSBjcmVhdGVHcmFwaGljc1NjZW5lTW91c2VFdmVudCgobV9jbGlja0NvdW50ID09IDIp ID8gUUV2ZW50OjpHcmFwaGljc1NjZW5lTW91c2VEb3VibGVDbGljayA6IFFFdmVudDo6R3JhcGhp Y3NTY2VuZU1vdXNlUHJlc3MsCisgICAgUU1vdXNlRXZlbnQqIGV2ZW50ID0gbmV3IFFNb3VzZUV2 ZW50KChtX2NsaWNrQ291bnQgPT0gMikgPyBRRXZlbnQ6Ok1vdXNlQnV0dG9uRGJsQ2xpY2sgOiBR RXZlbnQ6Ok1vdXNlQnV0dG9uUHJlc3MsCiAgICAgICAgIG1vdXNlUG9zLCBtb3VzZVBvcywgbW91 c2VCdXR0b24sIG1fbW91c2VCdXR0b25zLCBtb2RpZmllcnMpOwogCiAgICAgc2VuZE9yUXVldWVF dmVudChldmVudCk7CkBAIC0yOTAsNyArMjc3LDcgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5Ojpt b3VzZVVwKHVuc2lnbmVkIGJ1dHRvbiwgV0tFdmVudE1vZGlmaWVycykKICAgICBtX21vdXNlQnV0 dG9ucyAmPSB+bW91c2VCdXR0b247CiAKICAgICBRUG9pbnQgbW91c2VQb3MobV9wb3NpdGlvbi54 LCBtX3Bvc2l0aW9uLnkpOwotICAgIFFHcmFwaGljc1NjZW5lTW91c2VFdmVudCogZXZlbnQgPSBj cmVhdGVHcmFwaGljc1NjZW5lTW91c2VFdmVudChRRXZlbnQ6OkdyYXBoaWNzU2NlbmVNb3VzZVJl bGVhc2UsCisgICAgUU1vdXNlRXZlbnQqIGV2ZW50ID0gbmV3IFFNb3VzZUV2ZW50KFFFdmVudDo6 TW91c2VCdXR0b25SZWxlYXNlLAogICAgICAgICBtb3VzZVBvcywgbW91c2VQb3MsIG1vdXNlQnV0 dG9uLCBtX21vdXNlQnV0dG9ucywgUXQ6Ok5vTW9kaWZpZXIpOwogCiAgICAgc2VuZE9yUXVldWVF dmVudChldmVudCk7CkBAIC0zMDIsNyArMjg5LDcgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5Ojpt b3VzZU1vdmVUbyhkb3VibGUgeCwgZG91YmxlIHkpCiAgICAgbV9wb3NpdGlvbi55ID0geTsKIAog ICAgIFFQb2ludCBtb3VzZVBvcyhtX3Bvc2l0aW9uLngsIG1fcG9zaXRpb24ueSk7Ci0gICAgUUdy YXBoaWNzU2NlbmVNb3VzZUV2ZW50KiBldmVudCA9IGNyZWF0ZUdyYXBoaWNzU2NlbmVNb3VzZUV2 ZW50KFFFdmVudDo6R3JhcGhpY3NTY2VuZU1vdXNlTW92ZSwKKyAgICBRTW91c2VFdmVudCogZXZl bnQgPSBuZXcgUU1vdXNlRXZlbnQoUUV2ZW50OjpNb3VzZU1vdmUsCiAgICAgICAgIG1vdXNlUG9z LCBtb3VzZVBvcywgUXQ6Ok5vQnV0dG9uLCBtX21vdXNlQnV0dG9ucywgUXQ6Ok5vTW9kaWZpZXIp OwogCiAgICAgc2VuZE9yUXVldWVFdmVudChldmVudCk7Cg==