42640 2010-07-20 07:14:35 -0700 [EFL] Implement input method notification 2010-07-22 18:11:39 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 lucas.de.marchi lucas.de.marchi barbieri commit-queue gyuyoung.kim kenneth tonikitoo oldest_to_newest 253709 0 lucas.de.marchi 2010-07-20 07:14:35 -0700 [EFL] Implement input method notification 253715 1 62073 lucas.de.marchi 2010-07-20 07:28:09 -0700 Created attachment 62073 Patch 253720 2 tonikitoo 2010-07-20 07:55:35 -0700 maybe it makes sense to make use of the newly added EditorClientEfl::willSetInputMethodState for editor hint "settage" (?) void EditorClientEfl::willSetInputMethodState() It was added specifically for that by Chromium guys. Other ports like Qt have not adapted themselves to make use of it, though. Could you check? 253748 3 lucas.de.marchi 2010-07-20 08:52:34 -0700 (In reply to comment #2) > maybe it makes sense to make use of the newly added EditorClientEfl::willSetInputMethodState for editor hint "settage" (?) > > void EditorClientEfl::willSetInputMethodState() It's not feasible, at least for setting the hints of the to-be-focused node. This is because when this method is called, the new node is not focused yet and there's no way to get a reference for this node. Both QT and EFL relies on focusedNode()->hasTagName(WebCore::HTMLNames::inputTag) to determine the input type. In fact, chromium guys added this method because I reported to Kenneth that their prior change had broken input hints on QT. Maybe I could add a signal on EditorClientEfl::willSetInputMethodState() to inform that a virtual keyboard should be closed, but I don't see a need since it's well accomplished by the way it is right now. 254826 4 62073 tonikitoo 2010-07-22 08:43:19 -0700 Comment on attachment 62073 Patch r=me with the below fixed. <demarchi> ow.. and now i see there's a typo in doc <demarchi> it's "inputmethod,changed", not "inputmethods,changed" 254894 5 62318 lucas.de.marchi 2010-07-22 11:12:20 -0700 Created attachment 62318 Patch 254908 6 62318 commit-queue 2010-07-22 11:50:32 -0700 Comment on attachment 62318 Patch Rejecting patch 62318 from commit-queue. lucas.demarchi@profusion.mobi does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact eseidel@chromium.org to request a commit-queue restart. After restart the commit-queue will correctly respect your committer rights. 255122 7 62318 commit-queue 2010-07-22 18:11:34 -0700 Comment on attachment 62318 Patch Clearing flags on attachment: 62318 Committed r63933: <http://trac.webkit.org/changeset/63933> 255123 8 commit-queue 2010-07-22 18:11:39 -0700 All reviewed patches have been landed. Closing bug. 62073 2010-07-20 07:28:09 -0700 2010-07-22 11:57:23 -0700 Patch bug-42640-20100720112809.patch text/plain 8774 lucas.de.marchi ZGlmZiAtLWdpdCBhL1dlYktpdC9DaGFuZ2VMb2cgYi9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNl MGMzNzk5NTQ5Zjg4MWNkZWFkYjg1MjliY2M1NGVjMjA1ZWNmMmYuLjc2NTRlNjc5OTgwODU4NGJi ZTFhYTdjNDc5MTc0ODg3YjVlMDNjZjYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEwLTA3LTIwICBMdWNhcyBE ZSBNYXJjaGkgIDxsdWNhcy5kZW1hcmNoaUBwcm9mdXNpb24ubW9iaT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbRUZMXSBJbXBsZW1lbnQgaW5wdXQg bWV0aG9kIG5vdGlmaWNhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDI2NDAKKworICAgICAgICBOb3RpZnkgYnJvd3NlciB3aGVuIGtleWJvYXJk IHNob3VsZCBiZSBzaG93bi9oaWRkZW4uIElucHV0IG1ldGhvZAorICAgICAgICBoaW50cyBhcmUg dXBkYXRlZCBiZWZvcmUgc2VuZGluZyB0aGUgc2lnbmFsLiBDbGllbnQgc2hvdWxkIGJlIGFibGUg dG8KKyAgICAgICAgZGV0ZXJtaW5lIHRoZSBpbnB1dCB0eXBlIGJ5IGNhbGxpbmcgZXdrX3ZpZXdf aW1oX2dldCgpLgorCisgICAgICAgICogZWZsL0VXZWJMYXVuY2hlci9tYWluLmM6CisgICAgICAg IChvbl9pbnB1dG1ldGhvZF9jaGFuZ2VkKTogZXhhbXBsZSBpbXBsZW1lbnRhdGlvbiB0aGF0IGp1 c3QgcHJpbnRzIHRvCisgICAgICAgIHN0ZG91dCBpZiBrZXlib2FyZCBzaG91bGQgYmUgc2hvd24g b3IgaGlkZGVuIGFuZCB0aGUgaW1oIGZsYWdzLgorICAgICAgICAoYnJvd3NlckNyZWF0ZSk6IGxp c3RlbiB0byBzaWduYWwgYWJvdXQgaW5wdXQgbWV0aG9kIGNoYW5naW5nIGl0cworICAgICAgICBz dGF0ZS4KKyAgICAgICAgKiBlZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkVkaXRvckNsaWVudEVmbDo6c2V0SW5wdXRNZXRob2RTdGF0ZSk6 IGNhbGwgbmV3IGZ1bmN0aW9uCisgICAgICAgIHJlc3BvbnNpYmxlIGZvciBpbXBsZW1lbnRpbmcg dGhpcyBub3RpZmljYXRpb24uCisgICAgICAgICogZWZsL2V3ay9ld2tfcHJpdmF0ZS5oOiBld2tf dmlld19pbnB1dF9tZXRob2Rfc3RhdGVfc2V0KCkgaXMgY2FsbGVkCisgICAgICAgIG9ubHkgZnJv bSBpbnNpZGUgV2ViS2l0LgorICAgICAgICAqIGVmbC9ld2svZXdrX3ZpZXcuY3BwOiBpbXBsZW1l bnQgc2V0dGVycyBhbmQgZ2V0dGVycworICAgICAgICAoZXdrX3ZpZXdfaW1oX2dldCk6CisgICAg ICAgIChld2tfdmlld19pbnB1dF9tZXRob2Rfc3RhdGVfc2V0KToKKyAgICAgICAgKiBlZmwvZXdr L2V3a192aWV3Lmg6IGludHJvZHVjZSBFd2tfSW1oIGVudW0gd2hpY2ggY29udGFpbnMgdGhlCisg ICAgICAgIHBvc3NpYmxlIGlucHV0IHR5cGVzLgorICAgICAgICAoX0V3a19WaWV3X1NtYXJ0X0Ns YXNzOjopOgorCiAyMDEwLTA3LTE2ICBaaGUgU3UgIDxzdXpoZUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvZWZsL0VX ZWJMYXVuY2hlci9tYWluLmMgYi9XZWJLaXQvZWZsL0VXZWJMYXVuY2hlci9tYWluLmMKaW5kZXgg MzYyZWVmZDEwODFhZjhhNjEzMmYwZjljMzRmZDZlYTRhYzMzNDY2ZS4uNTlhMDdlMzU3MzVhOTVi ZDgxMDVjN2MzZWJiN2YxOTViOTNiOTdkZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9FV2ViTGF1 bmNoZXIvbWFpbi5jCisrKyBiL1dlYktpdC9lZmwvRVdlYkxhdW5jaGVyL21haW4uYwpAQCAtMzcz LDYgKzM3MywyMSBAQCBvbl90b29sdGlwX3RleHRfc2V0KHZvaWQqIHVzZXJfZGF0YSwgRXZhc19P YmplY3QqIHdlYnZpZXcsIHZvaWQqIGV2ZW50X2luZm8pCiAgICAgICAgIGluZm8oIiVzXG4iLCB0 ZXh0KTsKIH0KIAorc3RhdGljIHZvaWQKK29uX2lucHV0bWV0aG9kX2NoYW5nZWQodm9pZCogdXNl cl9kYXRhLCBFdmFzX09iamVjdCogd2Vidmlldywgdm9pZCogZXZlbnRfaW5mbykKK3sKKyAgICBF aW5hX0Jvb2wgYWN0aXZlID0gKEVpbmFfQm9vbCkobG9uZylldmVudF9pbmZvOworICAgIHVuc2ln bmVkIGludCBpbWg7CisgICAgaW5mbygiS2V5Ym9hcmQgY2hhbmdlZDogJWRcbiIsIGFjdGl2ZSk7 CisKKyAgICBpZiAoIWFjdGl2ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaW1oID0gZXdrX3Zp ZXdfaW1oX2dldCh3ZWJ2aWV3KTsKKyAgICBpbmZvKCIgICAgS2V5Ym9hcmQgZmxhZ3M6ICUjLjJ4 XG4iLCBpbWgpOworCit9CisKIC8qKgogICogInZpZXdwb3J0LGNoYW5nZWQiIHNpZ25hbCB3aWxs IGJlIGFsd2F5cyBlbWl0dGVkIHJlZ2FyZGxlc3Mgb2YgdGhlIHZpZXdwb3J0IGV4aXN0ZW5jZS4K ICAqCkBAIC02NjAsNiArNjc1LDcgQEAgYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNv bnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmUKICAgICBldmFz X29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAibWVudWJhcix2aXNpYmxl LHNldCIsIG9uX21lbnViYXJfdmlzaWJsZV9zZXQsIGFwcCk7CiAgICAgZXZhc19vYmplY3Rfc21h cnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgIm1lbnViYXIsdmlzaWJsZSxnZXQiLCBvbl9t ZW51YmFyX3Zpc2libGVfZ2V0LCBhcHApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2FkZChhcHAtPmJyb3dzZXIsICJ0b29sdGlwLHRleHQsc2V0Iiwgb25fdG9vbHRpcF90ZXh0X3Nl dCwgYXBwKTsKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2Vy LCAiaW5wdXRtZXRob2QsY2hhbmdlZCIsIG9uX2lucHV0bWV0aG9kX2NoYW5nZWQsIGFwcCk7CiAK IC8qICAgICBld2tfY2FsbGJhY2tfcmVzaXplX3JlcXVlc3RlZF9hZGQoYXBwLT5icm93c2VyLCBv bl9yZXNpemVfcmVxdWVzdGVkLCBhcHAtPmVlKTsgKi8KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Vm bC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwIGIvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwCmluZGV4IGNmNjcyZWI5NzVhMmM3ZTE1ODM5MGI1 YzNiMDRhZmE5ZjI1YmVjOTguLmE2M2I3MTIxYjRhZjBlZDE4MDhlNWUxOWUzNzlhYjU0YTYzYmU1 MjQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZs LmNwcAorKysgYi9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEVmbC5jcHAK QEAgLTQ3LDcgKzQ3LDcgQEAgdm9pZCBFZGl0b3JDbGllbnRFZmw6OndpbGxTZXRJbnB1dE1ldGhv ZFN0YXRlKCkKIAogdm9pZCBFZGl0b3JDbGllbnRFZmw6OnNldElucHV0TWV0aG9kU3RhdGUoYm9v bCBhY3RpdmUpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBld2tfdmlld19pbnB1dF9t ZXRob2Rfc3RhdGVfc2V0KG1fdmlldywgYWN0aXZlKTsKIH0KIAogYm9vbCBFZGl0b3JDbGllbnRF Zmw6OnNob3VsZERlbGV0ZVJhbmdlKFJhbmdlKikKZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvZXdr L2V3a19wcml2YXRlLmggYi9XZWJLaXQvZWZsL2V3ay9ld2tfcHJpdmF0ZS5oCmluZGV4IGM1NDlh ZDc0YjJlNjI4ZTgwNzQxM2NiMGM0NWRiZTljYWIzOTVjYzMuLmRlM2I3NWMyNjE4MTQ4YTA4OWZk Y2QyNjhjZjI4NDllZWNmMDYwZTUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvZXdrL2V3a19wcml2 YXRlLmgKKysrIGIvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaApAQCAtNDksNiArNDksNyBA QCBzdHJ1Y3QgQ29udGV4dE1lbnVJdGVtOwogfQogCiB2b2lkIGV3a192aWV3X3JlYWR5KEV2YXNf T2JqZWN0ICpvKTsKK3ZvaWQgZXdrX3ZpZXdfaW5wdXRfbWV0aG9kX3N0YXRlX3NldChFdmFzX09i amVjdCogbywgRWluYV9Cb29sIGFjdGl2ZSk7CiB2b2lkIGV3a192aWV3X3RpdGxlX3NldChFdmFz X09iamVjdCAqbywgY29uc3QgY2hhciAqdGl0bGUpOwogdm9pZCBld2tfdmlld191cmlfY2hhbmdl ZChFdmFzX09iamVjdCAqbyk7CiB2b2lkIGV3a192aWV3X2xvYWRfc3RhcnRlZChFdmFzX09iamVj dCAqbyk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXggNmNlOGVkYTJmZTA1MTdkM2RhYTdlMjFlNjU4ZGNk OWFiY2JkMDIxMS4uNWExNTk0MzhlNTkxYzgxOTVmNjAwMzg2MTg1MjI1YzJlOGQxYWM0MCAxMDA2 NDQKLS0tIGEvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcApAQCAtMzQsNiArMzQsOSBAQAogI2luY2x1ZGUgIkZyYW1lTG9hZGVyQ2xp ZW50RWZsLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250 ZXh0LmgiCisjaW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1MSW5wdXRFbGVt ZW50LmgiCisjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yQ2xpZW50 RWZsLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1Nb3VzZUV2ZW50LmgiCiAjaW5jbHVkZSAiUG9wdXBN ZW51Q2xpZW50LmgiCkBAIC03OSw2ICs4Miw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfUHJpdmF0ZV9E YXRhIHsKICAgICAgICAgc2l6ZV90IGNvdW50OwogICAgICAgICBzaXplX3QgYWxsb2NhdGVkOwog ICAgIH0gc2Nyb2xsczsKKyAgICB1bnNpZ25lZCBpbnQgaW1oOyAvKio8IGlucHV0IG1ldGhvZCBo aW50cyAqLwogICAgIHN0cnVjdCB7CiAgICAgICAgIGNvbnN0IGNoYXIqIHVzZXJfYWdlbnQ7CiAg ICAgICAgIGNvbnN0IGNoYXIqIHVzZXJfc3R5bGVzaGVldDsKQEAgLTIxNDksNiArMjE1MywyMCBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfcHJlX3JlbmRlcl9yZWdpb24oRXZhc19PYmplY3QqIG8sIEV2 YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LAogfQogCiAvKioKKyAqIEdldCBpbnB1dCBtZXRob2Qg aGludHMKKyAqCisgKiBAcGFyYW0gbyBWaWV3LgorICoKKyAqIEByZXR1cm4gaW5wdXQgbWV0aG9k IGhpbnRzCisgKi8KK3Vuc2lnbmVkIGludCBld2tfdmlld19pbWhfZ2V0KEV2YXNfT2JqZWN0ICpv KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIDApOworICAgIEVXS19W SUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgMCk7CisgICAgcmV0dXJuIHByaXYtPmlt aDsKK30KKworLyoqCiAgKiBDYW5jZWwgKGNsZWFyKSBwcmV2aW91cyBwcmUtcmVuZGVyIHJlcXVl c3RzLgogICoKICAqIEBwYXJhbSBvIHZpZXcgdG8gY2xlYXIgcHJlLXJlbmRlciByZXF1ZXN0cy4K QEAgLTMwMjUsNiArMzA0Myw0NiBAQCB2b2lkIGV3a192aWV3X3JlYWR5KEV2YXNfT2JqZWN0KiBv KQogCiAvKioKICAqIEBpbnRlcm5hbAorICogUmVwb3J0cyB0aGUgc3RhdGUgb2YgaW5wdXQgbWV0 aG9kIGNoYW5nZWQuIFRoaXMgaXMgdHJpZ2dlcmVkLCBmb3IgZXhhbXBsZQorICogd2hlbiBhIGlu cHV0IGZpZWxkIHJlY2VpdmVkL2xvc3QgZm9jdXMKKyAqCisgKiBFbWl0cyBzaWduYWw6ICJpbnB1 dG1ldGhvZHMsY2hhbmdlZCIgd2l0aCBhIGJvb2xlYW4gaW5kaWNhdGluZyB3aGV0aGVyIGl0J3MK KyAqIGVuYWJsZWQgb3Igbm90LgorICovCit2b2lkIGV3a192aWV3X2lucHV0X21ldGhvZF9zdGF0 ZV9zZXQoRXZhc19PYmplY3QqIG8sIEVpbmFfQm9vbCBhY3RpdmUpCit7CisgICAgRVdLX1ZJRVdf U0RfR0VUX09SX1JFVFVSTihvLCBzZCk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVQoc2QsIHByaXYp OworICAgIFdlYkNvcmU6OkZyYW1lKiBmb2N1c2VkRnJhbWUgPSBwcml2LT5wYWdlLT5mb2N1c0Nv bnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCk7CisKKyAgICBpZiAoZm9jdXNlZEZyYW1l CisgICAgICAgICYmIGZvY3VzZWRGcmFtZS0+ZG9jdW1lbnQoKQorICAgICAgICAmJiBmb2N1c2Vk RnJhbWUtPmRvY3VtZW50KCktPmZvY3VzZWROb2RlKCkKKyAgICAgICAgJiYgZm9jdXNlZEZyYW1l LT5kb2N1bWVudCgpLT5mb2N1c2VkTm9kZSgpLT5oYXNUYWdOYW1lKFdlYkNvcmU6OkhUTUxOYW1l czo6aW5wdXRUYWcpKSB7CisgICAgICAgIFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQqIGlucHV0 RWxlbWVudDsKKworICAgICAgICBpbnB1dEVsZW1lbnQgPSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpI VE1MSW5wdXRFbGVtZW50Kj4oZm9jdXNlZEZyYW1lLT5kb2N1bWVudCgpLT5mb2N1c2VkTm9kZSgp KTsKKyAgICAgICAgaWYgKGlucHV0RWxlbWVudCkgeworICAgICAgICAgICAgcHJpdi0+aW1oID0g MDsKKyAgICAgICAgICAgIC8vIGZvciBwYXNzd29yZCBmaWVsZHMsIGFjdGl2ZSA9PSBmYWxzZQor ICAgICAgICAgICAgaWYgKCFhY3RpdmUpIHsKKyAgICAgICAgICAgICAgICBhY3RpdmUgPSBpbnB1 dEVsZW1lbnQtPmlzUGFzc3dvcmRGaWVsZCgpOworICAgICAgICAgICAgICAgIHByaXYtPmltaCA9 IGlucHV0RWxlbWVudC0+aXNQYXNzd29yZEZpZWxkKCkgKiBFV0tfSU1IX1BBU1NXT1JEOworICAg ICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAvLyBTZXQgaW5wdXQgbWV0aG9kIGhp bnRzIGZvciAibnVtYmVyIiwgInRlbCIsICJlbWFpbCIsIGFuZCAidXJsIiBpbnB1dCBlbGVtZW50 cy4KKyAgICAgICAgICAgICAgICBwcml2LT5pbWggfD0gaW5wdXRFbGVtZW50LT5pc1RlbGVwaG9u ZUZpZWxkKCkgKiBFV0tfSU1IX1RFTEVQSE9ORTsKKyAgICAgICAgICAgICAgICBwcml2LT5pbWgg fD0gaW5wdXRFbGVtZW50LT5pc051bWJlckZpZWxkKCkgKiBFV0tfSU1IX05VTUJFUjsKKyAgICAg ICAgICAgICAgICBwcml2LT5pbWggfD0gaW5wdXRFbGVtZW50LT5pc0VtYWlsRmllbGQoKSAqIEVX S19JTUhfRU1BSUw7CisgICAgICAgICAgICAgICAgcHJpdi0+aW1oIHw9IGlucHV0RWxlbWVudC0+ aXNVcmxGaWVsZCgpICogRVdLX0lNSF9VUkw7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAg ICB9CisKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKG8sICJpbnB1dG1ldGhv ZCxjaGFuZ2VkIiwgKHZvaWQqKWFjdGl2ZSk7Cit9CisKKy8qKgorICogQGludGVybmFsCiAgKiBU aGUgdmlldyB0aXRsZSB3YXMgY2hhbmdlZCBieSB0aGUgZnJhbWUgbG9hZGVyLgogICoKICAqIEVt aXRzIHNpZ25hbDogInRpdGxlLGNoYW5nZWQiIHdpdGggcG9pbnRlciB0byBuZXcgdGl0bGUgc3Ry aW5nLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaCBiL1dlYktpdC9lZmwv ZXdrL2V3a192aWV3LmgKaW5kZXggMjA5YmVmZmZlNTFiODQxM2ZlMDYxNDhlODZiNmIwYWQxYzgz ZDNlMS4uNTIwZGVhMjU3MGU3YWZjN2UxOGVjNTYzMjQ0YjgyZTMyZWYyYmEzOCAxMDA2NDQKLS0t IGEvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9XZWJLaXQvZWZsL2V3ay9ld2tfdmll dy5oCkBAIC04Niw2ICs4Niw3IEBAIGV4dGVybiAiQyIgewogICogICAgYW5kIGFzIGFyZ3VtZW50 cyBnaXZlcyBpdHMgZGV0YWlscy4KICAqICAtICJpY29uLHJlY2VpdmVkIiwgdm9pZDogbWFpbiBm cmFtZSByZWNlaXZlZCBhbiBpY29uLgogICogIC0gInZpZXdwb3J0LGNoYW5nZWQiLCB2b2lkOiBS ZXBvcnQgdGhhdCB2aWV3cG9ydCBoYXMgY2hhbmdlZC4KKyAqICAtICJpbnB1dG1ldGhvZHMsY2hh bmdlZCIgd2l0aCBhIGJvb2xlYW4gaW5kaWNhdGluZyB3aGV0aGVyIGl0J3MgZW5hYmxlZCBvciBu b3QuCiAgKi8KIAogdHlwZWRlZiBzdHJ1Y3QgX0V3a19WaWV3X1NtYXJ0X0RhdGEgRXdrX1ZpZXdf U21hcnRfRGF0YTsKQEAgLTE4Niw2ICsxODcsMTUgQEAgc3RydWN0IF9Fd2tfVmlld19TbWFydF9D bGFzcyB7CiAgKi8KICNkZWZpbmUgRVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVF9OQU1FX1ZFUlNJ T04obmFtZSkgRVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVChFVkFTX1NNQVJUX0NMQVNTX0lOSVRf TkFNRV9WRVJTSU9OKG5hbWUpKQogCitlbnVtIF9Fd2tfSW1oIHsKKyAgICBFV0tfSU1IX1RFTEVQ SE9ORSA9ICgxIDw8IDApLAorICAgIEVXS19JTUhfTlVNQkVSID0gKDEgPDwgMSksCisgICAgRVdL X0lNSF9FTUFJTCA9ICgxIDw8IDIpLAorICAgIEVXS19JTUhfVVJMID0gKDEgPDwgMyksCisgICAg RVdLX0lNSF9QQVNTV09SRCA9ICgxIDw8IDQpCit9OwordHlwZWRlZiBlbnVtIF9Fd2tfSW1oIEV3 a19JbWg7CisKIC8qKgogICogQGludGVybmFsCiAgKgpAQCAtMzU3LDYgKzM2Nyw4IEBAIEVBUEkg RWluYV9Cb29sICAgIGV3a192aWV3X3pvb21fdGV4dF9vbmx5X3NldChFdmFzX09iamVjdCAqbywg RWluYV9Cb29sIHNldHRpbmcpCiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19wcmVfcmVuZGVy X3JlZ2lvbihFdmFzX09iamVjdCAqbywgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV2YXNf Q29vcmQgdywgRXZhc19Db29yZCBoLCBmbG9hdCB6b29tKTsKIEVBUEkgdm9pZCAgICAgICAgIGV3 a192aWV3X3ByZV9yZW5kZXJfY2FuY2VsKEV2YXNfT2JqZWN0ICpvKTsKIAorRUFQSSB1bnNpZ25l ZCBpbnQgZXdrX3ZpZXdfaW1oX2dldChFdmFzX09iamVjdCAqbyk7CisKIC8qIHNldHRpbmdzICov CiBFQVBJIGNvbnN0IGNoYXIgICpld2tfdmlld19zZXR0aW5nX3VzZXJfYWdlbnRfZ2V0KGNvbnN0 IEV2YXNfT2JqZWN0ICpvKTsKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfdXNl cl9hZ2VudF9zZXQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKnVzZXJfYWdlbnQpOwo= 62318 2010-07-22 11:12:20 -0700 2010-07-22 18:11:34 -0700 Patch bug-42640-20100722151218.patch text/plain 8808 lucas.de.marchi ZGlmZiAtLWdpdCBhL1dlYktpdC9DaGFuZ2VMb2cgYi9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ0 ZDI0MzFiMzBkZDUxODljMzdjN2JhNGFjY2E1ODQ4YWU1ODE5YTMuLjkxMzEyZDFiNGNmY2Q3YjUz YjhkZDVjOGFkOTc5YmZjOWM4NzczNGQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEwLTA3LTIyICBMdWNhcyBE ZSBNYXJjaGkgIDxsdWNhcy5kZW1hcmNoaUBwcm9mdXNpb24ubW9iaT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbRUZMXSBJbXBsZW1lbnQgaW5wdXQg bWV0aG9kIG5vdGlmaWNhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDI2NDAKKworICAgICAgICBOb3RpZnkgYnJvd3NlciB3aGVuIGtleWJvYXJk IHNob3VsZCBiZSBzaG93bi9oaWRkZW4uIElucHV0IG1ldGhvZAorICAgICAgICBoaW50cyBhcmUg dXBkYXRlZCBiZWZvcmUgc2VuZGluZyB0aGUgc2lnbmFsLiBDbGllbnQgc2hvdWxkIGJlIGFibGUg dG8KKyAgICAgICAgZGV0ZXJtaW5lIHRoZSBpbnB1dCB0eXBlIGJ5IGNhbGxpbmcgZXdrX3ZpZXdf aW1oX2dldCgpLgorCisgICAgICAgICogZWZsL0VXZWJMYXVuY2hlci9tYWluLmM6CisgICAgICAg IChvbl9pbnB1dG1ldGhvZF9jaGFuZ2VkKTogZXhhbXBsZSBpbXBsZW1lbnRhdGlvbiB0aGF0IGp1 c3QgcHJpbnRzIHRvCisgICAgICAgIHN0ZG91dCBpZiBrZXlib2FyZCBzaG91bGQgYmUgc2hvd24g b3IgaGlkZGVuIGFuZCB0aGUgaW1oIGZsYWdzLgorICAgICAgICAoYnJvd3NlckNyZWF0ZSk6IGxp c3RlbiB0byBzaWduYWwgYWJvdXQgaW5wdXQgbWV0aG9kIGNoYW5naW5nIGl0cworICAgICAgICBz dGF0ZS4KKyAgICAgICAgKiBlZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkVkaXRvckNsaWVudEVmbDo6c2V0SW5wdXRNZXRob2RTdGF0ZSk6 IGNhbGwgbmV3IGZ1bmN0aW9uCisgICAgICAgIHJlc3BvbnNpYmxlIGZvciBpbXBsZW1lbnRpbmcg dGhpcyBub3RpZmljYXRpb24uCisgICAgICAgICogZWZsL2V3ay9ld2tfcHJpdmF0ZS5oOiBld2tf dmlld19pbnB1dF9tZXRob2Rfc3RhdGVfc2V0KCkgaXMgY2FsbGVkCisgICAgICAgIG9ubHkgZnJv bSBpbnNpZGUgV2ViS2l0LgorICAgICAgICAqIGVmbC9ld2svZXdrX3ZpZXcuY3BwOiBpbXBsZW1l bnQgc2V0dGVycyBhbmQgZ2V0dGVycworICAgICAgICAoZXdrX3ZpZXdfaW1oX2dldCk6CisgICAg ICAgIChld2tfdmlld19pbnB1dF9tZXRob2Rfc3RhdGVfc2V0KToKKyAgICAgICAgKiBlZmwvZXdr L2V3a192aWV3Lmg6IGludHJvZHVjZSBFd2tfSW1oIGVudW0gd2hpY2ggY29udGFpbnMgdGhlCisg ICAgICAgIHBvc3NpYmxlIGlucHV0IHR5cGVzLgorICAgICAgICAoX0V3a19WaWV3X1NtYXJ0X0Ns YXNzOjopOgorCiAyMDEwLTA3LTIwICBMdWNhcyBEZSBNYXJjaGkgIDxsdWNhcy5kZW1hcmNoaUBw cm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlz dGlhbnNlbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvRVdlYkxhdW5jaGVyL21haW4uYyBiL1dl YktpdC9lZmwvRVdlYkxhdW5jaGVyL21haW4uYwppbmRleCA2OTgwYTU4Zjk4OWRkMjBlODRjNDMx OThjYzAxYzAwZGFmYjdkMTVhLi5mZDlhNWY0NTg3MzliZDFhMmU5Y2U2MTcwMzdhZjkyMDMyNTEy MmJhIDEwMDY0NAotLS0gYS9XZWJLaXQvZWZsL0VXZWJMYXVuY2hlci9tYWluLmMKKysrIGIvV2Vi S2l0L2VmbC9FV2ViTGF1bmNoZXIvbWFpbi5jCkBAIC0zNzMsNiArMzczLDIxIEBAIG9uX3Rvb2x0 aXBfdGV4dF9zZXQodm9pZCogdXNlcl9kYXRhLCBFdmFzX09iamVjdCogd2Vidmlldywgdm9pZCog ZXZlbnRfaW5mbykKICAgICAgICAgaW5mbygiJXNcbiIsIHRleHQpOwogfQogCitzdGF0aWMgdm9p ZAorb25faW5wdXRtZXRob2RfY2hhbmdlZCh2b2lkKiB1c2VyX2RhdGEsIEV2YXNfT2JqZWN0KiB3 ZWJ2aWV3LCB2b2lkKiBldmVudF9pbmZvKQoreworICAgIEVpbmFfQm9vbCBhY3RpdmUgPSAoRWlu YV9Cb29sKShsb25nKWV2ZW50X2luZm87CisgICAgdW5zaWduZWQgaW50IGltaDsKKyAgICBpbmZv KCJLZXlib2FyZCBjaGFuZ2VkOiAlZFxuIiwgYWN0aXZlKTsKKworICAgIGlmICghYWN0aXZlKQor ICAgICAgICByZXR1cm47CisKKyAgICBpbWggPSBld2tfdmlld19pbWhfZ2V0KHdlYnZpZXcpOwor ICAgIGluZm8oIiAgICBLZXlib2FyZCBmbGFnczogJSMuMnhcbiIsIGltaCk7CisKK30KKwogLyoq CiAgKiAidmlld3BvcnQsY2hhbmdlZCIgc2lnbmFsIHdpbGwgYmUgYWx3YXlzIGVtaXR0ZWQgcmVn YXJkbGVzcyBvZiB0aGUgdmlld3BvcnQgZXhpc3RlbmNlLgogICoKQEAgLTY2MSw2ICs2NzYsNyBA QCBicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUsIGNvbnN0 IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9SZQogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2FkZChhcHAtPmJyb3dzZXIsICJtZW51YmFyLHZpc2libGUsc2V0Iiwgb25fbWVudWJhcl92aXNp YmxlX3NldCwgYXBwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5i cm93c2VyLCAibWVudWJhcix2aXNpYmxlLGdldCIsIG9uX21lbnViYXJfdmlzaWJsZV9nZXQsIGFw cCk7CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgInRv b2x0aXAsdGV4dCxzZXQiLCBvbl90b29sdGlwX3RleHRfc2V0LCBhcHApOworICAgIGV2YXNfb2Jq ZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsICJpbnB1dG1ldGhvZCxjaGFuZ2Vk Iiwgb25faW5wdXRtZXRob2RfY2hhbmdlZCwgYXBwKTsKIAogLyogICAgIGV3a19jYWxsYmFja19y ZXNpemVfcmVxdWVzdGVkX2FkZChhcHAtPmJyb3dzZXIsIG9uX3Jlc2l6ZV9yZXF1ZXN0ZWQsIGFw cC0+ZWUpOyAqLwogCmRpZmYgLS1naXQgYS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRv ckNsaWVudEVmbC5jcHAgYi9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEVm bC5jcHAKaW5kZXggY2Y2NzJlYjk3NWEyYzdlMTU4MzkwYjVjM2IwNGFmYTlmMjViZWM5OC4uYTYz YjcxMjFiNGFmMGVkMTgwOGU1ZTE5ZTM3OWFiNTRhNjNiZTUyNCAxMDA2NDQKLS0tIGEvV2ViS2l0 L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwCisrKyBiL1dlYktpdC9lZmwv V2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcApAQCAtNDcsNyArNDcsNyBAQCB2b2lk IEVkaXRvckNsaWVudEVmbDo6d2lsbFNldElucHV0TWV0aG9kU3RhdGUoKQogCiB2b2lkIEVkaXRv ckNsaWVudEVmbDo6c2V0SW5wdXRNZXRob2RTdGF0ZShib29sIGFjdGl2ZSkKIHsKLSAgICBub3RJ bXBsZW1lbnRlZCgpOworICAgIGV3a192aWV3X2lucHV0X21ldGhvZF9zdGF0ZV9zZXQobV92aWV3 LCBhY3RpdmUpOwogfQogCiBib29sIEVkaXRvckNsaWVudEVmbDo6c2hvdWxkRGVsZXRlUmFuZ2Uo UmFuZ2UqKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaCBiL1dlYktp dC9lZmwvZXdrL2V3a19wcml2YXRlLmgKaW5kZXggYzU0OWFkNzRiMmU2MjhlODA3NDEzY2IwYzQ1 ZGJlOWNhYjM5NWNjMy4uZGUzYjc1YzI2MTgxNDhhMDg5ZmRjZDI2OGNmMjg0OWVlY2YwNjBlNSAx MDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAorKysgYi9XZWJLaXQvZWZs L2V3ay9ld2tfcHJpdmF0ZS5oCkBAIC00OSw2ICs0OSw3IEBAIHN0cnVjdCBDb250ZXh0TWVudUl0 ZW07CiB9CiAKIHZvaWQgZXdrX3ZpZXdfcmVhZHkoRXZhc19PYmplY3QgKm8pOwordm9pZCBld2tf dmlld19pbnB1dF9tZXRob2Rfc3RhdGVfc2V0KEV2YXNfT2JqZWN0KiBvLCBFaW5hX0Jvb2wgYWN0 aXZlKTsKIHZvaWQgZXdrX3ZpZXdfdGl0bGVfc2V0KEV2YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFy ICp0aXRsZSk7CiB2b2lkIGV3a192aWV3X3VyaV9jaGFuZ2VkKEV2YXNfT2JqZWN0ICpvKTsKIHZv aWQgZXdrX3ZpZXdfbG9hZF9zdGFydGVkKEV2YXNfT2JqZWN0ICpvKTsKZGlmZiAtLWdpdCBhL1dl YktpdC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcApp bmRleCAxNzA3YTdkMDM1ZmVlMDk2NjIyZGI4ZGE2YzExNDhkZGNiNDgxZDY3Li4zMzNkMTM2YjA1 NGU1NTJkNDYxNGIzODAxMmY3NjU2MDcyYzdiOTI4IDEwMDY0NAotLS0gYS9XZWJLaXQvZWZsL2V3 ay9ld2tfdmlldy5jcHAKKysrIGIvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC0zNCw2 ICszNCw5IEBACiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnRFZmwuaCIKICNpbmNsdWRlICJG cmFtZVZpZXcuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKKyNpbmNsdWRlICJIVE1M RWxlbWVudC5oIgorI2luY2x1ZGUgIkhUTUxJbnB1dEVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1M TmFtZXMuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JDbGllbnRFZmwuaCIKICNpbmNsdWRlICJQbGF0 Zm9ybU1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJQb3B1cE1lbnVDbGllbnQuaCIKQEAgLTc5LDYg KzgyLDcgQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgICAgICBzaXplX3Qg Y291bnQ7CiAgICAgICAgIHNpemVfdCBhbGxvY2F0ZWQ7CiAgICAgfSBzY3JvbGxzOworICAgIHVu c2lnbmVkIGludCBpbWg7IC8qKjwgaW5wdXQgbWV0aG9kIGhpbnRzICovCiAgICAgc3RydWN0IHsK ICAgICAgICAgY29uc3QgY2hhciogdXNlcl9hZ2VudDsKICAgICAgICAgY29uc3QgY2hhciogdXNl cl9zdHlsZXNoZWV0OwpAQCAtMjE1MCw2ICsyMTU0LDIwIEBAIEVpbmFfQm9vbCBld2tfdmlld19w cmVfcmVuZGVyX3JlZ2lvbihFdmFzX09iamVjdCogbywgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3Jk IHksCiB9CiAKIC8qKgorICogR2V0IGlucHV0IG1ldGhvZCBoaW50cworICoKKyAqIEBwYXJhbSBv IFZpZXcuCisgKgorICogQHJldHVybiBpbnB1dCBtZXRob2QgaGludHMKKyAqLwordW5zaWduZWQg aW50IGV3a192aWV3X2ltaF9nZXQoRXZhc19PYmplY3QgKm8pCit7CisgICAgRVdLX1ZJRVdfU0Rf R0VUX09SX1JFVFVSTihvLCBzZCwgMCk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJO KHNkLCBwcml2LCAwKTsKKyAgICByZXR1cm4gcHJpdi0+aW1oOworfQorCisvKioKICAqIENhbmNl bCAoY2xlYXIpIHByZXZpb3VzIHByZS1yZW5kZXIgcmVxdWVzdHMuCiAgKgogICogQHBhcmFtIG8g dmlldyB0byBjbGVhciBwcmUtcmVuZGVyIHJlcXVlc3RzLgpAQCAtMzAyNiw2ICszMDQ0LDQ2IEBA IHZvaWQgZXdrX3ZpZXdfcmVhZHkoRXZhc19PYmplY3QqIG8pCiAKIC8qKgogICogQGludGVybmFs CisgKiBSZXBvcnRzIHRoZSBzdGF0ZSBvZiBpbnB1dCBtZXRob2QgY2hhbmdlZC4gVGhpcyBpcyB0 cmlnZ2VyZWQsIGZvciBleGFtcGxlCisgKiB3aGVuIGEgaW5wdXQgZmllbGQgcmVjZWl2ZWQvbG9z dCBmb2N1cworICoKKyAqIEVtaXRzIHNpZ25hbDogImlucHV0bWV0aG9kLGNoYW5nZWQiIHdpdGgg YSBib29sZWFuIGluZGljYXRpbmcgd2hldGhlciBpdCdzCisgKiBlbmFibGVkIG9yIG5vdC4KKyAq Lwordm9pZCBld2tfdmlld19pbnB1dF9tZXRob2Rfc3RhdGVfc2V0KEV2YXNfT2JqZWN0KiBvLCBF aW5hX0Jvb2wgYWN0aXZlKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2Qp OworICAgIEVXS19WSUVXX1BSSVZfR0VUKHNkLCBwcml2KTsKKyAgICBXZWJDb3JlOjpGcmFtZSog Zm9jdXNlZEZyYW1lID0gcHJpdi0+cGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1h aW5GcmFtZSgpOworCisgICAgaWYgKGZvY3VzZWRGcmFtZQorICAgICAgICAmJiBmb2N1c2VkRnJh bWUtPmRvY3VtZW50KCkKKyAgICAgICAgJiYgZm9jdXNlZEZyYW1lLT5kb2N1bWVudCgpLT5mb2N1 c2VkTm9kZSgpCisgICAgICAgICYmIGZvY3VzZWRGcmFtZS0+ZG9jdW1lbnQoKS0+Zm9jdXNlZE5v ZGUoKS0+aGFzVGFnTmFtZShXZWJDb3JlOjpIVE1MTmFtZXM6OmlucHV0VGFnKSkgeworICAgICAg ICBXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50KiBpbnB1dEVsZW1lbnQ7CisKKyAgICAgICAgaW5w dXRFbGVtZW50ID0gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6SFRNTElucHV0RWxlbWVudCo+KGZvY3Vz ZWRGcmFtZS0+ZG9jdW1lbnQoKS0+Zm9jdXNlZE5vZGUoKSk7CisgICAgICAgIGlmIChpbnB1dEVs ZW1lbnQpIHsKKyAgICAgICAgICAgIHByaXYtPmltaCA9IDA7CisgICAgICAgICAgICAvLyBmb3Ig cGFzc3dvcmQgZmllbGRzLCBhY3RpdmUgPT0gZmFsc2UKKyAgICAgICAgICAgIGlmICghYWN0aXZl KSB7CisgICAgICAgICAgICAgICAgYWN0aXZlID0gaW5wdXRFbGVtZW50LT5pc1Bhc3N3b3JkRmll bGQoKTsKKyAgICAgICAgICAgICAgICBwcml2LT5pbWggPSBpbnB1dEVsZW1lbnQtPmlzUGFzc3dv cmRGaWVsZCgpICogRVdLX0lNSF9QQVNTV09SRDsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICAgICAgLy8gU2V0IGlucHV0IG1ldGhvZCBoaW50cyBmb3IgIm51bWJlciIsICJ0ZWwi LCAiZW1haWwiLCBhbmQgInVybCIgaW5wdXQgZWxlbWVudHMuCisgICAgICAgICAgICAgICAgcHJp di0+aW1oIHw9IGlucHV0RWxlbWVudC0+aXNUZWxlcGhvbmVGaWVsZCgpICogRVdLX0lNSF9URUxF UEhPTkU7CisgICAgICAgICAgICAgICAgcHJpdi0+aW1oIHw9IGlucHV0RWxlbWVudC0+aXNOdW1i ZXJGaWVsZCgpICogRVdLX0lNSF9OVU1CRVI7CisgICAgICAgICAgICAgICAgcHJpdi0+aW1oIHw9 IGlucHV0RWxlbWVudC0+aXNFbWFpbEZpZWxkKCkgKiBFV0tfSU1IX0VNQUlMOworICAgICAgICAg ICAgICAgIHByaXYtPmltaCB8PSBpbnB1dEVsZW1lbnQtPmlzVXJsRmllbGQoKSAqIEVXS19JTUhf VVJMOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorCisgICAgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfY2FsbChvLCAiaW5wdXRtZXRob2QsY2hhbmdlZCIsICh2b2lkKilhY3Rp dmUpOworfQorCisvKioKKyAqIEBpbnRlcm5hbAogICogVGhlIHZpZXcgdGl0bGUgd2FzIGNoYW5n ZWQgYnkgdGhlIGZyYW1lIGxvYWRlci4KICAqCiAgKiBFbWl0cyBzaWduYWw6ICJ0aXRsZSxjaGFu Z2VkIiB3aXRoIHBvaW50ZXIgdG8gbmV3IHRpdGxlIHN0cmluZy4KZGlmZiAtLWdpdCBhL1dlYktp dC9lZmwvZXdrL2V3a192aWV3LmggYi9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCmluZGV4IDIw OWJlZmZmZTUxYjg0MTNmZTA2MTQ4ZTg2YjZiMGFkMWM4M2QzZTEuLjUyMGRlYTI1NzBlN2FmYzdl MThlYzU2MzI0NGI4MmUzMmVmMmJhMzggMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvZXdrL2V3a192 aWV3LmgKKysrIGIvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtODYsNiArODYsNyBAQCBl eHRlcm4gIkMiIHsKICAqICAgIGFuZCBhcyBhcmd1bWVudHMgZ2l2ZXMgaXRzIGRldGFpbHMuCiAg KiAgLSAiaWNvbixyZWNlaXZlZCIsIHZvaWQ6IG1haW4gZnJhbWUgcmVjZWl2ZWQgYW4gaWNvbi4K ICAqICAtICJ2aWV3cG9ydCxjaGFuZ2VkIiwgdm9pZDogUmVwb3J0IHRoYXQgdmlld3BvcnQgaGFz IGNoYW5nZWQuCisgKiAgLSAiaW5wdXRtZXRob2RzLGNoYW5nZWQiIHdpdGggYSBib29sZWFuIGlu ZGljYXRpbmcgd2hldGhlciBpdCdzIGVuYWJsZWQgb3Igbm90LgogICovCiAKIHR5cGVkZWYgc3Ry dWN0IF9Fd2tfVmlld19TbWFydF9EYXRhIEV3a19WaWV3X1NtYXJ0X0RhdGE7CkBAIC0xODYsNiAr MTg3LDE1IEBAIHN0cnVjdCBfRXdrX1ZpZXdfU21hcnRfQ2xhc3MgewogICovCiAjZGVmaW5lIEVX S19WSUVXX1NNQVJUX0NMQVNTX0lOSVRfTkFNRV9WRVJTSU9OKG5hbWUpIEVXS19WSUVXX1NNQVJU X0NMQVNTX0lOSVQoRVZBU19TTUFSVF9DTEFTU19JTklUX05BTUVfVkVSU0lPTihuYW1lKSkKIAor ZW51bSBfRXdrX0ltaCB7CisgICAgRVdLX0lNSF9URUxFUEhPTkUgPSAoMSA8PCAwKSwKKyAgICBF V0tfSU1IX05VTUJFUiA9ICgxIDw8IDEpLAorICAgIEVXS19JTUhfRU1BSUwgPSAoMSA8PCAyKSwK KyAgICBFV0tfSU1IX1VSTCA9ICgxIDw8IDMpLAorICAgIEVXS19JTUhfUEFTU1dPUkQgPSAoMSA8 PCA0KQorfTsKK3R5cGVkZWYgZW51bSBfRXdrX0ltaCBFd2tfSW1oOworCiAvKioKICAqIEBpbnRl cm5hbAogICoKQEAgLTM1Nyw2ICszNjcsOCBAQCBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld196 b29tX3RleHRfb25seV9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBzZXR0aW5nKQogRUFQ SSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfcHJlX3JlbmRlcl9yZWdpb24oRXZhc19PYmplY3QgKm8s IEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFdmFzX0Nvb3JkIHcsIEV2YXNfQ29vcmQgaCwg ZmxvYXQgem9vbSk7CiBFQVBJIHZvaWQgICAgICAgICBld2tfdmlld19wcmVfcmVuZGVyX2NhbmNl bChFdmFzX09iamVjdCAqbyk7CiAKK0VBUEkgdW5zaWduZWQgaW50IGV3a192aWV3X2ltaF9nZXQo RXZhc19PYmplY3QgKm8pOworCiAvKiBzZXR0aW5ncyAqLwogRUFQSSBjb25zdCBjaGFyICAqZXdr X3ZpZXdfc2V0dGluZ191c2VyX2FnZW50X2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CiBFQVBJ IEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3VzZXJfYWdlbnRfc2V0KEV2YXNfT2JqZWN0 ICpvLCBjb25zdCBjaGFyICp1c2VyX2FnZW50KTsK