61802 2011-05-31 13:26:19 -0700 [Qt][WK2] Add QGLWidget viewport support to MiniBrowser 2011-06-01 10:55:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 1 ostap73 webkit-unassigned commit-queue webkit.review.bot oldest_to_newest 412820 0 ostap73 2011-05-31 13:26:19 -0700 Add command line parameter and menu item to MiniBrowser application enabling use of QGLWidget for browser viewport. 412825 1 95472 ostap73 2011-05-31 13:30:52 -0700 Created attachment 95472 Add QGLWidget viewport mode to minibrowser app. 412828 2 webkit.review.bot 2011-05-31 13:34:05 -0700 Attachment 95472 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/MiniBrowser/qt/B..." exit_code: 1 Tools/MiniBrowser/qt/BrowserView.cpp:48: Missing space before ( in if( [whitespace/parens] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 412834 3 95476 ostap73 2011-05-31 13:39:08 -0700 Created attachment 95476 Fix style problem 412901 4 95476 hausmann 2011-05-31 15:04:26 -0700 Comment on attachment 95476 Fix style problem View in context: https://bugs.webkit.org/attachment.cgi?id=95476&action=review r=me At some point we should probably make that simply the default... > Tools/MiniBrowser/qt/BrowserView.cpp:49 > + setViewport(new QGLWidget()); Nitpick, here you use new GLWidget() and further down just "new QGLWidget" > Tools/MiniBrowser/qt/BrowserView.cpp:76 > +void BrowserView::toggleGLViewport(bool useQGLWidgetViewport) > +{ > +#if defined(QT_CONFIGURED_WITH_OPENGL) > + setViewport(useQGLWidgetViewport ? new QGLWidget : 0); > +#endif > +} setViewport is a public method, so this code doesn't actually have to live in BrowserView but could also be done from the outside. 412959 5 ostap73 2011-05-31 15:59:18 -0700 (In reply to comment #4) > (From update of attachment 95476 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95476&action=review > > r=me > > At some point we should probably make that simply the default... > > > Tools/MiniBrowser/qt/BrowserView.cpp:49 > > + setViewport(new QGLWidget()); > > Nitpick, here you use new GLWidget() and further down just "new QGLWidget" > > > Tools/MiniBrowser/qt/BrowserView.cpp:76 > > +void BrowserView::toggleGLViewport(bool useQGLWidgetViewport) > > +{ > > +#if defined(QT_CONFIGURED_WITH_OPENGL) > > + setViewport(useQGLWidgetViewport ? new QGLWidget : 0); > > +#endif > > +} > > setViewport is a public method, so this code doesn't actually have to live in BrowserView but could also be done from the outside. Ooops! It's already committed. Should I make those changes as separate patch? 412960 6 ostap73 2011-05-31 16:00:53 -0700 Removed from commit queue to address some issues mentioned by Simon. 412968 7 95504 ostap73 2011-05-31 16:21:06 -0700 Created attachment 95504 Fix issues from Simon review. 413368 8 95504 kling 2011-06-01 07:34:44 -0700 Comment on attachment 95504 Fix issues from Simon review. LGTM 413497 9 commit-queue 2011-06-01 10:53:49 -0700 The commit-queue encountered the following flaky tests while processing attachment 95504: http/tests/websocket/tests/frame-length-longer-than-buffer.html bug 61837 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 413501 10 95504 commit-queue 2011-06-01 10:55:20 -0700 Comment on attachment 95504 Fix issues from Simon review. Clearing flags on attachment: 95504 Committed r87824: <http://trac.webkit.org/changeset/87824> 413502 11 commit-queue 2011-06-01 10:55:27 -0700 All reviewed patches have been landed. Closing bug. 95472 2011-05-31 13:30:52 -0700 2011-05-31 13:39:08 -0700 Add QGLWidget viewport mode to minibrowser app. minibrowser_glwidget_01.diff text/plain 6415 ostap73 ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxODkz MDBhLi5lNzQ4NDI3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDUtMzEgIFZpYXRjaGVzbGF2IE9zdGFwZW5r byAgPG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtXSzJdIEFkZCBRR0xXaWRnZXQgdmll d3BvcnQgc3VwcG9ydCB0byBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE4MDIKKworICAgICAgICBBZGQgY29tbWFuZCBsaW5lIHBh cmFtZXRlciBhbmQgbWVudSBpdGVtIHRvIE1pbmlCcm93c2VyIGFwcGxpY2F0aW9uIAorICAgICAg ICBlbmFibGluZyB1c2Ugb2YgUUdMV2lkZ2V0IGZvciBicm93c2VyIHZpZXdwb3J0LgorCisgICAg ICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3NlclZpZXcuY3BwOgorICAgICAgICAoQnJvd3NlclZp ZXc6OkJyb3dzZXJWaWV3KToKKyAgICAgICAgKEJyb3dzZXJWaWV3Ojp0b2dnbGVHTFZpZXdwb3J0 KToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyVmlldy5oOgorICAgICAgICAqIE1p bmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwOgorICAgICAgICAoQnJvd3NlcldpbmRvdzo6 QnJvd3NlcldpbmRvdyk6CisgICAgICAgICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBs aWNhdGlvbi5jcHA6CisgICAgICAgIChNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpoYW5kbGVVc2Vy T3B0aW9ucyk6CisgICAgICAgICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlv bi5oOgorICAgICAgICAoV2luZG93T3B0aW9uczo6V2luZG93T3B0aW9ucyk6CisKIDIwMTEtMDUt MzEgIEtyaXN0w7NmIEtvc3p0ecOzICA8S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlclZpZXcuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIv cXQvQnJvd3NlclZpZXcuY3BwCmluZGV4IDdkNjQyNmUuLmZmODgyYTUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJWaWV3LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9xdC9Ccm93c2VyVmlldy5jcHAKQEAgLTI4LDkgKzI4LDEyIEBACiAKICNpbmNsdWRlICJCcm93 c2VyVmlldy5oIgogCisjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQorI2lu Y2x1ZGUgPFFHTFdpZGdldD4KKyNlbmRpZgogI2luY2x1ZGUgPFFHcmFwaGljc1NjZW5lPgogCi1C cm93c2VyVmlldzo6QnJvd3NlclZpZXcoUUdyYXBoaWNzV0tWaWV3OjpCYWNraW5nU3RvcmVUeXBl IGJhY2tpbmdTdG9yZVR5cGUsIFFXS0NvbnRleHQqIGNvbnRleHQsIFFXaWRnZXQqIHBhcmVudCkK K0Jyb3dzZXJWaWV3OjpCcm93c2VyVmlldyhRR3JhcGhpY3NXS1ZpZXc6OkJhY2tpbmdTdG9yZVR5 cGUgYmFja2luZ1N0b3JlVHlwZSwgUVdLQ29udGV4dCogY29udGV4dCwgYm9vbCB1c2VRR0xXaWRn ZXRWaWV3cG9ydCwgUVdpZGdldCogcGFyZW50KQogICAgIDogUUdyYXBoaWNzVmlldyhwYXJlbnQp CiAgICAgLCBtX2l0ZW0oMCkKIHsKQEAgLTQxLDYgKzQ0LDEwIEBAIEJyb3dzZXJWaWV3OjpCcm93 c2VyVmlldyhRR3JhcGhpY3NXS1ZpZXc6OkJhY2tpbmdTdG9yZVR5cGUgYmFja2luZ1N0b3JlVHlw ZSwgUVdLCiAgICAgc2V0RnJhbWVTaGFwZShRRnJhbWU6Ok5vRnJhbWUpOwogICAgIHNldEhvcml6 b250YWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7CiAgICAgc2V0VmVy dGljYWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7CisjaWYgZGVmaW5l ZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQorICAgIGlmKHVzZVFHTFdpZGdldFZpZXdwb3J0 KQorICAgICAgICBzZXRWaWV3cG9ydChuZXcgUUdMV2lkZ2V0KCkpOworI2VuZGlmCiB9CiAKIHZv aWQgQnJvd3NlclZpZXc6OnJlc2l6ZUV2ZW50KFFSZXNpemVFdmVudCogZXZlbnQpCkBAIC02MCwz ICs2NywxMCBAQCBRR3JhcGhpY3NXS1ZpZXcqIEJyb3dzZXJWaWV3Ojp2aWV3KCkgY29uc3QKIHsK ICAgICByZXR1cm4gbV9pdGVtOwogfQorCit2b2lkIEJyb3dzZXJWaWV3Ojp0b2dnbGVHTFZpZXdw b3J0KGJvb2wgdXNlUUdMV2lkZ2V0Vmlld3BvcnQpCit7CisjaWYgZGVmaW5lZChRVF9DT05GSUdV UkVEX1dJVEhfT1BFTkdMKQorICAgIHNldFZpZXdwb3J0KHVzZVFHTFdpZGdldFZpZXdwb3J0ID8g bmV3IFFHTFdpZGdldCA6IDApOworI2VuZGlmCit9CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci9xdC9Ccm93c2VyVmlldy5oIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlclZpZXcu aAppbmRleCA1OTMwMDZlLi45NzMyZmQ2IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9x dC9Ccm93c2VyVmlldy5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJWaWV3LmgK QEAgLTM3LDEyICszNywxNSBAQCBjbGFzcyBCcm93c2VyVmlldyA6IHB1YmxpYyBRR3JhcGhpY3NW aWV3IHsKICAgICBRX09CSkVDVAogCiBwdWJsaWM6Ci0gICAgQnJvd3NlclZpZXcoUUdyYXBoaWNz V0tWaWV3OjpCYWNraW5nU3RvcmVUeXBlLCBRV0tDb250ZXh0KiwgUVdpZGdldCogcGFyZW50ID0g MCk7CisgICAgQnJvd3NlclZpZXcoUUdyYXBoaWNzV0tWaWV3OjpCYWNraW5nU3RvcmVUeXBlLCBR V0tDb250ZXh0KiwgYm9vbCwgUVdpZGdldCogcGFyZW50ID0gMCk7CiAgICAgdmlydHVhbCB+QnJv d3NlclZpZXcoKSB7IGRlbGV0ZSBtX2l0ZW07IH0KIAogICAgIHZvaWQgbG9hZChjb25zdCBRU3Ry aW5nJik7CiAgICAgUUdyYXBoaWNzV0tWaWV3KiB2aWV3KCkgY29uc3Q7CiAKK3B1YmxpYyBzbG90 czoKKyAgICB2b2lkIHRvZ2dsZUdMVmlld3BvcnQoYm9vbCk7CisKIHByb3RlY3RlZDoKICAgICB2 aXJ0dWFsIHZvaWQgcmVzaXplRXZlbnQoUVJlc2l6ZUV2ZW50Kik7CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIv cXQvQnJvd3NlcldpbmRvdy5jcHAKaW5kZXggMWM0N2NmYS4uZGY0OTAzYyAxMDA2NDQKLS0tIGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKKysrIGIvVG9vbHMvTWluaUJy b3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKQEAgLTUyLDEwICs1MiwxNSBAQCBCcm93c2VyV2lu ZG93OjpCcm93c2VyV2luZG93KFFXS0NvbnRleHQqIGNvbnRleHQsIFdpbmRvd09wdGlvbnMqIG9w dGlvbnMpCiAgICAgICAgIG1fd2luZG93T3B0aW9ucyA9IHRtcE9wdGlvbnM7CiAgICAgfQogCisj aWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQorICAgIGJvb2wgdXNlUUdMV2lk Z2V0Vmlld3BvcnQgPSBtX3dpbmRvd09wdGlvbnMudXNlUUdMV2lkZ2V0Vmlld3BvcnQ7CisjZWxz ZQorICAgIGJvb2wgdXNlUUdMV2lkZ2V0Vmlld3BvcnQgPSBmYWxzZTsKKyNlbmRpZgogICAgIGlm IChtX3dpbmRvd09wdGlvbnMudXNlVGlsZWRCYWNraW5nU3RvcmUpCi0gICAgICAgIG1fYnJvd3Nl ciA9IG5ldyBCcm93c2VyVmlldyhRR3JhcGhpY3NXS1ZpZXc6OlRpbGVkLCBjb250ZXh0KTsKKyAg ICAgICAgbV9icm93c2VyID0gbmV3IEJyb3dzZXJWaWV3KFFHcmFwaGljc1dLVmlldzo6VGlsZWQs IGNvbnRleHQsIHVzZVFHTFdpZGdldFZpZXdwb3J0KTsKICAgICBlbHNlCi0gICAgICAgIG1fYnJv d3NlciA9IG5ldyBCcm93c2VyVmlldyhRR3JhcGhpY3NXS1ZpZXc6OlNpbXBsZSwgY29udGV4dCk7 CisgICAgICAgIG1fYnJvd3NlciA9IG5ldyBCcm93c2VyVmlldyhRR3JhcGhpY3NXS1ZpZXc6OlNp bXBsZSwgY29udGV4dCwgdXNlUUdMV2lkZ2V0Vmlld3BvcnQpOwogCiAgICAgc2V0QXR0cmlidXRl KFF0OjpXQV9EZWxldGVPbkNsb3NlKTsKIApAQCAtMTA2LDYgKzExMSwxMSBAQCBCcm93c2VyV2lu ZG93OjpCcm93c2VyV2luZG93KFFXS0NvbnRleHQqIGNvbnRleHQsIFdpbmRvd09wdGlvbnMqIG9w dGlvbnMpCiAgICAgUUFjdGlvbiogdG9nZ2xlRnJhbWVGbGF0dGVuaW5nID0gdG9vbHNNZW51LT5h ZGRBY3Rpb24oIlRvZ2dsZSBGcmFtZSBGbGF0dGVuaW5nIiwgdGhpcywgU0xPVCh0b2dnbGVGcmFt ZUZsYXR0ZW5pbmcoYm9vbCkpKTsKICAgICB0b2dnbGVGcmFtZUZsYXR0ZW5pbmctPnNldENoZWNr YWJsZSh0cnVlKTsKICAgICB0b2dnbGVGcmFtZUZsYXR0ZW5pbmctPnNldENoZWNrZWQoZmFsc2Up OworI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKKyAgICBRQWN0aW9uKiB0 b2dnbGVHTFZpZXdwb3J0ID0gdG9vbHNNZW51LT5hZGRBY3Rpb24oIlRvZ2dsZSBHTCBWaWV3cG9y dCIsIG1fYnJvd3NlciwgU0xPVCh0b2dnbGVHTFZpZXdwb3J0KGJvb2wpKSk7CisgICAgdG9nZ2xl R0xWaWV3cG9ydC0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIHRvZ2dsZUdMVmlld3BvcnQtPnNl dENoZWNrZWQodXNlUUdMV2lkZ2V0Vmlld3BvcnQpOworI2VuZGlmCiAgICAgdG9vbHNNZW51LT5h ZGRTZXBhcmF0b3IoKTsKICAgICB0b29sc01lbnUtPmFkZEFjdGlvbigiQ2hhbmdlIFVzZXIgQWdl bnQiLCB0aGlzLCBTTE9UKHNob3dVc2VyQWdlbnREaWFsb2coKSkpOwogICAgIHRvb2xzTWVudS0+ YWRkU2VwYXJhdG9yKCk7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJv d3NlckFwcGxpY2F0aW9uLmNwcCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBw bGljYXRpb24uY3BwCmluZGV4IDkxMjQxOWIuLjAyMDcwN2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwCkBAIC02Miw2ICs2Miw5IEBAIHZv aWQgTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNlck9wdGlvbnMoKQogICAgICAgICAg ICAgIDw8ICJbLWNodW5rZWQtZHJhd2luZy1hcmVhXSIKICAgICAgICAgICAgICA8PCAgIlstc2Vw YXJhdGUtd2ViLXByb2Nlc3MtcGVyLXdpbmRvd10iCiAgICAgICAgICAgICAgPDwgIlstcHJpbnQt bG9hZGVkLXVybHNdIgorI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKKyAg ICAgICAgICAgICA8PCAiWy1nbC12aWV3cG9ydF0iCisjZW5kaWYKICAgICAgICAgICAgICA8PCAi VVJMcyI7CiAgICAgICAgIGFwcFF1aXQoMCk7CiAgICAgfQpAQCAtMTAwLDQgKzEwMyw5IEBAIHZv aWQgTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNlck9wdGlvbnMoKQogCiAgICAgaWYg KGFyZ3MuY29udGFpbnMoIi1wcmludC1sb2FkZWQtdXJscyIpKQogICAgICAgICBtX3dpbmRvd09w dGlvbnMucHJpbnRMb2FkZWRVcmxzID0gdHJ1ZTsKKworI2lmIGRlZmluZWQoUVRfQ09ORklHVVJF RF9XSVRIX09QRU5HTCkKKyAgICBpZiAoYXJncy5jb250YWlucygiLWdsLXZpZXdwb3J0IikpCisg ICAgICAgIG1fd2luZG93T3B0aW9ucy51c2VRR0xXaWRnZXRWaWV3cG9ydCA9IHRydWU7CisjZW5k aWYKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGlj YXRpb24uaCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaApp bmRleCAyZWJhOWI1Li5jNjhiODU4IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9N aW5pQnJvd3NlckFwcGxpY2F0aW9uLmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJy b3dzZXJBcHBsaWNhdGlvbi5oCkBAIC00Miw2ICs0Miw5IEBAIHN0cnVjdCBXaW5kb3dPcHRpb25z IHsKICNlbHNlCiAgICAgICAgICwgc3RhcnRNYXhpbWl6ZWQoZmFsc2UpCiAjZW5kaWYKKyNpZiBk ZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisgICAgICAgICwgdXNlUUdMV2lkZ2V0 Vmlld3BvcnQoZmFsc2UpCisjZW5kaWYKICAgICB7CiAgICAgfQogCkBAIC00OSw2ICs1Miw5IEBA IHN0cnVjdCBXaW5kb3dPcHRpb25zIHsKICAgICBib29sIHVzZVNlcGFyYXRlV2ViUHJvY2Vzc1Bl cldpbmRvdzsKICAgICBib29sIHByaW50TG9hZGVkVXJsczsKICAgICBib29sIHN0YXJ0TWF4aW1p emVkOworI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKKyAgICBib29sIHVz ZVFHTFdpZGdldFZpZXdwb3J0OworI2VuZGlmCiB9OwogCiBjbGFzcyBNaW5pQnJvd3NlckFwcGxp Y2F0aW9uIDogcHVibGljIFFBcHBsaWNhdGlvbiB7Cg== 95476 2011-05-31 13:39:08 -0700 2011-05-31 16:21:06 -0700 Fix style problem minibrowser_glwidget_01.diff text/plain 6416 ostap73 ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxODkz MDBhLi5lNzQ4NDI3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDUtMzEgIFZpYXRjaGVzbGF2IE9zdGFwZW5r byAgPG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtXSzJdIEFkZCBRR0xXaWRnZXQgdmll d3BvcnQgc3VwcG9ydCB0byBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE4MDIKKworICAgICAgICBBZGQgY29tbWFuZCBsaW5lIHBh cmFtZXRlciBhbmQgbWVudSBpdGVtIHRvIE1pbmlCcm93c2VyIGFwcGxpY2F0aW9uIAorICAgICAg ICBlbmFibGluZyB1c2Ugb2YgUUdMV2lkZ2V0IGZvciBicm93c2VyIHZpZXdwb3J0LgorCisgICAg ICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3NlclZpZXcuY3BwOgorICAgICAgICAoQnJvd3NlclZp ZXc6OkJyb3dzZXJWaWV3KToKKyAgICAgICAgKEJyb3dzZXJWaWV3Ojp0b2dnbGVHTFZpZXdwb3J0 KToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyVmlldy5oOgorICAgICAgICAqIE1p bmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwOgorICAgICAgICAoQnJvd3NlcldpbmRvdzo6 QnJvd3NlcldpbmRvdyk6CisgICAgICAgICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBs aWNhdGlvbi5jcHA6CisgICAgICAgIChNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpoYW5kbGVVc2Vy T3B0aW9ucyk6CisgICAgICAgICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlv bi5oOgorICAgICAgICAoV2luZG93T3B0aW9uczo6V2luZG93T3B0aW9ucyk6CisKIDIwMTEtMDUt MzEgIEtyaXN0w7NmIEtvc3p0ecOzICA8S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlclZpZXcuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIv cXQvQnJvd3NlclZpZXcuY3BwCmluZGV4IDdkNjQyNmUuLmE3MjVmY2MgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJWaWV3LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9xdC9Ccm93c2VyVmlldy5jcHAKQEAgLTI4LDkgKzI4LDEyIEBACiAKICNpbmNsdWRlICJCcm93 c2VyVmlldy5oIgogCisjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQorI2lu Y2x1ZGUgPFFHTFdpZGdldD4KKyNlbmRpZgogI2luY2x1ZGUgPFFHcmFwaGljc1NjZW5lPgogCi1C cm93c2VyVmlldzo6QnJvd3NlclZpZXcoUUdyYXBoaWNzV0tWaWV3OjpCYWNraW5nU3RvcmVUeXBl IGJhY2tpbmdTdG9yZVR5cGUsIFFXS0NvbnRleHQqIGNvbnRleHQsIFFXaWRnZXQqIHBhcmVudCkK K0Jyb3dzZXJWaWV3OjpCcm93c2VyVmlldyhRR3JhcGhpY3NXS1ZpZXc6OkJhY2tpbmdTdG9yZVR5 cGUgYmFja2luZ1N0b3JlVHlwZSwgUVdLQ29udGV4dCogY29udGV4dCwgYm9vbCB1c2VRR0xXaWRn ZXRWaWV3cG9ydCwgUVdpZGdldCogcGFyZW50KQogICAgIDogUUdyYXBoaWNzVmlldyhwYXJlbnQp CiAgICAgLCBtX2l0ZW0oMCkKIHsKQEAgLTQxLDYgKzQ0LDEwIEBAIEJyb3dzZXJWaWV3OjpCcm93 c2VyVmlldyhRR3JhcGhpY3NXS1ZpZXc6OkJhY2tpbmdTdG9yZVR5cGUgYmFja2luZ1N0b3JlVHlw ZSwgUVdLCiAgICAgc2V0RnJhbWVTaGFwZShRRnJhbWU6Ok5vRnJhbWUpOwogICAgIHNldEhvcml6 b250YWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7CiAgICAgc2V0VmVy dGljYWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7CisjaWYgZGVmaW5l ZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQorICAgIGlmICh1c2VRR0xXaWRnZXRWaWV3cG9y dCkKKyAgICAgICAgc2V0Vmlld3BvcnQobmV3IFFHTFdpZGdldCgpKTsKKyNlbmRpZgogfQogCiB2 b2lkIEJyb3dzZXJWaWV3OjpyZXNpemVFdmVudChRUmVzaXplRXZlbnQqIGV2ZW50KQpAQCAtNjAs MyArNjcsMTAgQEAgUUdyYXBoaWNzV0tWaWV3KiBCcm93c2VyVmlldzo6dmlldygpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIG1faXRlbTsKIH0KKwordm9pZCBCcm93c2VyVmlldzo6dG9nZ2xlR0xWaWV3 cG9ydChib29sIHVzZVFHTFdpZGdldFZpZXdwb3J0KQoreworI2lmIGRlZmluZWQoUVRfQ09ORklH VVJFRF9XSVRIX09QRU5HTCkKKyAgICBzZXRWaWV3cG9ydCh1c2VRR0xXaWRnZXRWaWV3cG9ydCA/ IG5ldyBRR0xXaWRnZXQgOiAwKTsKKyNlbmRpZgorfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJy b3dzZXIvcXQvQnJvd3NlclZpZXcuaCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJWaWV3 LmgKaW5kZXggNTkzMDA2ZS4uOTczMmZkNiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv cXQvQnJvd3NlclZpZXcuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyVmlldy5o CkBAIC0zNywxMiArMzcsMTUgQEAgY2xhc3MgQnJvd3NlclZpZXcgOiBwdWJsaWMgUUdyYXBoaWNz VmlldyB7CiAgICAgUV9PQkpFQ1QKIAogcHVibGljOgotICAgIEJyb3dzZXJWaWV3KFFHcmFwaGlj c1dLVmlldzo6QmFja2luZ1N0b3JlVHlwZSwgUVdLQ29udGV4dCosIFFXaWRnZXQqIHBhcmVudCA9 IDApOworICAgIEJyb3dzZXJWaWV3KFFHcmFwaGljc1dLVmlldzo6QmFja2luZ1N0b3JlVHlwZSwg UVdLQ29udGV4dCosIGJvb2wsIFFXaWRnZXQqIHBhcmVudCA9IDApOwogICAgIHZpcnR1YWwgfkJy b3dzZXJWaWV3KCkgeyBkZWxldGUgbV9pdGVtOyB9CiAKICAgICB2b2lkIGxvYWQoY29uc3QgUVN0 cmluZyYpOwogICAgIFFHcmFwaGljc1dLVmlldyogdmlldygpIGNvbnN0OwogCitwdWJsaWMgc2xv dHM6CisgICAgdm9pZCB0b2dnbGVHTFZpZXdwb3J0KGJvb2wpOworCiBwcm90ZWN0ZWQ6CiAgICAg dmlydHVhbCB2b2lkIHJlc2l6ZUV2ZW50KFFSZXNpemVFdmVudCopOwogCmRpZmYgLS1naXQgYS9U b29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcCBiL1Rvb2xzL01pbmlCcm93c2Vy L3F0L0Jyb3dzZXJXaW5kb3cuY3BwCmluZGV4IDFjNDdjZmEuLmRmNDkwM2MgMTAwNjQ0Ci0tLSBh L1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwCkBAIC01MiwxMCArNTIsMTUgQEAgQnJvd3Nlcldp bmRvdzo6QnJvd3NlcldpbmRvdyhRV0tDb250ZXh0KiBjb250ZXh0LCBXaW5kb3dPcHRpb25zKiBv cHRpb25zKQogICAgICAgICBtX3dpbmRvd09wdGlvbnMgPSB0bXBPcHRpb25zOwogICAgIH0KIAor I2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKKyAgICBib29sIHVzZVFHTFdp ZGdldFZpZXdwb3J0ID0gbV93aW5kb3dPcHRpb25zLnVzZVFHTFdpZGdldFZpZXdwb3J0OworI2Vs c2UKKyAgICBib29sIHVzZVFHTFdpZGdldFZpZXdwb3J0ID0gZmFsc2U7CisjZW5kaWYKICAgICBp ZiAobV93aW5kb3dPcHRpb25zLnVzZVRpbGVkQmFja2luZ1N0b3JlKQotICAgICAgICBtX2Jyb3dz ZXIgPSBuZXcgQnJvd3NlclZpZXcoUUdyYXBoaWNzV0tWaWV3OjpUaWxlZCwgY29udGV4dCk7Cisg ICAgICAgIG1fYnJvd3NlciA9IG5ldyBCcm93c2VyVmlldyhRR3JhcGhpY3NXS1ZpZXc6OlRpbGVk LCBjb250ZXh0LCB1c2VRR0xXaWRnZXRWaWV3cG9ydCk7CiAgICAgZWxzZQotICAgICAgICBtX2Jy b3dzZXIgPSBuZXcgQnJvd3NlclZpZXcoUUdyYXBoaWNzV0tWaWV3OjpTaW1wbGUsIGNvbnRleHQp OworICAgICAgICBtX2Jyb3dzZXIgPSBuZXcgQnJvd3NlclZpZXcoUUdyYXBoaWNzV0tWaWV3OjpT aW1wbGUsIGNvbnRleHQsIHVzZVFHTFdpZGdldFZpZXdwb3J0KTsKIAogICAgIHNldEF0dHJpYnV0 ZShRdDo6V0FfRGVsZXRlT25DbG9zZSk7CiAKQEAgLTEwNiw2ICsxMTEsMTEgQEAgQnJvd3Nlcldp bmRvdzo6QnJvd3NlcldpbmRvdyhRV0tDb250ZXh0KiBjb250ZXh0LCBXaW5kb3dPcHRpb25zKiBv cHRpb25zKQogICAgIFFBY3Rpb24qIHRvZ2dsZUZyYW1lRmxhdHRlbmluZyA9IHRvb2xzTWVudS0+ YWRkQWN0aW9uKCJUb2dnbGUgRnJhbWUgRmxhdHRlbmluZyIsIHRoaXMsIFNMT1QodG9nZ2xlRnJh bWVGbGF0dGVuaW5nKGJvb2wpKSk7CiAgICAgdG9nZ2xlRnJhbWVGbGF0dGVuaW5nLT5zZXRDaGVj a2FibGUodHJ1ZSk7CiAgICAgdG9nZ2xlRnJhbWVGbGF0dGVuaW5nLT5zZXRDaGVja2VkKGZhbHNl KTsKKyNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisgICAgUUFjdGlvbiog dG9nZ2xlR0xWaWV3cG9ydCA9IHRvb2xzTWVudS0+YWRkQWN0aW9uKCJUb2dnbGUgR0wgVmlld3Bv cnQiLCBtX2Jyb3dzZXIsIFNMT1QodG9nZ2xlR0xWaWV3cG9ydChib29sKSkpOworICAgIHRvZ2ds ZUdMVmlld3BvcnQtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dnbGVHTFZpZXdwb3J0LT5z ZXRDaGVja2VkKHVzZVFHTFdpZGdldFZpZXdwb3J0KTsKKyNlbmRpZgogICAgIHRvb2xzTWVudS0+ YWRkU2VwYXJhdG9yKCk7CiAgICAgdG9vbHNNZW51LT5hZGRBY3Rpb24oIkNoYW5nZSBVc2VyIEFn ZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlhbG9nKCkpKTsKICAgICB0b29sc01lbnUt PmFkZFNlcGFyYXRvcigpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJy b3dzZXJBcHBsaWNhdGlvbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFw cGxpY2F0aW9uLmNwcAppbmRleCA5MTI0MTliLi4wMjA3MDdkIDEwMDY0NAotLS0gYS9Ub29scy9N aW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcAorKysgYi9Ub29scy9NaW5p QnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcApAQCAtNjIsNiArNjIsOSBAQCB2 b2lkIE1pbmlCcm93c2VyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpb25zKCkKICAgICAgICAg ICAgICA8PCAiWy1jaHVua2VkLWRyYXdpbmctYXJlYV0iCiAgICAgICAgICAgICAgPDwgICJbLXNl cGFyYXRlLXdlYi1wcm9jZXNzLXBlci13aW5kb3ddIgogICAgICAgICAgICAgIDw8ICJbLXByaW50 LWxvYWRlZC11cmxzXSIKKyNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisg ICAgICAgICAgICAgPDwgIlstZ2wtdmlld3BvcnRdIgorI2VuZGlmCiAgICAgICAgICAgICAgPDwg IlVSTHMiOwogICAgICAgICBhcHBRdWl0KDApOwogICAgIH0KQEAgLTEwMCw0ICsxMDMsOSBAQCB2 b2lkIE1pbmlCcm93c2VyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpb25zKCkKIAogICAgIGlm IChhcmdzLmNvbnRhaW5zKCItcHJpbnQtbG9hZGVkLXVybHMiKSkKICAgICAgICAgbV93aW5kb3dP cHRpb25zLnByaW50TG9hZGVkVXJscyA9IHRydWU7CisKKyNpZiBkZWZpbmVkKFFUX0NPTkZJR1VS RURfV0lUSF9PUEVOR0wpCisgICAgaWYgKGFyZ3MuY29udGFpbnMoIi1nbC12aWV3cG9ydCIpKQor ICAgICAgICBtX3dpbmRvd09wdGlvbnMudXNlUUdMV2lkZ2V0Vmlld3BvcnQgPSB0cnVlOworI2Vu ZGlmCiB9CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxp Y2F0aW9uLmggYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmgK aW5kZXggMmViYTliNS4uYzY4Yjg1OCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQv TWluaUJyb3dzZXJBcHBsaWNhdGlvbi5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlC cm93c2VyQXBwbGljYXRpb24uaApAQCAtNDIsNiArNDIsOSBAQCBzdHJ1Y3QgV2luZG93T3B0aW9u cyB7CiAjZWxzZQogICAgICAgICAsIHN0YXJ0TWF4aW1pemVkKGZhbHNlKQogI2VuZGlmCisjaWYg ZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQorICAgICAgICAsIHVzZVFHTFdpZGdl dFZpZXdwb3J0KGZhbHNlKQorI2VuZGlmCiAgICAgewogICAgIH0KIApAQCAtNDksNiArNTIsOSBA QCBzdHJ1Y3QgV2luZG93T3B0aW9ucyB7CiAgICAgYm9vbCB1c2VTZXBhcmF0ZVdlYlByb2Nlc3NQ ZXJXaW5kb3c7CiAgICAgYm9vbCBwcmludExvYWRlZFVybHM7CiAgICAgYm9vbCBzdGFydE1heGlt aXplZDsKKyNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisgICAgYm9vbCB1 c2VRR0xXaWRnZXRWaWV3cG9ydDsKKyNlbmRpZgogfTsKIAogY2xhc3MgTWluaUJyb3dzZXJBcHBs aWNhdGlvbiA6IHB1YmxpYyBRQXBwbGljYXRpb24gewo= 95504 2011-05-31 16:21:06 -0700 2011-06-01 10:55:20 -0700 Fix issues from Simon review. minibrowser_glwidget_02.diff text/plain 4973 ostap73 ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxODkz MDBhLi5mNmQ3ZWUwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDUtMzEgIFZpYXRjaGVzbGF2IE9zdGFwZW5r byAgPG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtXSzJdIEFkZCBRR0xXaWRnZXQgdmll d3BvcnQgc3VwcG9ydCB0byBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE4MDIKKworICAgICAgICBBZGQgY29tbWFuZCBsaW5lIHBh cmFtZXRlciBhbmQgbWVudSBpdGVtIHRvIE1pbmlCcm93c2VyIGFwcGxpY2F0aW9uIAorICAgICAg ICBlbmFibGluZyB1c2Ugb2YgUUdMV2lkZ2V0IGZvciBicm93c2VyIHZpZXdwb3J0LgorCisgICAg ICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHA6CisgICAgICAgIChCcm93c2Vy V2luZG93OjpCcm93c2VyV2luZG93KToKKyAgICAgICAgKEJyb3dzZXJXaW5kb3c6OnRvZ2dsZUdM Vmlld3BvcnQpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaDoKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcDoKKyAgICAg ICAgKE1pbmlCcm93c2VyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpb25zKToKKyAgICAgICAg KiBNaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmg6CisgICAgICAgIChXaW5k b3dPcHRpb25zOjpXaW5kb3dPcHRpb25zKToKKwogMjAxMS0wNS0zMSAgS3Jpc3TDs2YgS29zenR5 w7MgIDxLb3N6dHlvLktyaXN0b2ZAc3R1ZC51LXN6ZWdlZC5odT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBDc2FiYSBPc3p0cm9nb27DoWMuCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9x dC9Ccm93c2VyV2luZG93LmNwcCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cu Y3BwCmluZGV4IDFjNDdjZmEuLmYzZThkYTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2Vy L3F0L0Jyb3dzZXJXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJX aW5kb3cuY3BwCkBAIC0zMSw2ICszMSwxMCBAQAogI2luY2x1ZGUgIlVybExvYWRlci5oIgogI2lu Y2x1ZGUgInF3a3ByZWZlcmVuY2VzLmgiCiAKKyNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lU SF9PUEVOR0wpCisjaW5jbHVkZSA8UUdMV2lkZ2V0PgorI2VuZGlmCisKIHN0YXRpYyBRV0tQYWdl KiBuZXdQYWdlRnVuY3Rpb24oUVdLUGFnZSogcGFnZSkKIHsKICAgICBCcm93c2VyV2luZG93KiB3 aW5kb3cgPSBuZXcgQnJvd3NlcldpbmRvdyhwYWdlLT5jb250ZXh0KCkpOwpAQCAtNTcsNiArNjEs MTEgQEAgQnJvd3NlcldpbmRvdzo6QnJvd3NlcldpbmRvdyhRV0tDb250ZXh0KiBjb250ZXh0LCBX aW5kb3dPcHRpb25zKiBvcHRpb25zKQogICAgIGVsc2UKICAgICAgICAgbV9icm93c2VyID0gbmV3 IEJyb3dzZXJWaWV3KFFHcmFwaGljc1dLVmlldzo6U2ltcGxlLCBjb250ZXh0KTsKIAorI2lmIGRl ZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKKyAgICBpZiAobV93aW5kb3dPcHRpb25z LnVzZVFHTFdpZGdldFZpZXdwb3J0KQorICAgICAgICBtX2Jyb3dzZXItPnNldFZpZXdwb3J0KG5l dyBRR0xXaWRnZXQoKSk7CisjZW5kaWYKKwogICAgIHNldEF0dHJpYnV0ZShRdDo6V0FfRGVsZXRl T25DbG9zZSk7CiAKICAgICBjb25uZWN0KG1fYnJvd3Nlci0+dmlldygpLCBTSUdOQUwobG9hZFBy b2dyZXNzKGludCkpLCBTTE9UKGxvYWRQcm9ncmVzcyhpbnQpKSk7CkBAIC0xMDYsNiArMTE1LDEx IEBAIEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3coUVdLQ29udGV4dCogY29udGV4dCwgV2lu ZG93T3B0aW9ucyogb3B0aW9ucykKICAgICBRQWN0aW9uKiB0b2dnbGVGcmFtZUZsYXR0ZW5pbmcg PSB0b29sc01lbnUtPmFkZEFjdGlvbigiVG9nZ2xlIEZyYW1lIEZsYXR0ZW5pbmciLCB0aGlzLCBT TE9UKHRvZ2dsZUZyYW1lRmxhdHRlbmluZyhib29sKSkpOwogICAgIHRvZ2dsZUZyYW1lRmxhdHRl bmluZy0+c2V0Q2hlY2thYmxlKHRydWUpOwogICAgIHRvZ2dsZUZyYW1lRmxhdHRlbmluZy0+c2V0 Q2hlY2tlZChmYWxzZSk7CisjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQor ICAgIFFBY3Rpb24qIHRvZ2dsZUdMVmlld3BvcnQgPSB0b29sc01lbnUtPmFkZEFjdGlvbigiVG9n Z2xlIEdMIFZpZXdwb3J0IiwgdGhpcywgU0xPVCh0b2dnbGVHTFZpZXdwb3J0KGJvb2wpKSk7Cisg ICAgdG9nZ2xlR0xWaWV3cG9ydC0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIHRvZ2dsZUdMVmll d3BvcnQtPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLnVzZVFHTFdpZGdldFZpZXdwb3J0KTsK KyNlbmRpZgogICAgIHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7CiAgICAgdG9vbHNNZW51LT5h ZGRBY3Rpb24oIkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlh bG9nKCkpKTsKICAgICB0b29sc01lbnUtPmFkZFNlcGFyYXRvcigpOwpAQCAtNDEyLDMgKzQyNiwx MCBAQCBCcm93c2VyV2luZG93Ojp+QnJvd3NlcldpbmRvdygpCiAgICAgZGVsZXRlIG1fYWRkcmVz c0JhcjsKICAgICBkZWxldGUgbV9icm93c2VyOwogfQorCit2b2lkIEJyb3dzZXJXaW5kb3c6OnRv Z2dsZUdMVmlld3BvcnQoYm9vbCB1c2VRR0xXaWRnZXRWaWV3cG9ydCkKK3sKKyNpZiBkZWZpbmVk KFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisgICAgbV9icm93c2VyLT5zZXRWaWV3cG9ydCh1 c2VRR0xXaWRnZXRWaWV3cG9ydCA/IG5ldyBRR0xXaWRnZXQoKSA6IDApOworI2VuZGlmCit9CmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmggYi9Ub29scy9N aW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmgKaW5kZXggMDZkYTJhMi4uZmVhZWFiMCAxMDA2 NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oCisrKyBiL1Rvb2xz L01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaApAQCAtNzcsNiArNzcsNyBAQCBwcm90ZWN0 ZWQgc2xvdHM6CiAKICAgICB2b2lkIHRvZ2dsZUF1dG9Mb2FkSW1hZ2VzKGJvb2wpOwogICAgIHZv aWQgdG9nZ2xlRGlzYWJsZUphdmFTY3JpcHQoYm9vbCk7CisgICAgdm9pZCB0b2dnbGVHTFZpZXdw b3J0KGJvb2wpOwogCiBwcml2YXRlOgogICAgIHZvaWQgdXBkYXRlVXNlckFnZW50TGlzdCgpOwpk aWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5j cHAgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcAppbmRl eCA5MTI0MTliLi4wMjA3MDdkIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5p QnJvd3NlckFwcGxpY2F0aW9uLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJv d3NlckFwcGxpY2F0aW9uLmNwcApAQCAtNjIsNiArNjIsOSBAQCB2b2lkIE1pbmlCcm93c2VyQXBw bGljYXRpb246OmhhbmRsZVVzZXJPcHRpb25zKCkKICAgICAgICAgICAgICA8PCAiWy1jaHVua2Vk LWRyYXdpbmctYXJlYV0iCiAgICAgICAgICAgICAgPDwgICJbLXNlcGFyYXRlLXdlYi1wcm9jZXNz LXBlci13aW5kb3ddIgogICAgICAgICAgICAgIDw8ICJbLXByaW50LWxvYWRlZC11cmxzXSIKKyNp ZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisgICAgICAgICAgICAgPDwgIlst Z2wtdmlld3BvcnRdIgorI2VuZGlmCiAgICAgICAgICAgICAgPDwgIlVSTHMiOwogICAgICAgICBh cHBRdWl0KDApOwogICAgIH0KQEAgLTEwMCw0ICsxMDMsOSBAQCB2b2lkIE1pbmlCcm93c2VyQXBw bGljYXRpb246OmhhbmRsZVVzZXJPcHRpb25zKCkKIAogICAgIGlmIChhcmdzLmNvbnRhaW5zKCIt cHJpbnQtbG9hZGVkLXVybHMiKSkKICAgICAgICAgbV93aW5kb3dPcHRpb25zLnByaW50TG9hZGVk VXJscyA9IHRydWU7CisKKyNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisg ICAgaWYgKGFyZ3MuY29udGFpbnMoIi1nbC12aWV3cG9ydCIpKQorICAgICAgICBtX3dpbmRvd09w dGlvbnMudXNlUUdMV2lkZ2V0Vmlld3BvcnQgPSB0cnVlOworI2VuZGlmCiB9CmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmggYi9Ub29scy9N aW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmgKaW5kZXggMmViYTliNS4uYzY4 Yjg1OCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNh dGlvbi5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24u aApAQCAtNDIsNiArNDIsOSBAQCBzdHJ1Y3QgV2luZG93T3B0aW9ucyB7CiAjZWxzZQogICAgICAg ICAsIHN0YXJ0TWF4aW1pemVkKGZhbHNlKQogI2VuZGlmCisjaWYgZGVmaW5lZChRVF9DT05GSUdV UkVEX1dJVEhfT1BFTkdMKQorICAgICAgICAsIHVzZVFHTFdpZGdldFZpZXdwb3J0KGZhbHNlKQor I2VuZGlmCiAgICAgewogICAgIH0KIApAQCAtNDksNiArNTIsOSBAQCBzdHJ1Y3QgV2luZG93T3B0 aW9ucyB7CiAgICAgYm9vbCB1c2VTZXBhcmF0ZVdlYlByb2Nlc3NQZXJXaW5kb3c7CiAgICAgYm9v bCBwcmludExvYWRlZFVybHM7CiAgICAgYm9vbCBzdGFydE1heGltaXplZDsKKyNpZiBkZWZpbmVk KFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisgICAgYm9vbCB1c2VRR0xXaWRnZXRWaWV3cG9y dDsKKyNlbmRpZgogfTsKIAogY2xhc3MgTWluaUJyb3dzZXJBcHBsaWNhdGlvbiA6IHB1YmxpYyBR QXBwbGljYXRpb24gewo=