76169 2012-01-12 04:58:42 -0800 [Qt] Set the input method hints on the QtQuick item 2012-01-12 06:57:56 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann webkit.review.bot zoltan oldest_to_newest 534751 0 kenneth 2012-01-12 04:58:42 -0800 SSIA 534752 1 122216 kenneth 2012-01-12 05:00:03 -0800 Created attachment 122216 Patch 534763 2 122216 hausmann 2012-01-12 05:36:10 -0800 Comment on attachment 122216 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122216&action=review > Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp:439 > + m_webPage->setInputMethodHints(Qt::InputMethodHints(editor.inputMethodHints)); Is the page the right object to set the hints on? We receive the input method event on the view, the view has the focus, so we should also be setting the input method hints on the view instead of on the page. > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:420 > + } else if (input->isPasswordField()) { > + // Set ImhHiddenText flag for password fields. The Qt platform > + // is responsible for determining which widget will receive input > + // method events for password fields. > + result.inputMethodHints |= Qt::ImhHiddenText; > + result.inputMethodHints |= Qt::ImhNoAutoUppercase; > + result.inputMethodHints |= Qt::ImhNoPredictiveText; I think password fields in QML2 will also set the ImhSensitiveData flag. 534778 3 122228 kenneth 2012-01-12 06:18:47 -0800 Created attachment 122228 Patch 534789 4 122230 kenneth 2012-01-12 06:43:15 -0800 Created attachment 122230 Patch 534794 5 122230 hausmann 2012-01-12 06:46:37 -0800 Comment on attachment 122230 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122230&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:80 > + eventHandler.reset(new QtWebPageEventHandler(toAPI(webPageProxy), q, viewportItem)); r=me, but the naming seems a little inconsistent here. In here it's called the viewportItem and in the event handler it's the webview. I suggest to go for the latter all the way :) 534797 6 kenneth 2012-01-12 06:52:20 -0800 (In reply to comment #5) > (From update of attachment 122230 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=122230&action=review > > > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:80 > > + eventHandler.reset(new QtWebPageEventHandler(toAPI(webPageProxy), q, viewportItem)); > > r=me, but the naming seems a little inconsistent here. In here it's called the viewportItem and in the event handler it's the webview. I suggest to go for the latter all the way :) It is consisten with the naming in the current files :-/ but the naming is inconsistent across files, but it seems like something to fix in a separate patch 534801 7 kenneth 2012-01-12 06:57:56 -0800 Landed in 104823. 122216 2012-01-12 05:00:03 -0800 2012-01-12 06:18:40 -0800 Patch bug-76169-20120112135542.patch text/plain 5317 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjFmODI3MGE5MTdmZjFi MDhiOWQ4OGYxNzMwZjkxYTMyNTc0MzRmNi4uNjZhODU3ZDcwNDNlN2JmZmI4NTgyM2I5NWVjYmRh YjQwOWYzNTY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAxLTEyICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdIFNldCB0aGUgaW5wdXQgbWV0aG9kIGhpbnRzIG9uIHRoZSBRdFF1aWNrIGl0ZW0KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MTY5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IHRoZSBpbnB1dCBt ZXRob2QgaGludHMgZ2l2ZW4gdGhlIEhUTUxFbGVtZW50IHR5cGUgYW5kIHN0YXRlLgorCisgICAg ICAgICogU2hhcmVkL0VkaXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3Rh dGU6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvclN0YXRlOjpkZWNvZGUpOgorICAg ICAgICAqIFNoYXJlZC9FZGl0b3JTdGF0ZS5oOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JTdGF0 ZTo6RWRpdG9yU3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhh bmRsZXIuY3BwOgorICAgICAgICAoUXRXZWJQYWdlRXZlbnRIYW5kbGVyOjp1cGRhdGVUZXh0SW5w dXRTdGF0ZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjplZGl0b3JTdGF0ZSk6CisKIDIwMTItMDEtMTIgIEV1bm1p IExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gVXBk YXRlIGFuZCBzaG93IGV3a192aWV3IHdpdGggdXBkYXRlZCB3ZWJwYWdlLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9FZGl0b3JTdGF0ZS5jcHAKaW5kZXggMzgxN2VlMWU2MWI4M2UyNTAwOTEwODNmODM5Y2Y0 ODMxNjBlMGUyMi4uNmU0NGEwZjE1YTUwOTNjZDViMTBlYWNhZDdlYjAwN2U0ZWZhMjU3MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCkBAIC00Nyw2ICs0Nyw3IEBAIHZvaWQg RWRpdG9yU3RhdGU6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNv bnN0CiAgICAgZW5jb2Rlci0+ZW5jb2RlKGVkaXRvclJlY3QpOwogICAgIGVuY29kZXItPmVuY29k ZShjdXJzb3JSZWN0KTsKICAgICBlbmNvZGVyLT5lbmNvZGUoY29tcG9zaXRpb25SZWN0KTsKKyAg ICBlbmNvZGVyLT5lbmNvZGUoaW5wdXRNZXRob2RIaW50cyk7CiAgICAgZW5jb2Rlci0+ZW5jb2Rl KHNlbGVjdGVkVGV4dCk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHN1cnJvdW5kaW5nVGV4dCk7CiAj ZW5kaWYKQEAgLTkxLDYgKzkyLDkgQEAgYm9vbCBFZGl0b3JTdGF0ZTo6ZGVjb2RlKENvcmVJUEM6 OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgRWRpdG9yU3RhdGUmIHJlc3VsdCkKICAgICBpZiAo IWRlY29kZXItPmRlY29kZShyZXN1bHQuY29tcG9zaXRpb25SZWN0KSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LmlucHV0TWV0aG9kSGlu dHMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRlY29kZXItPmRlY29kZShy ZXN1bHQuc2VsZWN0ZWRUZXh0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvRWRpdG9yU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9FZGl0b3JTdGF0ZS5oCmluZGV4IDg5NzE0N2ZjM2JmMWRhNzM3MGQ5ZDIxOTIxYzg4MDg5 NTY2ZDFhOWUuLmFjMWQ3OTNhY2Y4NzAyZmQ3MTFlNDg3OTk4ZWVmNTc0YzM3NGM3YzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9FZGl0b3JTdGF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9FZGl0b3JTdGF0ZS5oCkBAIC00NSw2ICs0NSw3IEBAIHN0cnVjdCBFZGl0 b3JTdGF0ZSB7CiAjaWYgUExBVEZPUk0oUVQpCiAgICAgICAgICwgY3Vyc29yUG9zaXRpb24oMCkK ICAgICAgICAgLCBhbmNob3JQb3NpdGlvbigwKQorICAgICAgICAsIGlucHV0TWV0aG9kSGludHMo MCkKICNlbmRpZgogICAgIHsKICAgICB9CkBAIC02Niw2ICs2Nyw5IEBAIHN0cnVjdCBFZGl0b3JT dGF0ZSB7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBlZGl0b3JSZWN0OwogICAgIFdlYkNvcmU6Oklu dFJlY3QgY3Vyc29yUmVjdDsKICAgICBXZWJDb3JlOjpJbnRSZWN0IGNvbXBvc2l0aW9uUmVjdDsK KworICAgIHVpbnQ2NF90IGlucHV0TWV0aG9kSGludHM7CisKICAgICBXVEY6OlN0cmluZyBzZWxl Y3RlZFRleHQ7CiAgICAgV1RGOjpTdHJpbmcgc3Vycm91bmRpbmdUZXh0OwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRIYW5kbGVy LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIu Y3BwCmluZGV4IGU1MTc1MjAxYTVjZTMxMWNiNWFkODg2MmI1NWE5MTdmZjFhODJkM2QuLjE2MmY5 OGFmYzVhMmJiNjRkNGI0NzA3YzIwZWM0MDE2NGE5MmZlZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwCkBAIC00MzYs NiArNDM2LDggQEAgdm9pZCBRdFdlYlBhZ2VFdmVudEhhbmRsZXI6OnVwZGF0ZVRleHRJbnB1dFN0 YXRlKCkKIAogICAgIGNvbnN0IEVkaXRvclN0YXRlJiBlZGl0b3IgPSBtX3dlYlBhZ2VQcm94eS0+ ZWRpdG9yU3RhdGUoKTsKIAorICAgIG1fd2ViUGFnZS0+c2V0SW5wdXRNZXRob2RIaW50cyhRdDo6 SW5wdXRNZXRob2RIaW50cyhlZGl0b3IuaW5wdXRNZXRob2RIaW50cykpOworCiAgICAgLy8gSWdu b3JlIGlucHV0IG1ldGhvZCByZXF1ZXN0cyBub3QgZHVlIHRvIGEgdGFwIGdlc3R1cmUuCiAgICAg aWYgKCFlZGl0b3IuaXNDb250ZW50RWRpdGFibGUpCiAgICAgICAgIHNldElucHV0UGFuZWxWaXNp YmxlKGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcAppbmRleCBkMDQzZWI0ODdhZWZiY2ExYjQ3YzdhZTcyYzI4MTA1NzJiYmJkZWMxLi4wNjk3 NjYxMTU2NzAzMzAwNmNhYTViNDE3OTg4ZTQ0ODA5NmRlMTdhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC05MCw2ICs5MCw3IEBACiAjaW5j bHVkZSA8V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFt ZVZpZXcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0hUTUxGb3JtRWxlbWVudC5oPgorI2luY2x1ZGUg PFdlYkNvcmUvSFRNTElucHV0RWxlbWVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSGlzdG9yeUl0 ZW0uaD4KICNpbmNsdWRlIDxXZWJDb3JlL0tleWJvYXJkRXZlbnQuaD4KICNpbmNsdWRlIDxXZWJD b3JlL01vdXNlRXZlbnQuaD4KQEAgLTM5OCw2ICszOTksMjggQEAgRWRpdG9yU3RhdGUgV2ViUGFn ZTo6ZWRpdG9yU3RhdGUoKSBjb25zdAogICAgIGlmICghc2NvcGUpCiAgICAgICAgIHJldHVybiBy ZXN1bHQ7CiAKKyAgICBpZiAoc2NvcGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjppbnB1dFRhZykp IHsKKyAgICAgICAgSFRNTElucHV0RWxlbWVudCogaW5wdXQgPSBzdGF0aWNfY2FzdDxIVE1MSW5w dXRFbGVtZW50Kj4oc2NvcGUpOworICAgICAgICBpZiAoaW5wdXQtPmlzVGVsZXBob25lRmllbGQo KSkKKyAgICAgICAgICAgIHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhEaWFsYWJs ZUNoYXJhY3RlcnNPbmx5OworICAgICAgICBlbHNlIGlmIChpbnB1dC0+aXNOdW1iZXJGaWVsZCgp KQorICAgICAgICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaERpZ2l0c09u bHk7CisgICAgICAgIGVsc2UgaWYgKGlucHV0LT5pc0VtYWlsRmllbGQoKSkgeworICAgICAgICAg ICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaEVtYWlsQ2hhcmFjdGVyc09ubHk7 CisgICAgICAgICAgICByZXN1bHQuaW5wdXRNZXRob2RIaW50cyB8PSBRdDo6SW1oTm9BdXRvVXBw ZXJjYXNlOworICAgICAgICB9IGVsc2UgaWYgKGlucHV0LT5pc1VSTEZpZWxkKCkpIHsKKyAgICAg ICAgICAgIHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhVcmxDaGFyYWN0ZXJzT25s eTsKKyAgICAgICAgICAgIHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhOb0F1dG9V cHBlcmNhc2U7CisgICAgICAgIH0gZWxzZSBpZiAoaW5wdXQtPmlzUGFzc3dvcmRGaWVsZCgpKSB7 CisgICAgICAgICAgICAvLyBTZXQgSW1oSGlkZGVuVGV4dCBmbGFnIGZvciBwYXNzd29yZCBmaWVs ZHMuIFRoZSBRdCBwbGF0Zm9ybQorICAgICAgICAgICAgLy8gaXMgcmVzcG9uc2libGUgZm9yIGRl dGVybWluaW5nIHdoaWNoIHdpZGdldCB3aWxsIHJlY2VpdmUgaW5wdXQKKyAgICAgICAgICAgIC8v IG1ldGhvZCBldmVudHMgZm9yIHBhc3N3b3JkIGZpZWxkcy4KKyAgICAgICAgICAgIHJlc3VsdC5p bnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhIaWRkZW5UZXh0OworICAgICAgICAgICAgcmVzdWx0 LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaE5vQXV0b1VwcGVyY2FzZTsKKyAgICAgICAgICAg IHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhOb1ByZWRpY3RpdmVUZXh0OworICAg ICAgICB9CisgICAgfQorCiAgICAgaWYgKHNlbGVjdGlvblJvb3QpCiAgICAgICAgIHJlc3VsdC5l ZGl0b3JSZWN0ID0gZnJhbWUtPnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhzZWxlY3Rpb25Sb290 LT5nZXRSZWN0KCkpOwogCg== 122228 2012-01-12 06:18:47 -0800 2012-01-12 06:43:09 -0800 Patch bug-76169-20120112151425.patch text/plain 5393 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjFmODI3MGE5MTdmZjFi MDhiOWQ4OGYxNzMwZjkxYTMyNTc0MzRmNi4uNjZhODU3ZDcwNDNlN2JmZmI4NTgyM2I5NWVjYmRh YjQwOWYzNTY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAxLTEyICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdIFNldCB0aGUgaW5wdXQgbWV0aG9kIGhpbnRzIG9uIHRoZSBRdFF1aWNrIGl0ZW0KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MTY5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IHRoZSBpbnB1dCBt ZXRob2QgaGludHMgZ2l2ZW4gdGhlIEhUTUxFbGVtZW50IHR5cGUgYW5kIHN0YXRlLgorCisgICAg ICAgICogU2hhcmVkL0VkaXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3Rh dGU6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvclN0YXRlOjpkZWNvZGUpOgorICAg ICAgICAqIFNoYXJlZC9FZGl0b3JTdGF0ZS5oOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JTdGF0 ZTo6RWRpdG9yU3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhh bmRsZXIuY3BwOgorICAgICAgICAoUXRXZWJQYWdlRXZlbnRIYW5kbGVyOjp1cGRhdGVUZXh0SW5w dXRTdGF0ZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjplZGl0b3JTdGF0ZSk6CisKIDIwMTItMDEtMTIgIEV1bm1p IExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gVXBk YXRlIGFuZCBzaG93IGV3a192aWV3IHdpdGggdXBkYXRlZCB3ZWJwYWdlLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9FZGl0b3JTdGF0ZS5jcHAKaW5kZXggMzgxN2VlMWU2MWI4M2UyNTAwOTEwODNmODM5Y2Y0 ODMxNjBlMGUyMi4uNmU0NGEwZjE1YTUwOTNjZDViMTBlYWNhZDdlYjAwN2U0ZWZhMjU3MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCkBAIC00Nyw2ICs0Nyw3IEBAIHZvaWQg RWRpdG9yU3RhdGU6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNv bnN0CiAgICAgZW5jb2Rlci0+ZW5jb2RlKGVkaXRvclJlY3QpOwogICAgIGVuY29kZXItPmVuY29k ZShjdXJzb3JSZWN0KTsKICAgICBlbmNvZGVyLT5lbmNvZGUoY29tcG9zaXRpb25SZWN0KTsKKyAg ICBlbmNvZGVyLT5lbmNvZGUoaW5wdXRNZXRob2RIaW50cyk7CiAgICAgZW5jb2Rlci0+ZW5jb2Rl KHNlbGVjdGVkVGV4dCk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHN1cnJvdW5kaW5nVGV4dCk7CiAj ZW5kaWYKQEAgLTkxLDYgKzkyLDkgQEAgYm9vbCBFZGl0b3JTdGF0ZTo6ZGVjb2RlKENvcmVJUEM6 OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgRWRpdG9yU3RhdGUmIHJlc3VsdCkKICAgICBpZiAo IWRlY29kZXItPmRlY29kZShyZXN1bHQuY29tcG9zaXRpb25SZWN0KSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LmlucHV0TWV0aG9kSGlu dHMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRlY29kZXItPmRlY29kZShy ZXN1bHQuc2VsZWN0ZWRUZXh0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvRWRpdG9yU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9FZGl0b3JTdGF0ZS5oCmluZGV4IDg5NzE0N2ZjM2JmMWRhNzM3MGQ5ZDIxOTIxYzg4MDg5 NTY2ZDFhOWUuLmFjMWQ3OTNhY2Y4NzAyZmQ3MTFlNDg3OTk4ZWVmNTc0YzM3NGM3YzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9FZGl0b3JTdGF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9FZGl0b3JTdGF0ZS5oCkBAIC00NSw2ICs0NSw3IEBAIHN0cnVjdCBFZGl0 b3JTdGF0ZSB7CiAjaWYgUExBVEZPUk0oUVQpCiAgICAgICAgICwgY3Vyc29yUG9zaXRpb24oMCkK ICAgICAgICAgLCBhbmNob3JQb3NpdGlvbigwKQorICAgICAgICAsIGlucHV0TWV0aG9kSGludHMo MCkKICNlbmRpZgogICAgIHsKICAgICB9CkBAIC02Niw2ICs2Nyw5IEBAIHN0cnVjdCBFZGl0b3JT dGF0ZSB7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBlZGl0b3JSZWN0OwogICAgIFdlYkNvcmU6Oklu dFJlY3QgY3Vyc29yUmVjdDsKICAgICBXZWJDb3JlOjpJbnRSZWN0IGNvbXBvc2l0aW9uUmVjdDsK KworICAgIHVpbnQ2NF90IGlucHV0TWV0aG9kSGludHM7CisKICAgICBXVEY6OlN0cmluZyBzZWxl Y3RlZFRleHQ7CiAgICAgV1RGOjpTdHJpbmcgc3Vycm91bmRpbmdUZXh0OwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRIYW5kbGVy LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIu Y3BwCmluZGV4IGU1MTc1MjAxYTVjZTMxMWNiNWFkODg2MmI1NWE5MTdmZjFhODJkM2QuLjllYmQy MzIwNDZhMmQ0NTg3YmY5NjA3ZDliMDVjMGMxNDkwMjE2OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwCkBAIC00MzYs NiArNDM2LDggQEAgdm9pZCBRdFdlYlBhZ2VFdmVudEhhbmRsZXI6OnVwZGF0ZVRleHRJbnB1dFN0 YXRlKCkKIAogICAgIGNvbnN0IEVkaXRvclN0YXRlJiBlZGl0b3IgPSBtX3dlYlBhZ2VQcm94eS0+ ZWRpdG9yU3RhdGUoKTsKIAorICAgIG1fd2ViUGFnZS0+cGFyZW50SXRlbSgpLT5zZXRJbnB1dE1l dGhvZEhpbnRzKFF0OjpJbnB1dE1ldGhvZEhpbnRzKGVkaXRvci5pbnB1dE1ldGhvZEhpbnRzKSk7 CisKICAgICAvLyBJZ25vcmUgaW5wdXQgbWV0aG9kIHJlcXVlc3RzIG5vdCBkdWUgdG8gYSB0YXAg Z2VzdHVyZS4KICAgICBpZiAoIWVkaXRvci5pc0NvbnRlbnRFZGl0YWJsZSkKICAgICAgICAgc2V0 SW5wdXRQYW5lbFZpc2libGUoZmFsc2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGQwNDNlYjQ4N2FlZmJjYTFiNDdjN2FlNzJjMjgxMDU3 MmJiYmRlYzEuLmExYzNjMmMwMDMzNzA5NDdiMzA4MjBkMDljYTMwYTgzOTdjMmZhNDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTkwLDYg KzkwLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lTG9hZGVyVHlwZXMuaD4KICNpbmNsdWRl IDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSFRNTEZvcm1FbGVtZW50 Lmg+CisjaW5jbHVkZSA8V2ViQ29yZS9IVE1MSW5wdXRFbGVtZW50Lmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9IaXN0b3J5SXRlbS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvS2V5Ym9hcmRFdmVudC5oPgog I2luY2x1ZGUgPFdlYkNvcmUvTW91c2VFdmVudC5oPgpAQCAtMzk4LDYgKzM5OSwyOSBAQCBFZGl0 b3JTdGF0ZSBXZWJQYWdlOjplZGl0b3JTdGF0ZSgpIGNvbnN0CiAgICAgaWYgKCFzY29wZSkKICAg ICAgICAgcmV0dXJuIHJlc3VsdDsKIAorICAgIGlmIChzY29wZS0+aGFzVGFnTmFtZShIVE1MTmFt ZXM6OmlucHV0VGFnKSkgeworICAgICAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IHN0YXRp Y19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihzY29wZSk7CisgICAgICAgIGlmIChpbnB1dC0+aXNU ZWxlcGhvbmVGaWVsZCgpKQorICAgICAgICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0g UXQ6OkltaERpYWxhYmxlQ2hhcmFjdGVyc09ubHk7CisgICAgICAgIGVsc2UgaWYgKGlucHV0LT5p c051bWJlckZpZWxkKCkpCisgICAgICAgICAgICByZXN1bHQuaW5wdXRNZXRob2RIaW50cyB8PSBR dDo6SW1oRGlnaXRzT25seTsKKyAgICAgICAgZWxzZSBpZiAoaW5wdXQtPmlzRW1haWxGaWVsZCgp KSB7CisgICAgICAgICAgICByZXN1bHQuaW5wdXRNZXRob2RIaW50cyB8PSBRdDo6SW1oRW1haWxD aGFyYWN0ZXJzT25seTsKKyAgICAgICAgICAgIHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0 OjpJbWhOb0F1dG9VcHBlcmNhc2U7CisgICAgICAgIH0gZWxzZSBpZiAoaW5wdXQtPmlzVVJMRmll bGQoKSkgeworICAgICAgICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaFVy bENoYXJhY3RlcnNPbmx5OworICAgICAgICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0g UXQ6OkltaE5vQXV0b1VwcGVyY2FzZTsKKyAgICAgICAgfSBlbHNlIGlmIChpbnB1dC0+aXNQYXNz d29yZEZpZWxkKCkpIHsKKyAgICAgICAgICAgIC8vIFNldCBJbWhIaWRkZW5UZXh0IGZsYWcgZm9y IHBhc3N3b3JkIGZpZWxkcy4gVGhlIFF0IHBsYXRmb3JtCisgICAgICAgICAgICAvLyBpcyByZXNw b25zaWJsZSBmb3IgZGV0ZXJtaW5pbmcgd2hpY2ggd2lkZ2V0IHdpbGwgcmVjZWl2ZSBpbnB1dAor ICAgICAgICAgICAgLy8gbWV0aG9kIGV2ZW50cyBmb3IgcGFzc3dvcmQgZmllbGRzLgorICAgICAg ICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaEhpZGRlblRleHQ7CisgICAg ICAgICAgICByZXN1bHQuaW5wdXRNZXRob2RIaW50cyB8PSBRdDo6SW1oTm9BdXRvVXBwZXJjYXNl OworICAgICAgICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaE5vUHJlZGlj dGl2ZVRleHQ7CisgICAgICAgICAgICByZXN1bHQuaW5wdXRNZXRob2RIaW50cyB8PSBRdDo6SW1o U2Vuc2l0aXZlRGF0YTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGlmIChzZWxlY3Rpb25Sb290 KQogICAgICAgICByZXN1bHQuZWRpdG9yUmVjdCA9IGZyYW1lLT52aWV3KCktPmNvbnRlbnRzVG9X aW5kb3coc2VsZWN0aW9uUm9vdC0+Z2V0UmVjdCgpKTsKIAo= 122230 2012-01-12 06:43:15 -0800 2012-01-12 06:46:37 -0800 Patch bug-76169-20120112153853.patch text/plain 10398 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjFmODI3MGE5MTdmZjFi MDhiOWQ4OGYxNzMwZjkxYTMyNTc0MzRmNi4uNjZhODU3ZDcwNDNlN2JmZmI4NTgyM2I5NWVjYmRh YjQwOWYzNTY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAxLTEyICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdIFNldCB0aGUgaW5wdXQgbWV0aG9kIGhpbnRzIG9uIHRoZSBRdFF1aWNrIGl0ZW0KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MTY5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IHRoZSBpbnB1dCBt ZXRob2QgaGludHMgZ2l2ZW4gdGhlIEhUTUxFbGVtZW50IHR5cGUgYW5kIHN0YXRlLgorCisgICAg ICAgICogU2hhcmVkL0VkaXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3Rh dGU6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvclN0YXRlOjpkZWNvZGUpOgorICAg ICAgICAqIFNoYXJlZC9FZGl0b3JTdGF0ZS5oOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JTdGF0 ZTo6RWRpdG9yU3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhh bmRsZXIuY3BwOgorICAgICAgICAoUXRXZWJQYWdlRXZlbnRIYW5kbGVyOjp1cGRhdGVUZXh0SW5w dXRTdGF0ZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjplZGl0b3JTdGF0ZSk6CisKIDIwMTItMDEtMTIgIEV1bm1p IExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gVXBk YXRlIGFuZCBzaG93IGV3a192aWV3IHdpdGggdXBkYXRlZCB3ZWJwYWdlLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9FZGl0b3JTdGF0ZS5jcHAKaW5kZXggMzgxN2VlMWU2MWI4M2UyNTAwOTEwODNmODM5Y2Y0 ODMxNjBlMGUyMi4uNmU0NGEwZjE1YTUwOTNjZDViMTBlYWNhZDdlYjAwN2U0ZWZhMjU3MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCkBAIC00Nyw2ICs0Nyw3IEBAIHZvaWQg RWRpdG9yU3RhdGU6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNv bnN0CiAgICAgZW5jb2Rlci0+ZW5jb2RlKGVkaXRvclJlY3QpOwogICAgIGVuY29kZXItPmVuY29k ZShjdXJzb3JSZWN0KTsKICAgICBlbmNvZGVyLT5lbmNvZGUoY29tcG9zaXRpb25SZWN0KTsKKyAg ICBlbmNvZGVyLT5lbmNvZGUoaW5wdXRNZXRob2RIaW50cyk7CiAgICAgZW5jb2Rlci0+ZW5jb2Rl KHNlbGVjdGVkVGV4dCk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHN1cnJvdW5kaW5nVGV4dCk7CiAj ZW5kaWYKQEAgLTkxLDYgKzkyLDkgQEAgYm9vbCBFZGl0b3JTdGF0ZTo6ZGVjb2RlKENvcmVJUEM6 OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgRWRpdG9yU3RhdGUmIHJlc3VsdCkKICAgICBpZiAo IWRlY29kZXItPmRlY29kZShyZXN1bHQuY29tcG9zaXRpb25SZWN0KSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LmlucHV0TWV0aG9kSGlu dHMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRlY29kZXItPmRlY29kZShy ZXN1bHQuc2VsZWN0ZWRUZXh0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvRWRpdG9yU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9FZGl0b3JTdGF0ZS5oCmluZGV4IDg5NzE0N2ZjM2JmMWRhNzM3MGQ5ZDIxOTIxYzg4MDg5 NTY2ZDFhOWUuLmFjMWQ3OTNhY2Y4NzAyZmQ3MTFlNDg3OTk4ZWVmNTc0YzM3NGM3YzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9FZGl0b3JTdGF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9FZGl0b3JTdGF0ZS5oCkBAIC00NSw2ICs0NSw3IEBAIHN0cnVjdCBFZGl0 b3JTdGF0ZSB7CiAjaWYgUExBVEZPUk0oUVQpCiAgICAgICAgICwgY3Vyc29yUG9zaXRpb24oMCkK ICAgICAgICAgLCBhbmNob3JQb3NpdGlvbigwKQorICAgICAgICAsIGlucHV0TWV0aG9kSGludHMo MCkKICNlbmRpZgogICAgIHsKICAgICB9CkBAIC02Niw2ICs2Nyw5IEBAIHN0cnVjdCBFZGl0b3JT dGF0ZSB7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBlZGl0b3JSZWN0OwogICAgIFdlYkNvcmU6Oklu dFJlY3QgY3Vyc29yUmVjdDsKICAgICBXZWJDb3JlOjpJbnRSZWN0IGNvbXBvc2l0aW9uUmVjdDsK KworICAgIHVpbnQ2NF90IGlucHV0TWV0aG9kSGludHM7CisKICAgICBXVEY6OlN0cmluZyBzZWxl Y3RlZFRleHQ7CiAgICAgV1RGOjpTdHJpbmcgc3Vycm91bmRpbmdUZXh0OwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcAppbmRl eCBiNWRiMzkzOGY2NzY2ODQwMjdmMDRhZGYxNTU4ZDBlZTJmZjFhNGQxLi5hOGMxNzE4ODBiOTU4 ZTBiOGIyN2U5YjA0ZWEwZmVjNzI3ODA2OTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKQEAgLTMwLDkgKzMwLDkgQEAKICNpbmNs dWRlIDxRdFF1aWNrL1FTR0dlb21ldHJ5Tm9kZT4KICNpbmNsdWRlIDxRdFF1aWNrL1FTR01hdGVy aWFsPgogCi1RUXVpY2tXZWJQYWdlOjpRUXVpY2tXZWJQYWdlKFFRdWlja0l0ZW0qIHBhcmVudCkK LSAgICA6IFFRdWlja0l0ZW0ocGFyZW50KQotICAgICwgZChuZXcgUVF1aWNrV2ViUGFnZVByaXZh dGUodGhpcykpCitRUXVpY2tXZWJQYWdlOjpRUXVpY2tXZWJQYWdlKFFRdWlja1dlYlZpZXcqIHZp ZXdwb3J0SXRlbSkKKyAgICA6IFFRdWlja0l0ZW0odmlld3BvcnRJdGVtKQorICAgICwgZChuZXcg UVF1aWNrV2ViUGFnZVByaXZhdGUodGhpcywgdmlld3BvcnRJdGVtKSkKIHsKICAgICBzZXRGbGFn KEl0ZW1IYXNDb250ZW50cyk7CiAKQEAgLTYyLDggKzYyLDkgQEAgdm9pZCBRUXVpY2tXZWJQYWdl OjpnZW9tZXRyeUNoYW5nZWQoY29uc3QgUVJlY3RGJiBuZXdHZW9tZXRyeSwgY29uc3QgUVJlY3RG JiBvbGQKICAgICAgICAgZC0+c2V0RHJhd2luZ0FyZWFTaXplKG5ld0dlb21ldHJ5LnNpemUoKS50 b1NpemUoKSk7CiB9CiAKLVFRdWlja1dlYlBhZ2VQcml2YXRlOjpRUXVpY2tXZWJQYWdlUHJpdmF0 ZShRUXVpY2tXZWJQYWdlKiBxKQorUVF1aWNrV2ViUGFnZVByaXZhdGU6OlFRdWlja1dlYlBhZ2VQ cml2YXRlKFFRdWlja1dlYlBhZ2UqIHEsIFFRdWlja1dlYlZpZXcqIHZpZXdwb3J0SXRlbSkKICAg ICA6IHEocSkKKyAgICAsIHZpZXdwb3J0SXRlbSh2aWV3cG9ydEl0ZW0pCiAgICAgLCB3ZWJQYWdl UHJveHkoMCkKICAgICAsIHNnVXBkYXRlUXVldWUocSkKICAgICAsIHBhaW50aW5nSXNJbml0aWFs aXplZChmYWxzZSkKQEAgLTc2LDcgKzc3LDcgQEAgUVF1aWNrV2ViUGFnZVByaXZhdGU6OlFRdWlj a1dlYlBhZ2VQcml2YXRlKFFRdWlja1dlYlBhZ2UqIHEpCiB2b2lkIFFRdWlja1dlYlBhZ2VQcml2 YXRlOjppbml0aWFsaXplKFdlYktpdDo6V2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHkpCiB7CiAg ICAgdGhpcy0+d2ViUGFnZVByb3h5ID0gd2ViUGFnZVByb3h5OwotICAgIGV2ZW50SGFuZGxlci5y ZXNldChuZXcgUXRXZWJQYWdlRXZlbnRIYW5kbGVyKHRvQVBJKHdlYlBhZ2VQcm94eSksIHEpKTsK KyAgICBldmVudEhhbmRsZXIucmVzZXQobmV3IFF0V2ViUGFnZUV2ZW50SGFuZGxlcih0b0FQSSh3 ZWJQYWdlUHJveHkpLCBxLCB2aWV3cG9ydEl0ZW0pKTsKIH0KIAogc3RhdGljIGZsb2F0IGNvbXB1 dGVFZmZlY3RpdmVPcGFjaXR5KGNvbnN0IFFRdWlja0l0ZW0qIGl0ZW0pCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2VfcC5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3AuaAppbmRleCBmNzk3ODEw ZjY0MmFlZWViNWQ3ZDUwYjc2YWIzNjU2ZDRkZTNiNWFhLi5iZjQ0YjlkYzdlMjUwZWNjMmJiZmY0 Y2JjYjNiMGVhOWUwNTkyYjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnBhZ2VfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrd2VicGFnZV9wLmgKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlIDxRdFF1 aWNrL1FRdWlja0l0ZW0+CiAKIGNsYXNzIFFRdWlja1dlYlBhZ2VQcml2YXRlOworY2xhc3MgUVF1 aWNrV2ViVmlldzsKIGNsYXNzIFF0V2ViUGFnZUV2ZW50SGFuZGxlcjsKIGNsYXNzIFFXZWJQcmVm ZXJlbmNlczsKIApAQCAtMzcsNyArMzgsNyBAQCBjbGFzcyBRdFNHVXBkYXRlUXVldWU7CiBjbGFz cyBRV0VCS0lUX0VYUE9SVCBRUXVpY2tXZWJQYWdlIDogcHVibGljIFFRdWlja0l0ZW0gewogICAg IFFfT0JKRUNUCiBwdWJsaWM6Ci0gICAgUVF1aWNrV2ViUGFnZShRUXVpY2tJdGVtKiBwYXJlbnQg PSAwKTsKKyAgICBRUXVpY2tXZWJQYWdlKFFRdWlja1dlYlZpZXcqIHZpZXcgPSAwKTsKICAgICB2 aXJ0dWFsIH5RUXVpY2tXZWJQYWdlKCk7CiAKICAgICB2b2lkIHNldENvbnRlbnRTaXplKGNvbnN0 IFFTaXplRiYgc2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnBhZ2VfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnBhZ2VfcF9wLmgKaW5kZXggM2I1OGViNTEwZTc4YjZjMDY3NTA5YWU0ZThlNjFi YjdmM2EwMjZiMC4uOTljYjJjMmE0ZjYzY2JkM2UwNjc4MDg3YTMwOWU4OGQ0YWZjZTJiYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3Bf cC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZV9w X3AuaApAQCAtMzQsNyArMzQsNyBAQCBjbGFzcyBRdFdlYlBhZ2VFdmVudEhhbmRsZXI7CiAKIGNs YXNzIFFRdWlja1dlYlBhZ2VQcml2YXRlIHsKIHB1YmxpYzoKLSAgICBRUXVpY2tXZWJQYWdlUHJp dmF0ZShRUXVpY2tXZWJQYWdlKiBxKTsKKyAgICBRUXVpY2tXZWJQYWdlUHJpdmF0ZShRUXVpY2tX ZWJQYWdlKiBxLCBRUXVpY2tXZWJWaWV3KiB2aWV3cG9ydEl0ZW0pOwogICAgIH5RUXVpY2tXZWJQ YWdlUHJpdmF0ZSgpOwogCiAgICAgdm9pZCBpbml0aWFsaXplKFdlYktpdDo6V2ViUGFnZVByb3h5 Kik7CkBAIC00Nyw2ICs0Nyw3IEBAIHB1YmxpYzoKIAogICAgIFFTY29wZWRQb2ludGVyPFF0V2Vi UGFnZUV2ZW50SGFuZGxlcj4gZXZlbnRIYW5kbGVyOwogICAgIFFRdWlja1dlYlBhZ2UqIGNvbnN0 IHE7CisgICAgUVF1aWNrV2ViVmlldyogY29uc3Qgdmlld3BvcnRJdGVtOwogICAgIFdlYktpdDo6 V2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHk7CiAgICAgV2ViS2l0OjpRdFNHVXBkYXRlUXVldWUg c2dVcGRhdGVRdWV1ZTsKICAgICBib29sIHBhaW50aW5nSXNJbml0aWFsaXplZDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAK aW5kZXggZTUxNzUyMDFhNWNlMzExY2I1YWQ4ODYyYjU1YTkxN2ZmMWE4MmQzZC4uMGUzZjQ1MDUz OGU4ZDk3NzMzMmRmNzlkOWU5MmVjOTExNWJmY2E4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAKQEAgLTI2LDYgKzI2 LDcgQEAKICNpbmNsdWRlICJOYXRpdmVXZWJXaGVlbEV2ZW50LmgiCiAjaW5jbHVkZSAiUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmgiCiAjaW5jbHVkZSAicXF1aWNrd2VicGFnZV9wLmgiCisj aW5jbHVkZSAicXF1aWNrd2Vidmlld19wLmgiCiAjaW5jbHVkZSA8UURyYWc+CiAjaW5jbHVkZSA8 UUdyYXBoaWNzU2NlbmVNb3VzZUV2ZW50PgogI2luY2x1ZGUgPFFHdWlBcHBsaWNhdGlvbj4KQEAg LTg0LDEyICs4NSwxMyBAQCBzdGF0aWMgaW5saW5lIFdlYkNvcmU6OkRyYWdPcGVyYXRpb24gZHJv cEFjdGlvblRvRHJhZ09wZXJhdGlvbihRdDo6RHJvcEFjdGlvbnMgYQogICAgIHJldHVybiAoRHJh Z09wZXJhdGlvbilyZXN1bHQ7CiB9CiAKLVF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6UXRXZWJQYWdl RXZlbnRIYW5kbGVyKFdLUGFnZVJlZiBwYWdlUmVmLCBRUXVpY2tXZWJQYWdlKiBxbWxXZWJQYWdl KQorUXRXZWJQYWdlRXZlbnRIYW5kbGVyOjpRdFdlYlBhZ2VFdmVudEhhbmRsZXIoV0tQYWdlUmVm IHBhZ2VSZWYsIFFRdWlja1dlYlBhZ2UqIHFtbFdlYlBhZ2UsIFFRdWlja1dlYlZpZXcqIHFtbFdl YlZpZXcpCiAgICAgOiBtX3dlYlBhZ2VQcm94eSh0b0ltcGwocGFnZVJlZikpCiAgICAgLCBtX3Bh bkdlc3R1cmVSZWNvZ25pemVyKHRoaXMpCiAgICAgLCBtX3BpbmNoR2VzdHVyZVJlY29nbml6ZXIo dGhpcykKICAgICAsIG1fdGFwR2VzdHVyZVJlY29nbml6ZXIodGhpcykKICAgICAsIG1fd2ViUGFn ZShxbWxXZWJQYWdlKQorICAgICwgbV93ZWJWaWV3KHFtbFdlYlZpZXcpCiAgICAgLCBtX3ByZXZp b3VzQ2xpY2tCdXR0b24oUXQ6Ok5vQnV0dG9uKQogICAgICwgbV9jbGlja0NvdW50KDApCiAgICAg LCBtX3Bvc3Rwb25lVGV4dElucHV0U3RhdGVDaGFuZ2VkKGZhbHNlKQpAQCAtNDM2LDYgKzQzOCw4 IEBAIHZvaWQgUXRXZWJQYWdlRXZlbnRIYW5kbGVyOjp1cGRhdGVUZXh0SW5wdXRTdGF0ZSgpCiAK ICAgICBjb25zdCBFZGl0b3JTdGF0ZSYgZWRpdG9yID0gbV93ZWJQYWdlUHJveHktPmVkaXRvclN0 YXRlKCk7CiAKKyAgICBtX3dlYlZpZXctPnNldElucHV0TWV0aG9kSGludHMoUXQ6OklucHV0TWV0 aG9kSGludHMoZWRpdG9yLmlucHV0TWV0aG9kSGludHMpKTsKKwogICAgIC8vIElnbm9yZSBpbnB1 dCBtZXRob2QgcmVxdWVzdHMgbm90IGR1ZSB0byBhIHRhcCBnZXN0dXJlLgogICAgIGlmICghZWRp dG9yLmlzQ29udGVudEVkaXRhYmxlKQogICAgICAgICBzZXRJbnB1dFBhbmVsVmlzaWJsZShmYWxz ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZl bnRIYW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRI YW5kbGVyLmgKaW5kZXggZjViN2ZiMzE3NzEwYTEzZTE5YjkzMjA1NmVjYzMyMDE0OTdmODYzZS4u YjE4NzhmNmE0MjlhNWE3NmMyODE3YjgwMmM5YWQxODc1ZGMwMGY0YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuaApAQCAtNDAs NyArNDAsNyBAQCBjbGFzcyBRdFdlYlBhZ2VFdmVudEhhbmRsZXIgOiBwdWJsaWMgUU9iamVjdCB7 CiAgICAgUV9PQkpFQ1QKIAogcHVibGljOgotICAgIFF0V2ViUGFnZUV2ZW50SGFuZGxlcihXS1Bh Z2VSZWYsIFFRdWlja1dlYlBhZ2UqKTsKKyAgICBRdFdlYlBhZ2VFdmVudEhhbmRsZXIoV0tQYWdl UmVmLCBRUXVpY2tXZWJQYWdlKiwgUVF1aWNrV2ViVmlldyopOwogICAgIH5RdFdlYlBhZ2VFdmVu dEhhbmRsZXIoKTsKIAogICAgIGJvb2wgaGFuZGxlRXZlbnQoUUV2ZW50Kik7CkBAIC02OCw2ICs2 OCw3IEBAIHByb3RlY3RlZDoKICAgICBRdFBpbmNoR2VzdHVyZVJlY29nbml6ZXIgbV9waW5jaEdl c3R1cmVSZWNvZ25pemVyOwogICAgIFF0VGFwR2VzdHVyZVJlY29nbml6ZXIgbV90YXBHZXN0dXJl UmVjb2duaXplcjsKICAgICBRUXVpY2tXZWJQYWdlKiBtX3dlYlBhZ2U7CisgICAgUVF1aWNrV2Vi VmlldyogbV93ZWJWaWV3OwogCiBwcml2YXRlOgogICAgIGJvb2wgaGFuZGxlS2V5UHJlc3NFdmVu dChRS2V5RXZlbnQqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCBkMDQzZWI0ODdhZWZiY2ExYjQ3YzdhZTcyYzI4MTA1NzJiYmJkZWMxLi5h MWMzYzJjMDAzMzcwOTQ3YjMwODIwZDA5Y2EzMGE4Mzk3YzJmYTQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC05MCw2ICs5MCw3IEBACiAj aW5jbHVkZSA8V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9G cmFtZVZpZXcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0hUTUxGb3JtRWxlbWVudC5oPgorI2luY2x1 ZGUgPFdlYkNvcmUvSFRNTElucHV0RWxlbWVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSGlzdG9y eUl0ZW0uaD4KICNpbmNsdWRlIDxXZWJDb3JlL0tleWJvYXJkRXZlbnQuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL01vdXNlRXZlbnQuaD4KQEAgLTM5OCw2ICszOTksMjkgQEAgRWRpdG9yU3RhdGUgV2Vi UGFnZTo6ZWRpdG9yU3RhdGUoKSBjb25zdAogICAgIGlmICghc2NvcGUpCiAgICAgICAgIHJldHVy biByZXN1bHQ7CiAKKyAgICBpZiAoc2NvcGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjppbnB1dFRh ZykpIHsKKyAgICAgICAgSFRNTElucHV0RWxlbWVudCogaW5wdXQgPSBzdGF0aWNfY2FzdDxIVE1M SW5wdXRFbGVtZW50Kj4oc2NvcGUpOworICAgICAgICBpZiAoaW5wdXQtPmlzVGVsZXBob25lRmll bGQoKSkKKyAgICAgICAgICAgIHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhEaWFs YWJsZUNoYXJhY3RlcnNPbmx5OworICAgICAgICBlbHNlIGlmIChpbnB1dC0+aXNOdW1iZXJGaWVs ZCgpKQorICAgICAgICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaERpZ2l0 c09ubHk7CisgICAgICAgIGVsc2UgaWYgKGlucHV0LT5pc0VtYWlsRmllbGQoKSkgeworICAgICAg ICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaEVtYWlsQ2hhcmFjdGVyc09u bHk7CisgICAgICAgICAgICByZXN1bHQuaW5wdXRNZXRob2RIaW50cyB8PSBRdDo6SW1oTm9BdXRv VXBwZXJjYXNlOworICAgICAgICB9IGVsc2UgaWYgKGlucHV0LT5pc1VSTEZpZWxkKCkpIHsKKyAg ICAgICAgICAgIHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhVcmxDaGFyYWN0ZXJz T25seTsKKyAgICAgICAgICAgIHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhOb0F1 dG9VcHBlcmNhc2U7CisgICAgICAgIH0gZWxzZSBpZiAoaW5wdXQtPmlzUGFzc3dvcmRGaWVsZCgp KSB7CisgICAgICAgICAgICAvLyBTZXQgSW1oSGlkZGVuVGV4dCBmbGFnIGZvciBwYXNzd29yZCBm aWVsZHMuIFRoZSBRdCBwbGF0Zm9ybQorICAgICAgICAgICAgLy8gaXMgcmVzcG9uc2libGUgZm9y IGRldGVybWluaW5nIHdoaWNoIHdpZGdldCB3aWxsIHJlY2VpdmUgaW5wdXQKKyAgICAgICAgICAg IC8vIG1ldGhvZCBldmVudHMgZm9yIHBhc3N3b3JkIGZpZWxkcy4KKyAgICAgICAgICAgIHJlc3Vs dC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhIaWRkZW5UZXh0OworICAgICAgICAgICAgcmVz dWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaE5vQXV0b1VwcGVyY2FzZTsKKyAgICAgICAg ICAgIHJlc3VsdC5pbnB1dE1ldGhvZEhpbnRzIHw9IFF0OjpJbWhOb1ByZWRpY3RpdmVUZXh0Owor ICAgICAgICAgICAgcmVzdWx0LmlucHV0TWV0aG9kSGludHMgfD0gUXQ6OkltaFNlbnNpdGl2ZURh dGE7CisgICAgICAgIH0KKyAgICB9CisKICAgICBpZiAoc2VsZWN0aW9uUm9vdCkKICAgICAgICAg cmVzdWx0LmVkaXRvclJlY3QgPSBmcmFtZS0+dmlldygpLT5jb250ZW50c1RvV2luZG93KHNlbGVj dGlvblJvb3QtPmdldFJlY3QoKSk7CiAK