35919 2010-03-09 07:06:51 -0800 [Qt] [Symbian] Use native popup menu in Symbian 2010-03-15 09:51:56 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) S60 Hardware Other RESOLVED FIXED PlatformOnly, Qt P2 Normal --- 1 cshu cshu commit-queue hausmann laszlo.gombos oldest_to_newest 197558 0 cshu 2010-03-09 07:06:51 -0800 When displaying combo box dropdown list, the current behavior on S60 devices is the same as desktop browsers: drawing inline selection list. This may not suit for mobile devices which have limited screen size. It is preferred to use Symbian native popup menu on latest S60 devices. 197668 1 50328 cshu 2010-03-09 10:49:09 -0800 Created attachment 50328 fix patch 198315 2 50328 hausmann 2010-03-10 13:43:31 -0800 Comment on attachment 50328 fix patch I think in general this patch looks good, a few comments and coding style nitpicks though. > +contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) { > + FEATURE_DEFINES_JAVASCRIPT += ENABLE_SYMBIAN_DIALOG_PROVIDERS=1 I don't think the above line is necessary, this feature is not tested for in IDL files. > +#if ENABLE(SYMBIAN_DIALOG_PROVIDERS) > +#include <BrCtlDialogsProvider.h> > +#include <BrowserDialogsProvider.h> > +#include <e32base.h> > +#endif > + Perhaps it would make sense to add a comment here (or in the .pro file?) that this feature requires the S60 platform private BrowserDialogsProvider.h header file and is therefore not enabled by default but only meant for platform builds. A little explanation can't hurt here :) > +static void ResetAndDestroy(TAny *aPtr) Coding style, * placement. > + RPointerArray<HBufC>* items = (RPointerArray<HBufC>*) aPtr; Coding style (space after closing parentheses) and should probably use a reinterpret_cast instead. > + items->ResetAndDestroy(); > +} > + > +void QtFallbackWebPopup::showL() > +{ > + static MBrCtlDialogsProvider* dialogs = CBrowserDialogsProvider::NewL(0); > + if (!dialogs) > + return; > + > + int size = itemCount(); > + CArrayFix<TBrCtlSelectOptionData>* options = new CArrayFixFlat<TBrCtlSelectOptionData>((size > 0) ? size : 1); > + RPointerArray<HBufC> items((size > 0) ? size : 1); In both cases, wouldn't it be simpler to write qMax(1, size) instead? :) > + int newIndex; > + for (newIndex = 0 ; newIndex < options->Count() && !options->At(newIndex).IsSelected(); newIndex++) {} Coding style, no space after the semicolon. > +#if ENABLE(SYMBIAN_DIALOG_PROVIDERS) > + void showL(); > +#endif Why call it showL()? Why not a more descriptive name, maybe such as showS60BrowserDialog() ? 198668 3 50514 cshu 2010-03-11 10:14:04 -0800 Created attachment 50514 fix patch Thanks for the excellent review, Simon. The patch is updated based on the comments. 199525 4 50514 commit-queue 2010-03-14 18:28:08 -0700 Comment on attachment 50514 fix patch Clearing flags on attachment: 50514 Committed r55981: <http://trac.webkit.org/changeset/55981> 199526 5 commit-queue 2010-03-14 18:28:12 -0700 All reviewed patches have been landed. Closing bug. 199681 6 hausmann 2010-03-15 09:05:39 -0700 I can't backport this patch as it doesn't apply against qtwebkit-4.6 ;( 199703 7 cshu 2010-03-15 09:51:56 -0700 (In reply to comment #6) > I can't backport this patch as it doesn't apply against qtwebkit-4.6 ;( Looks like I have to create another patch based on qt4.6 in git. :( 50328 2010-03-09 10:49:09 -0800 2010-03-11 10:14:04 -0800 fix patch bug35919_1.patch text/plain 5426 cshu SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTczMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMDMtMDkgIENoYW5nIFNodSAgPGNoYW5nLnNodUBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBbU3ltYmlhbl0gQWRkZWQgYmxvY2sgZm9yIEVOQUJMRV9TWU1CSUFOX0RJQUxPR19QUk9WSURF UlMKKyAgICAgICAgb24gU3ltYmlhbiBwbGF0Zm9ybS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1OTE5CisKKyAgICAgICAgKiBXZWJDb3JlLnBybzoK KwogMjAxMC0wMy0wOSAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNv bGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCkluZGV4 OiBXZWJDb3JlL1dlYkNvcmUucHJvCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5wcm8J KHJldmlzaW9uIDU1NDA4KQorKysgV2ViQ29yZS9XZWJDb3JlLnBybwkod29ya2luZyBjb3B5KQpA QCAtMjc3MSw2ICsyNzcxLDEzIEBAIFNPVVJDRVMgKz0gXAogCiB9CiAKK2NvbnRhaW5zKERFRklO RVMsIEVOQUJMRV9TWU1CSUFOX0RJQUxPR19QUk9WSURFUlMpIHsKKyAgICBGRUFUVVJFX0RFRklO RVNfSkFWQVNDUklQVCArPSBFTkFCTEVfU1lNQklBTl9ESUFMT0dfUFJPVklERVJTPTEKKworICAg IHN5bWJpYW4geworICAgICAgICBMSUJTICs9IC1sYnJvd3NlcmRpYWxvZ3Nwcm92aWRlcgorICAg IH0KK30KIAogaW5jbHVkZSgkJFBXRC8uLi9XZWJLaXQvcXQvQXBpL2hlYWRlcnMucHJpKQogaW5j bHVkZSguLi9pbmNsdWRlL1F0V2ViS2l0L2NsYXNzaGVhZGVycy5wcmkpCkluZGV4OiBXZWJLaXQv cXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9u IDU1NzMyKQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE2IEBACisyMDEwLTAzLTA5ICBDaGFuZyBTaHUgIDxjaGFuZy5zaHVAbm9raWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gW1N5bWJp YW5dIFVzZSBTeW1iaWFuIG5hdGl2ZSBkaWFsb2cgcHJvdmlkZXJzIGZvciBjb21ibyBwdXB1cHMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTkxOQor CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlF0RmFsbGJhY2tXZWJQb3B1cDo6c2hvdyk6CisgICAgICAgIChXZWJDb3Jl OjpSZXNldEFuZERlc3Ryb3kpOgorICAgICAgICAoV2ViQ29yZTo6UXRGYWxsYmFja1dlYlBvcHVw OjpzaG93TCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmg6 CisKIDIwMTAtMDMtMDIgIEFkYW0gVHJlYXQgIDxhdHJlYXRAcmltLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXZlIEh5YXR0LgpJbmRleDogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0 RmFsbGJhY2tXZWJQb3B1cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L1dlYkNvcmVTdXBw b3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAJKHJldmlzaW9uIDU1NDA4KQorKysgV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIzLDggKzIzLDggQEAKIAogI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKICNpbmNsdWRlICJQb3B1 cE1lbnVDbGllbnQuaCIKLSNpbmNsdWRlICJxZ3JhcGhpY3N3ZWJ2aWV3LmgiCiAjaW5jbHVkZSAi UVdlYlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRlICJxZ3JhcGhpY3N3ZWJ2aWV3LmgiCiAjaW5jbHVk ZSA8UUFic3RyYWN0SXRlbVZpZXc+CiAjaW5jbHVkZSA8UUFwcGxpY2F0aW9uPgogI2luY2x1ZGUg PFFHcmFwaGljc1Byb3h5V2lkZ2V0PgpAQCAtMzQsNiArMzQsMTIgQEAKICNpbmNsdWRlIDxRTW91 c2VFdmVudD4KICNpbmNsdWRlIDxRU3RhbmRhcmRJdGVtTW9kZWw+CiAKKyNpZiBFTkFCTEUoU1lN QklBTl9ESUFMT0dfUFJPVklERVJTKQorI2luY2x1ZGUgPEJyQ3RsRGlhbG9nc1Byb3ZpZGVyLmg+ CisjaW5jbHVkZSA8QnJvd3NlckRpYWxvZ3NQcm92aWRlci5oPgorI2luY2x1ZGUgPGUzMmJhc2Uu aD4KKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFF0RmFsbGJhY2tXZWJQb3B1cENv bWJvOjpRdEZhbGxiYWNrV2ViUG9wdXBDb21ibyhRdEZhbGxiYWNrV2ViUG9wdXAmIG93bmVyUG9w dXApCkBAIC05Myw2ICs5OSw5IEBAIFF0RmFsbGJhY2tXZWJQb3B1cDo6flF0RmFsbGJhY2tXZWJQ b3B1cCgKIAogdm9pZCBRdEZhbGxiYWNrV2ViUG9wdXA6OnNob3coKQogeworI2lmIEVOQUJMRShT WU1CSUFOX0RJQUxPR19QUk9WSURFUlMpCisgICAgVFJBUF9JR05PUkUoc2hvd0woKSk7CisjZWxz ZQogICAgIHBvcHVsYXRlKCk7CiAgICAgbV9jb21iby0+c2V0Q3VycmVudEluZGV4KGN1cnJlbnRJ bmRleCgpKTsKIApAQCAtMTI0LDcgKzEzMyw2MSBAQCB2b2lkIFF0RmFsbGJhY2tXZWJQb3B1cDo6 c2hvdygpCiAgICAgUU1vdXNlRXZlbnQgZXZlbnQoUUV2ZW50OjpNb3VzZUJ1dHRvblByZXNzLCBR Q3Vyc29yOjpwb3MoKSwgUXQ6OkxlZnRCdXR0b24sCiAgICAgICAgICAgICAgICAgICAgICAgUXQ6 OkxlZnRCdXR0b24sIFF0OjpOb01vZGlmaWVyKTsKICAgICBRQ29yZUFwcGxpY2F0aW9uOjpzZW5k RXZlbnQobV9jb21ibywgJmV2ZW50KTsKKyNlbmRpZgorfQorCisjaWYgRU5BQkxFKFNZTUJJQU5f RElBTE9HX1BST1ZJREVSUykKKworc3RhdGljIHZvaWQgUmVzZXRBbmREZXN0cm95KFRBbnkgKmFQ dHIpCit7CisgICAgUlBvaW50ZXJBcnJheTxIQnVmQz4qIGl0ZW1zID0gKFJQb2ludGVyQXJyYXk8 SEJ1ZkM+KikgYVB0cjsKKyAgICBpdGVtcy0+UmVzZXRBbmREZXN0cm95KCk7Cit9CisKK3ZvaWQg UXRGYWxsYmFja1dlYlBvcHVwOjpzaG93TCgpCit7CisgICAgc3RhdGljIE1CckN0bERpYWxvZ3NQ cm92aWRlciogZGlhbG9ncyA9IENCcm93c2VyRGlhbG9nc1Byb3ZpZGVyOjpOZXdMKDApOworICAg IGlmICghZGlhbG9ncykKKyAgICAgICAgcmV0dXJuOworCisgICAgaW50IHNpemUgPSBpdGVtQ291 bnQoKTsKKyAgICBDQXJyYXlGaXg8VEJyQ3RsU2VsZWN0T3B0aW9uRGF0YT4qIG9wdGlvbnMgPSBu ZXcgQ0FycmF5Rml4RmxhdDxUQnJDdGxTZWxlY3RPcHRpb25EYXRhPigoc2l6ZSA+IDApID8gc2l6 ZSA6IDEpOworICAgIFJQb2ludGVyQXJyYXk8SEJ1ZkM+IGl0ZW1zKChzaXplID4gMCkgPyBzaXpl IDogMSk7CisgICAgQ2xlYW51cFN0YWNrOjpQdXNoTChUQ2xlYW51cEl0ZW0oJlJlc2V0QW5kRGVz dHJveSwgJml0ZW1zKSk7CisKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IHNpemU7IGkrKykgewor ICAgICAgICBpZiAoaXRlbVR5cGUoaSkgPT0gU2VwYXJhdG9yKSB7CisgICAgICAgICAgICBUQnJD dGxTZWxlY3RPcHRpb25EYXRhIGRhdGEoX0woIi0tLS0tLS0tLS0iKSwgZmFsc2UsIGZhbHNlLCBm YWxzZSk7CisgICAgICAgICAgICBvcHRpb25zLT5BcHBlbmRMKGRhdGEpOworICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgSEJ1ZkMxNiogaXRlbVN0ciA9IEhCdWZDMTY6Ok5ld0woaXRlbVRl eHQoaSkubGVuZ3RoKCkpOworICAgICAgICAgICAgaXRlbVN0ci0+RGVzKCkuQ29weSgoY29uc3Qg VFVpbnQxNiopaXRlbVRleHQoaSkudXRmMTYoKSwgaXRlbVRleHQoaSkubGVuZ3RoKCkpOworICAg ICAgICAgICAgQ2xlYW51cFN0YWNrOjpQdXNoTChpdGVtU3RyKTsKKyAgICAgICAgICAgIFRCckN0 bFNlbGVjdE9wdGlvbkRhdGEgZGF0YSgqaXRlbVN0ciwgaSA9PSBjdXJyZW50SW5kZXgoKSwgZmFs c2UsIGl0ZW1Jc0VuYWJsZWQoaSkpOworICAgICAgICAgICAgb3B0aW9ucy0+QXBwZW5kTChkYXRh KTsKKyAgICAgICAgICAgIGl0ZW1zLkFwcGVuZEwoaXRlbVN0cik7CisgICAgICAgICAgICBDbGVh bnVwU3RhY2s6OlBvcCgpOworICAgICAgICB9CisgICAgfQorCisgICAgZGlhbG9ncy0+RGlhbG9n U2VsZWN0T3B0aW9uTChLTnVsbERlc0MoKSwgKFRCckN0bFNlbGVjdE9wdGlvblR5cGUpKEVTZWxl Y3RUeXBlU2luZ2xlIHwgRVNlbGVjdFR5cGVXaXRoRmluZFBhbmUpLCAqb3B0aW9ucyk7CisKKyAg ICBDbGVhbnVwU3RhY2s6OlBvcEFuZERlc3Ryb3koJml0ZW1zKTsKKworICAgIGludCBuZXdJbmRl eDsKKyAgICBmb3IgKG5ld0luZGV4ID0gMCA7IG5ld0luZGV4IDwgb3B0aW9ucy0+Q291bnQoKSAm JiAhb3B0aW9ucy0+QXQobmV3SW5kZXgpLklzU2VsZWN0ZWQoKTsgbmV3SW5kZXgrKykge30KKyAg ICBpZiAobmV3SW5kZXggPT0gb3B0aW9ucy0+Q291bnQoKSkKKyAgICAgICAgbmV3SW5kZXggPSBj dXJyZW50SW5kZXgoKTsKKyAgICAKKyAgICBtX3BvcHVwVmlzaWJsZSA9IGZhbHNlOworICAgIHBv cHVwRGlkSGlkZSgpOworCisgICAgaWYgKGN1cnJlbnRJbmRleCgpICE9IG5ld0luZGV4ICYmIG5l d0luZGV4ID49IDApCisgICAgICAgIHZhbHVlQ2hhbmdlZChuZXdJbmRleCk7CisKKyAgICBkZWxl dGUgb3B0aW9uczsKIH0KKyNlbmRpZgogCiB2b2lkIFF0RmFsbGJhY2tXZWJQb3B1cDo6aGlkZSgp CiB7CkluZGV4OiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1 cC5oCShyZXZpc2lvbiA1NTQwOCkKKysrIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxi YWNrV2ViUG9wdXAuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsOSBAQCBwcml2YXRlOgog ICAgIFFHcmFwaGljc1Byb3h5V2lkZ2V0KiBtX3Byb3h5OwogCiAgICAgdm9pZCBwb3B1bGF0ZSgp OworI2lmIEVOQUJMRShTWU1CSUFOX0RJQUxPR19QUk9WSURFUlMpCisgICAgdm9pZCBzaG93TCgp OworI2VuZGlmCiB9OwogCiBjbGFzcyBRdEZhbGxiYWNrV2ViUG9wdXBDb21ibyA6IHB1YmxpYyBR Q29tYm9Cb3ggewo= 50514 2010-03-11 10:14:04 -0800 2010-03-14 18:28:08 -0700 fix patch bug35919_2.patch text/plain 5625 cshu SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTg0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMDMtMTEgIENoYW5nIFNodSAgPGNoYW5nLnNodUBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBbU3ltYmlhbl0gQWRkZWQgYmxvY2sgZm9yIEVOQUJMRV9TWU1CSUFOX0RJQUxPR19QUk9WSURF UlMKKyAgICAgICAgb24gU3ltYmlhbiBwbGF0Zm9ybS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1OTE5CisKKyAgICAgICAgKiBXZWJDb3JlLnBybzoK KwogMjAxMC0wMy0xMSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IFdlYkNvcmUv V2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnBybwkocmV2aXNpb24g NTU4NDUpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0yNzk4LDYg KzI3OTgsMTMgQEAgU09VUkNFUyArPSBcCiAKIH0KIAorY29udGFpbnMoREVGSU5FUywgRU5BQkxF X1NZTUJJQU5fRElBTE9HX1BST1ZJREVSUykgeworICAgICMgdGhpcyBmZWF0dXJlIHJlcXVpcmVz IHRoZSBTNjAgcGxhdGZvcm0gcHJpdmF0ZSBCcm93c2VyRGlhbG9nc1Byb3ZpZGVyLmggaGVhZGVy IGZpbGUKKyAgICAjIGFuZCBpcyB0aGVyZWZvcmUgbm90IGVuYWJsZWQgYnkgZGVmYXVsdCBidXQg b25seSBtZWFudCBmb3IgcGxhdGZvcm0gYnVpbGRzLgorICAgIHN5bWJpYW4geworICAgICAgICBM SUJTICs9IC1sYnJvd3NlcmRpYWxvZ3Nwcm92aWRlcgorICAgIH0KK30KIAogaW5jbHVkZSgkJFBX RC8uLi9XZWJLaXQvcXQvQXBpL2hlYWRlcnMucHJpKQogaW5jbHVkZSguLi9pbmNsdWRlL1F0V2Vi S2l0L2NsYXNzaGVhZGVycy5wcmkpCkluZGV4OiBXZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDU1ODQ1KQorKysgV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEwLTAzLTExICBD aGFuZyBTaHUgIDxjaGFuZy5zaHVAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gW1N5bWJpYW5dIFVzZSBTeW1iaWFuIG5hdGl2 ZSBkaWFsb2cgcHJvdmlkZXJzIGZvciBjb21ibyBwdXB1cHMuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTkxOQorCisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlF0RmFsbGJh Y2tXZWJQb3B1cDo6c2hvdyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNldEFuZERlc3Ryb3kpOgor ICAgICAgICAoV2ViQ29yZTo6UXRGYWxsYmFja1dlYlBvcHVwOjpzaG93UzYwQnJvd3NlckRpYWxv Zyk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmg6CisKIDIw MTAtMDMtMTAgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpJbmRleDogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAJKHJldmlzaW9uIDU1ODQ1KQorKysgV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTIzLDggKzIzLDggQEAKIAogI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKICNpbmNsdWRlICJQ b3B1cE1lbnVDbGllbnQuaCIKLSNpbmNsdWRlICJxZ3JhcGhpY3N3ZWJ2aWV3LmgiCiAjaW5jbHVk ZSAiUVdlYlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRlICJxZ3JhcGhpY3N3ZWJ2aWV3LmgiCiAjaW5j bHVkZSA8UUFic3RyYWN0SXRlbVZpZXc+CiAjaW5jbHVkZSA8UUFwcGxpY2F0aW9uPgogI2luY2x1 ZGUgPFFHcmFwaGljc1Byb3h5V2lkZ2V0PgpAQCAtMzQsNiArMzQsMTIgQEAKICNpbmNsdWRlIDxR TW91c2VFdmVudD4KICNpbmNsdWRlIDxRU3RhbmRhcmRJdGVtTW9kZWw+CiAKKyNpZiBFTkFCTEUo U1lNQklBTl9ESUFMT0dfUFJPVklERVJTKQorI2luY2x1ZGUgPEJyQ3RsRGlhbG9nc1Byb3ZpZGVy Lmg+CisjaW5jbHVkZSA8QnJvd3NlckRpYWxvZ3NQcm92aWRlci5oPiAvLyBTNjAgcGxhdGZvcm0g cHJpdmF0ZSBoZWFkZXIgZmlsZQorI2luY2x1ZGUgPGUzMmJhc2UuaD4KKyNlbmRpZgorCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKIFF0RmFsbGJhY2tXZWJQb3B1cENvbWJvOjpRdEZhbGxiYWNrV2Vi UG9wdXBDb21ibyhRdEZhbGxiYWNrV2ViUG9wdXAmIG93bmVyUG9wdXApCkBAIC05Myw2ICs5OSw5 IEBAIFF0RmFsbGJhY2tXZWJQb3B1cDo6flF0RmFsbGJhY2tXZWJQb3B1cCgKIAogdm9pZCBRdEZh bGxiYWNrV2ViUG9wdXA6OnNob3coKQogeworI2lmIEVOQUJMRShTWU1CSUFOX0RJQUxPR19QUk9W SURFUlMpCisgICAgVFJBUF9JR05PUkUoc2hvd1M2MEJyb3dzZXJEaWFsb2coKSk7CisjZWxzZQog ICAgIHBvcHVsYXRlKCk7CiAgICAgbV9jb21iby0+c2V0Q3VycmVudEluZGV4KGN1cnJlbnRJbmRl eCgpKTsKIApAQCAtMTI0LDcgKzEzMyw2MSBAQCB2b2lkIFF0RmFsbGJhY2tXZWJQb3B1cDo6c2hv dygpCiAgICAgUU1vdXNlRXZlbnQgZXZlbnQoUUV2ZW50OjpNb3VzZUJ1dHRvblByZXNzLCBRQ3Vy c29yOjpwb3MoKSwgUXQ6OkxlZnRCdXR0b24sCiAgICAgICAgICAgICAgICAgICAgICAgUXQ6Okxl ZnRCdXR0b24sIFF0OjpOb01vZGlmaWVyKTsKICAgICBRQ29yZUFwcGxpY2F0aW9uOjpzZW5kRXZl bnQobV9jb21ibywgJmV2ZW50KTsKKyNlbmRpZgorfQorCisjaWYgRU5BQkxFKFNZTUJJQU5fRElB TE9HX1BST1ZJREVSUykKKworc3RhdGljIHZvaWQgUmVzZXRBbmREZXN0cm95KFRBbnkqIGFQdHIp Cit7CisgICAgUlBvaW50ZXJBcnJheTxIQnVmQz4qIGl0ZW1zID0gcmVpbnRlcnByZXRfY2FzdDxS UG9pbnRlckFycmF5PEhCdWZDPiogPihhUHRyKTsKKyAgICBpdGVtcy0+UmVzZXRBbmREZXN0cm95 KCk7Cit9CisKK3ZvaWQgUXRGYWxsYmFja1dlYlBvcHVwOjpzaG93UzYwQnJvd3NlckRpYWxvZygp Cit7CisgICAgc3RhdGljIE1CckN0bERpYWxvZ3NQcm92aWRlciogZGlhbG9ncyA9IENCcm93c2Vy RGlhbG9nc1Byb3ZpZGVyOjpOZXdMKDApOworICAgIGlmICghZGlhbG9ncykKKyAgICAgICAgcmV0 dXJuOworCisgICAgaW50IHNpemUgPSBpdGVtQ291bnQoKTsKKyAgICBDQXJyYXlGaXg8VEJyQ3Rs U2VsZWN0T3B0aW9uRGF0YT4qIG9wdGlvbnMgPSBuZXcgQ0FycmF5Rml4RmxhdDxUQnJDdGxTZWxl Y3RPcHRpb25EYXRhPihxTWF4KDEsIHNpemUpKTsKKyAgICBSUG9pbnRlckFycmF5PEhCdWZDPiBp dGVtcyhxTWF4KDEsIHNpemUpKTsKKyAgICBDbGVhbnVwU3RhY2s6OlB1c2hMKFRDbGVhbnVwSXRl bSgmUmVzZXRBbmREZXN0cm95LCAmaXRlbXMpKTsKKworICAgIGZvciAoaW50IGkgPSAwOyBpIDwg c2l6ZTsgaSsrKSB7CisgICAgICAgIGlmIChpdGVtVHlwZShpKSA9PSBTZXBhcmF0b3IpIHsKKyAg ICAgICAgICAgIFRCckN0bFNlbGVjdE9wdGlvbkRhdGEgZGF0YShfTCgiLS0tLS0tLS0tLSIpLCBm YWxzZSwgZmFsc2UsIGZhbHNlKTsKKyAgICAgICAgICAgIG9wdGlvbnMtPkFwcGVuZEwoZGF0YSk7 CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBIQnVmQzE2KiBpdGVtU3RyID0gSEJ1ZkMx Njo6TmV3TChpdGVtVGV4dChpKS5sZW5ndGgoKSk7CisgICAgICAgICAgICBpdGVtU3RyLT5EZXMo KS5Db3B5KChjb25zdCBUVWludDE2KilpdGVtVGV4dChpKS51dGYxNigpLCBpdGVtVGV4dChpKS5s ZW5ndGgoKSk7CisgICAgICAgICAgICBDbGVhbnVwU3RhY2s6OlB1c2hMKGl0ZW1TdHIpOworICAg ICAgICAgICAgVEJyQ3RsU2VsZWN0T3B0aW9uRGF0YSBkYXRhKCppdGVtU3RyLCBpID09IGN1cnJl bnRJbmRleCgpLCBmYWxzZSwgaXRlbUlzRW5hYmxlZChpKSk7CisgICAgICAgICAgICBvcHRpb25z LT5BcHBlbmRMKGRhdGEpOworICAgICAgICAgICAgaXRlbXMuQXBwZW5kTChpdGVtU3RyKTsKKyAg ICAgICAgICAgIENsZWFudXBTdGFjazo6UG9wKCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBk aWFsb2dzLT5EaWFsb2dTZWxlY3RPcHRpb25MKEtOdWxsRGVzQygpLCAoVEJyQ3RsU2VsZWN0T3B0 aW9uVHlwZSkoRVNlbGVjdFR5cGVTaW5nbGUgfCBFU2VsZWN0VHlwZVdpdGhGaW5kUGFuZSksICpv cHRpb25zKTsKKworICAgIENsZWFudXBTdGFjazo6UG9wQW5kRGVzdHJveSgmaXRlbXMpOworCisg ICAgaW50IG5ld0luZGV4OworICAgIGZvciAobmV3SW5kZXggPSAwOyBuZXdJbmRleCA8IG9wdGlv bnMtPkNvdW50KCkgJiYgIW9wdGlvbnMtPkF0KG5ld0luZGV4KS5Jc1NlbGVjdGVkKCk7IG5ld0lu ZGV4KyspIHt9CisgICAgaWYgKG5ld0luZGV4ID09IG9wdGlvbnMtPkNvdW50KCkpCisgICAgICAg IG5ld0luZGV4ID0gY3VycmVudEluZGV4KCk7CisgICAgCisgICAgbV9wb3B1cFZpc2libGUgPSBm YWxzZTsKKyAgICBwb3B1cERpZEhpZGUoKTsKKworICAgIGlmIChjdXJyZW50SW5kZXgoKSAhPSBu ZXdJbmRleCAmJiBuZXdJbmRleCA+PSAwKQorICAgICAgICB2YWx1ZUNoYW5nZWQobmV3SW5kZXgp OworCisgICAgZGVsZXRlIG9wdGlvbnM7CiB9CisjZW5kaWYKIAogdm9pZCBRdEZhbGxiYWNrV2Vi UG9wdXA6OmhpZGUoKQogewpJbmRleDogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJh Y2tXZWJQb3B1cC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZh bGxiYWNrV2ViUG9wdXAuaAkocmV2aXNpb24gNTU4NDUpCisrKyBXZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDYgKzQ4LDkg QEAgcHJpdmF0ZToKICAgICBRR3JhcGhpY3NQcm94eVdpZGdldCogbV9wcm94eTsKIAogICAgIHZv aWQgcG9wdWxhdGUoKTsKKyNpZiBFTkFCTEUoU1lNQklBTl9ESUFMT0dfUFJPVklERVJTKQorICAg IHZvaWQgc2hvd1M2MEJyb3dzZXJEaWFsb2coKTsKKyNlbmRpZgogfTsKIAogY2xhc3MgUXRGYWxs YmFja1dlYlBvcHVwQ29tYm8gOiBwdWJsaWMgUUNvbWJvQm94IHsK