88576 2012-06-07 14:26:35 -0700 [BlackBerry] Should Use the WebPage Already Created by Client, No Need to Create New One. 2012-06-07 17:00:28 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 haizhang webkit-unassigned tonikitoo webkit.review.bot oldest_to_newest 643912 0 haizhang 2012-06-07 14:26:35 -0700 When PagePopupBlackBerry::init() is called, a WebPage is already created, we can just use this to load popup, no need to create our own one. The old code is based on an old solution which has been abandoned. 643931 1 146392 haizhang 2012-06-07 14:40:12 -0700 Created attachment 146392 patch 643942 2 146392 rwlbuis 2012-06-07 14:50:47 -0700 Comment on attachment 146392 patch View in context: https://bugs.webkit.org/attachment.cgi?id=146392&action=review Found one tiny cleanup possibility. Crystal will have a look whether more changes are needed. > Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp:-312 > - webPopup->closeWebPage(); You can remove the { and } now. 643964 3 146397 haizhang 2012-06-07 15:10:04 -0700 Created attachment 146397 updated patch 643974 4 146397 rwlbuis 2012-06-07 15:19:04 -0700 Comment on attachment 146397 updated patch LGTM. 644084 5 146397 webkit.review.bot 2012-06-07 17:00:23 -0700 Comment on attachment 146397 updated patch Clearing flags on attachment: 146397 Committed r119774: <http://trac.webkit.org/changeset/119774> 644085 6 webkit.review.bot 2012-06-07 17:00:28 -0700 All reviewed patches have been landed. Closing bug. 146392 2012-06-07 14:40:12 -0700 2012-06-07 15:10:04 -0700 patch 0001-2012-06-07-Crystal-Zhang-haizhang-rim.com.patch text/plain 9259 haizhang RnJvbSA1NWU0ZDczMmMyOGMwMmQ1ZTFhNWE2NDNjODAxZjg5OTcyN2U5YzAyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBUaHUsIDcgSnVuIDIwMTIgMTc6MzI6NDUgLTA0MDAKU3ViamVjdDogW1BBVENIXSAyMDEyLTA2 LTA3ICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KCiAgICAgICAgW0JsYWNrQmVy cnldIFNob3VsZCBVc2UgdGhlIFdlYlBhZ2UgQWxyZWFkeSBDcmVhdGVkIGJ5IENsaWVudCwgTm8g TmVlZCB0byBDcmVhdGUgTmV3IE9uZS4KICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODg1NzYKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CgogICAgICAgIFdoZW4gUGFnZVBvcHVwQmxhY2tCZXJyeTo6aW5pdCgpIGlzIGNhbGxlZCwgYSBX ZWJQYWdlIGlzIGFscmVhZHkgY3JlYXRlZCwgd2UgY2FuIGp1c3QgdXNlCiAgICAgICAgdGhpcyB0 byBsb2FkIHBvcHVwLCBubyBuZWVkIHRvIGNyZWF0ZSBhIG5ldyBvbmUuIFRoZSBvbGQgY29kZSBp cyBiYXNlZCBvbiBhbiBvbGQgc29sdXRpb24KICAgICAgICB3aGljaCBoYXMgYmVlbiBhYmFuZG9u ZWQuCgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHA6 CiAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6Om9wZW5QYWdlUG9wdXAp OgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHA6CiAgICAg ICAgKFdlYkNvcmU6OlBhZ2VQb3B1cEJsYWNrQmVycnk6OmluaXQpOgogICAgICAgIChXZWJDb3Jl OjpzZXRWYWx1ZUFuZENsb3NlUG9wdXBDYWxsYmFjayk6CiAgICAgICAgKFdlYkNvcmU6OlBhZ2VQ b3B1cEJsYWNrQmVycnk6OmhhbmRsZU1vdXNlRXZlbnQpOgogICAgICAgIChXZWJDb3JlOjpQYWdl UG9wdXBCbGFja0JlcnJ5OjpjbG9zZVBvcHVwKToKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1Bh Z2VQb3B1cEJsYWNrQmVycnkuaDoKICAgICAgICAoUGFnZVBvcHVwQmxhY2tCZXJyeSk6Ci0tLQog U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDIx ICsrKysrCiAuLi4vV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAgICAg ICB8ICAgIDEgLQogLi4uL1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwICAg ICAgICAgfCAgIDg1ICsrLS0tLS0tLS0tLS0tLS0tLS0tCiAuLi4vV2ViQ29yZVN1cHBvcnQvUGFn ZVBvcHVwQmxhY2tCZXJyeS5oICAgICAgICAgICB8ICAgIDQgLQogNCBmaWxlcyBjaGFuZ2VkLCAy NyBpbnNlcnRpb25zKCspLCA4NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZwppbmRleCA2N2VjNmY4Li45ZTcxYjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMi0wNi0wNyAgQ3J5c3RhbCBaaGFuZyAgPGhhaXpoYW5n QHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFNob3VsZCBVc2UgdGhlIFdlYlBhZ2Ug QWxyZWFkeSBDcmVhdGVkIGJ5IENsaWVudCwgTm8gTmVlZCB0byBDcmVhdGUgTmV3IE9uZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4NTc2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBQYWdlUG9w dXBCbGFja0JlcnJ5Ojppbml0KCkgaXMgY2FsbGVkLCBhIFdlYlBhZ2UgaXMgYWxyZWFkeSBjcmVh dGVkLCB3ZSBjYW4ganVzdCB1c2UgCisgICAgICAgIHRoaXMgdG8gbG9hZCBwb3B1cCwgbm8gbmVl ZCB0byBjcmVhdGUgYSBuZXcgb25lLiBUaGUgb2xkIGNvZGUgaXMgYmFzZWQgb24gYW4gb2xkIHNv bHV0aW9uIAorICAgICAgICB3aGljaCBoYXMgYmVlbiBhYmFuZG9uZWQuCisKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6Om9wZW5QYWdlUG9wdXApOgorICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGFnZVBvcHVwQmxhY2tCZXJyeTo6aW5pdCk6CisgICAgICAgIChXZWJDb3JlOjpzZXRWYWx1ZUFu ZENsb3NlUG9wdXBDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlUG9wdXBCbGFja0Jl cnJ5OjpoYW5kbGVNb3VzZUV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VQb3B1cEJsYWNr QmVycnk6OmNsb3NlUG9wdXApOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJs YWNrQmVycnkuaDoKKyAgICAgICAgKFBhZ2VQb3B1cEJsYWNrQmVycnkpOgorCiAyMDEyLTA2LTA3 ICBBcnZpZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJy eV0gVXNlciB2aWV3cG9ydCBhcmd1bWVudHMgYXJlIG5vdCByZXNwZWN0ZWQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFj a0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJv bWVDbGllbnRCbGFja0JlcnJ5LmNwcAppbmRleCAyNDA3OTk4Li4xOWYxN2Q4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50Qmxh Y2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCkBAIC0zMDksNyArMzA5LDYgQEAgUGFnZVBvcHVw KiBDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpvcGVuUGFnZVBvcHVwKFBhZ2VQb3B1cENsaWVudCog Y2xpZW50LCBjb25zdAogICAgICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX3dlYlBhZ2UtPnBvcHVw T3BlbmVkKHdlYlBvcHVwKTsKICAgICB9IGVsc2UgewogICAgICAgICB3ZWJQb3B1cCA9IG1fd2Vi UGFnZVByaXZhdGUtPm1fd2ViUGFnZS0+cG9wdXAoKTsKLSAgICAgICAgd2ViUG9wdXAtPmNsb3Nl V2ViUGFnZSgpOwogICAgIH0KICAgICB3ZWJQb3B1cC0+c2VuZENyZWF0ZVBvcHVwV2ViVmlld1Jl cXVlc3QoKTsKICAgICByZXR1cm4gd2ViUG9wdXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5j cHAKaW5kZXggYjU3MGM1Yi4uYTM1NjY1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmNw cApAQCAtMTksMTAgKzE5LDYgQEAKIAogI2luY2x1ZGUgIlBhZ2VQb3B1cEJsYWNrQmVycnkuaCIK IAotI2luY2x1ZGUgIkNocm9tZUNsaWVudEJsYWNrQmVycnkuaCIKLSNpbmNsdWRlICJFbXB0eUNs aWVudHMuaCIKLSNpbmNsdWRlICJGcmFtZVZpZXcuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JDbGll bnRCbGFja0JlcnJ5LmgiCiAjaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCiAjaW5jbHVkZSAiSlNE T01XaW5kb3dCYXNlLmgiCiAjaW5jbHVkZSAiSlNPYmplY3QuaCIKQEAgLTQ3LDMwICs0Myw2IEBA IHVzaW5nIG5hbWVzcGFjZSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M7CiB1c2luZyBu YW1lc3BhY2UgQmxhY2tCZXJyeTo6V2ViS2l0OwogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFz cyBQYWdlUG9wdXBDaHJvbWVDbGllbnQgOiBwdWJsaWMgQ2hyb21lQ2xpZW50QmxhY2tCZXJyeSB7 Ci1wdWJsaWM6Ci0gICAgZXhwbGljaXQgUGFnZVBvcHVwQ2hyb21lQ2xpZW50KFdlYlBhZ2VQcml2 YXRlKiB3ZWJwYWdlLCBQYWdlUG9wdXBCbGFja0JlcnJ5KiBwb3B1cCkKLSAgICAgICAgOiBDaHJv bWVDbGllbnRCbGFja0JlcnJ5KHdlYnBhZ2UpCi0gICAgICAgICwgbV9wb3B1cChwb3B1cCkKLSAg ICAgICAgLCBtX3dlYlBhZ2Uod2VicGFnZSkKLSAgICB7Ci0gICAgfQotCi0gICAgdmlydHVhbCB2 b2lkIGNsb3NlV2luZG93U29vbigpCi0gICAgewotICAgICAgICBtX3BvcHVwLT5jbG9zZVBvcHVw KCk7Ci0gICAgfQotCi0gICAgV2ViUGFnZVByaXZhdGUqIHdlYlBhZ2UoKQotICAgIHsKLSAgICAg ICAgcmV0dXJuIG1fd2ViUGFnZTsKLSAgICB9Ci0KLSAgICBQYWdlUG9wdXBCbGFja0JlcnJ5KiBt X3BvcHVwOwotICAgIFdlYlBhZ2VQcml2YXRlKiBtX3dlYlBhZ2U7Ci0gICAgSW50UmVjdCBtX3Jl Y3Q7Ci19OwotCiBQYWdlUG9wdXBCbGFja0JlcnJ5OjpQYWdlUG9wdXBCbGFja0JlcnJ5KEJsYWNr QmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGUqIHdlYlBhZ2UsIFBhZ2VQb3B1cENsaWVudCog Y2xpZW50LCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAgIDogbV93ZWJQYWdlUHJpdmF0ZSh3ZWJQ YWdlKQogICAgICwgbV9jbGllbnQoYWRvcHRQdHIoY2xpZW50KSkKQEAgLTg5LDQwICs2MSwxMCBA QCB2b2lkIFBhZ2VQb3B1cEJsYWNrQmVycnk6OnNlbmRDcmVhdGVQb3B1cFdlYlZpZXdSZXF1ZXN0 KCkKIAogYm9vbCBQYWdlUG9wdXBCbGFja0JlcnJ5Ojppbml0KFdlYlBhZ2UqIHdlYnBhZ2UpCiB7 Ci0gICAgc3RhdGljIEZyYW1lTG9hZGVyQ2xpZW50KiBlbXB0eUZyYW1lTG9hZGVyQ2xpZW50ID0g bmV3IEVtcHR5RnJhbWVMb2FkZXJDbGllbnQ7Ci0gICAgUGFnZTo6UGFnZUNsaWVudHMgcGFnZUNs aWVudHM7Ci0gICAgbV9jaHJvbWVDbGllbnQgPSBhZG9wdFB0cihuZXcgUGFnZVBvcHVwQ2hyb21l Q2xpZW50KHdlYnBhZ2UtPmQsIHRoaXMpKTsKLSAgICBzdGF0aWMgRWRpdG9yQ2xpZW50KiBlbXB0 eUVkaXRvckNsaWVudCA9IG5ldyBFbXB0eUVkaXRvckNsaWVudDsKLSAgICBwYWdlQ2xpZW50cy5j aHJvbWVDbGllbnQgPSBtX2Nocm9tZUNsaWVudC5nZXQoKTsKLSAgICBwYWdlQ2xpZW50cy5lZGl0 b3JDbGllbnQgPSBlbXB0eUVkaXRvckNsaWVudDsKLSNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykK LSAgICBzdGF0aWMgQ29udGV4dE1lbnVDbGllbnQqIGVtcHR5Q29udGV4dE1lbnVDbGllbnQgPSBu ZXcgRW1wdHlDb250ZXh0TWVudUNsaWVudDsKLSAgICBwYWdlQ2xpZW50cy5jb250ZXh0TWVudUNs aWVudCA9IGVtcHR5Q29udGV4dE1lbnVDbGllbnQ7Ci0jZW5kaWYKLSNpZiBFTkFCTEUoRFJBR19T VVBQT1JUKQotICAgIHN0YXRpYyBEcmFnQ2xpZW50KiBlbXB0eURyYWdDbGllbnQgPSBuZXcgRW1w dHlEcmFnQ2xpZW50OwotICAgIHBhZ2VDbGllbnRzLmRyYWdDbGllbnQgPSBlbXB0eURyYWdDbGll bnQ7Ci0jZW5kaWYKLSNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIHN0YXRpYyBJbnNwZWN0b3JD bGllbnQqIGVtcHR5SW5zcGVjdG9yQ2xpZW50ID0gbmV3IEVtcHR5SW5zcGVjdG9yQ2xpZW50Owot ICAgIHBhZ2VDbGllbnRzLmluc3BlY3RvckNsaWVudCA9IGVtcHR5SW5zcGVjdG9yQ2xpZW50Owot I2VuZGlmCi0KLSAgICBtX3BhZ2UgPSBhZG9wdFB0cihuZXcgUGFnZShwYWdlQ2xpZW50cykpOwot ICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0U2NyaXB0RW5hYmxlZCh0cnVlKTsKLSAgICBtX3Bh Z2UtPnNldHRpbmdzKCktPnNldEFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzKHRydWUpOwotCi0g ICAgUmVmUHRyPEZyYW1lPiBmcmFtZSA9IEZyYW1lOjpjcmVhdGUobV9wYWdlLmdldCgpLCAwLAot ICAgICAgICAgICAgZW1wdHlGcmFtZUxvYWRlckNsaWVudCk7Ci0gICAgZnJhbWUtPnNldFZpZXco RnJhbWVWaWV3OjpjcmVhdGUoZnJhbWUuZ2V0KCkpKTsKLSAgICBmcmFtZS0+aW5pdCgpOwotICAg IGZyYW1lLT52aWV3KCktPnJlc2l6ZShtX2NsaWVudC0+Y29udGVudFNpemUoKSk7Ci0KLSAgICBD U3RyaW5nIGh0bWxTb3VyY2UgPSBtX2NsaWVudC0+aHRtbFNvdXJjZSgpLnV0ZjgoKTsKLSAgICBE b2N1bWVudFdyaXRlciogd3JpdGVyID0gZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExv YWRlcigpLT53cml0ZXIoKTsKKyAgICBEb2N1bWVudFdyaXRlciogd3JpdGVyID0gd2VicGFnZS0+ ZC0+bWFpbkZyYW1lKCktPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpLT53cml0ZXIo KTsKICAgICBtX2NsaWVudC0+d3JpdGVEb2N1bWVudCgqd3JpdGVyKTsKIAotICAgIGluc3RhbGxE b21GdW5jdGlvbihmcmFtZS5nZXQoKSk7CisgICAgaW5zdGFsbERvbUZ1bmN0aW9uKHdlYnBhZ2Ut PmQtPm1haW5GcmFtZSgpKTsKIAogICAgIHdlYnBhZ2UtPmQtPnNldFBhcmVudFBvcHVwKHRoaXMp OwogCkBAIC0xMzksNyArODEsNyBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBzZXRWYWx1ZUFuZENsb3Nl UG9wdXBDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwKIAogICAgIEpTU3RyaW5nUmVmIHN0 cmluZyA9IEpTVmFsdWVUb1N0cmluZ0NvcHkoY29udGV4dCwgYXJndW1lbnRzWzBdLCAwKTsKICAg ICBzaXplX3Qgc2l6ZVVURjggPSBKU1N0cmluZ0dldE1heGltdW1VVEY4Q1N0cmluZ1NpemUoc3Ry aW5nKTsKLSAgICBXVEY6OlZlY3RvcjxjaGFyPiBzdHJBcmdzKHNpemVVVEY4ICsgMSk7CisgICAg VmVjdG9yPGNoYXI+IHN0ckFyZ3Moc2l6ZVVURjggKyAxKTsKICAgICBzdHJBcmdzW3NpemVVVEY4 XSA9IDA7CiAgICAgSlNTdHJpbmdHZXRVVEY4Q1N0cmluZyhzdHJpbmcsIHN0ckFyZ3MuZGF0YSgp LCBzaXplVVRGOCk7CiAgICAgSlNTdHJpbmdSZWxlYXNlKHN0cmluZyk7CkBAIC0yMTcsMTYgKzE1 OSwxMyBAQCB2b2lkIFBhZ2VQb3B1cEJsYWNrQmVycnk6Omluc3RhbGxEb21GdW5jdGlvbihGcmFt ZSogZnJhbWUpCiAKIGJvb2wgUGFnZVBvcHVwQmxhY2tCZXJyeTo6aGFuZGxlTW91c2VFdmVudChQ bGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KQogewotICAgIGlmICghbV9wYWdlLT5tYWluRnJhbWUo KSB8fCAhbV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygpKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0KICAgICBzd2l0Y2ggKGV2ZW50LnR5cGUoKSkgewogICAgIGNhc2UgUGxhdGZvcm1FdmVudDo6 TW91c2VNb3ZlZDoKLSAgICAgICAgcmV0dXJuIG1fcGFnZS0+bWFpbkZyYW1lKCktPmV2ZW50SGFu ZGxlcigpLT5oYW5kbGVNb3VzZU1vdmVFdmVudChldmVudCk7CisgICAgICAgIHJldHVybiBtX3dl YlBhZ2VQcml2YXRlLT5tYWluRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZU1vdXNlTW92 ZUV2ZW50KGV2ZW50KTsKICAgICBjYXNlIFBsYXRmb3JtRXZlbnQ6Ok1vdXNlUHJlc3NlZDoKLSAg ICAgICAgcmV0dXJuIG1fcGFnZS0+bWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5oYW5kbGVN b3VzZVByZXNzRXZlbnQoZXZlbnQpOworICAgICAgICByZXR1cm4gbV93ZWJQYWdlUHJpdmF0ZS0+ bWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5oYW5kbGVNb3VzZVByZXNzRXZlbnQoZXZlbnQp OwogICAgIGNhc2UgUGxhdGZvcm1FdmVudDo6TW91c2VSZWxlYXNlZDoKLSAgICAgICAgcmV0dXJu IG1fcGFnZS0+bWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5oYW5kbGVNb3VzZVJlbGVhc2VF dmVudChldmVudCk7CisgICAgICAgIHJldHVybiBtX3dlYlBhZ2VQcml2YXRlLT5tYWluRnJhbWUo KS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZU1vdXNlUmVsZWFzZUV2ZW50KGV2ZW50KTsKICAgICBk ZWZhdWx0OgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtMjM0LDIxICsxNzMsOSBA QCBib29sIFBhZ2VQb3B1cEJsYWNrQmVycnk6OmhhbmRsZU1vdXNlRXZlbnQoUGxhdGZvcm1Nb3Vz ZUV2ZW50JiBldmVudCkKIAogdm9pZCBQYWdlUG9wdXBCbGFja0JlcnJ5OjpjbG9zZVBvcHVwKCkK IHsKLSAgICBjbG9zZVdlYlBhZ2UoKTsKICAgICBtX2NsaWVudC0+ZGlkQ2xvc2VQb3B1cCgpOwog ICAgIG1fd2ViUGFnZVByaXZhdGUtPmNsaWVudCgpLT5jbG9zZVBvcHVwV2ViVmlldygpOwogfQog Ci12b2lkIFBhZ2VQb3B1cEJsYWNrQmVycnk6OmNsb3NlV2ViUGFnZSgpCi17Ci0gICAgaWYgKCFt X3BhZ2UpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fcGFnZS0+c2V0R3JvdXBOYW1lKFN0cmlu ZygpKTsKLSAgICBtX3BhZ2UtPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+c3RvcEFsbExvYWRlcnMo KTsKLSAgICBtX3BhZ2UtPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+c3RvcExvYWRpbmcoVW5sb2Fk RXZlbnRQb2xpY3lOb25lKTsKLSAgICBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPmNsZWFy KCk7Ci0gICAgbV9wYWdlLmNsZWFyKCk7Ci19CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmggYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5o CmluZGV4IGQ1YzcyY2VlLi5kMjNjZmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmgKQEAg LTQ3LDcgKzQ3LDYgQEAgcHVibGljOgogICAgIHZvaWQgY2xvc2VQb3B1cCgpOwogICAgIHZvaWQg aW5zdGFsbERvbUZ1bmN0aW9uKEZyYW1lKik7CiAgICAgdm9pZCBzZXRSZWN0KCk7Ci0gICAgdm9p ZCBjbG9zZVdlYlBhZ2UoKTsKIAogICAgIGJvb2wgaGFuZGxlTW91c2VFdmVudChQbGF0Zm9ybU1v dXNlRXZlbnQmKTsKIApAQCAtNTcsOSArNTYsNiBAQCBwcml2YXRlOgogICAgIE93blB0cjxQYWdl UG9wdXBDbGllbnQ+IG1fY2xpZW50OwogICAgIEludFJlY3QgbV9yZWN0OwogICAgIE93blB0cjxX ZWJDb3JlOjpQYWdlPiBtX3BhZ2U7Ci0gICAgT3duUHRyPFBhZ2VQb3B1cENocm9tZUNsaWVudD4g bV9jaHJvbWVDbGllbnQ7Ci0KLSAgICBmcmllbmQgY2xhc3MgUGFnZVBvcHVwQ2hyb21lQ2xpZW50 OwogfTsKIAogfQotLSAKMS43LjEwLjEKCg== 146397 2012-06-07 15:10:04 -0700 2012-06-07 17:00:23 -0700 updated patch 0001-2012-06-07-Crystal-Zhang-haizhang-rim.com.patch text/plain 9640 haizhang RnJvbSA2YWZmNDYxNWUwZWNlOTRmZWYzOGEwOTVkMDlhNDJhMmVmZTA3MjQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBUaHUsIDcgSnVuIDIwMTIgMTc6MzI6NDUgLTA0MDAKU3ViamVjdDogW1BBVENIXSAyMDEyLTA2 LTA3ICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KCiAgICAgICAgW0JsYWNrQmVy cnldIFNob3VsZCBVc2UgdGhlIFdlYlBhZ2UgQWxyZWFkeSBDcmVhdGVkIGJ5IENsaWVudCwgTm8g TmVlZCB0byBDcmVhdGUgTmV3IE9uZS4KICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODg1NzYKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CgogICAgICAgIFdoZW4gUGFnZVBvcHVwQmxhY2tCZXJyeTo6aW5pdCgpIGlzIGNhbGxlZCwgYSBX ZWJQYWdlIGlzIGFscmVhZHkgY3JlYXRlZCwgd2UgY2FuIGp1c3QgdXNlCiAgICAgICAgdGhpcyB0 byBsb2FkIHBvcHVwLCBubyBuZWVkIHRvIGNyZWF0ZSBhIG5ldyBvbmUuIFRoZSBvbGQgY29kZSBp cyBiYXNlZCBvbiBhbiBvbGQgc29sdXRpb24KICAgICAgICB3aGljaCBoYXMgYmVlbiBhYmFuZG9u ZWQuCgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHA6 CiAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6Om9wZW5QYWdlUG9wdXAp OgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHA6CiAgICAg ICAgKFdlYkNvcmU6OlBhZ2VQb3B1cEJsYWNrQmVycnk6OmluaXQpOgogICAgICAgIChXZWJDb3Jl OjpzZXRWYWx1ZUFuZENsb3NlUG9wdXBDYWxsYmFjayk6CiAgICAgICAgKFdlYkNvcmU6OlBhZ2VQ b3B1cEJsYWNrQmVycnk6OmhhbmRsZU1vdXNlRXZlbnQpOgogICAgICAgIChXZWJDb3JlOjpQYWdl UG9wdXBCbGFja0JlcnJ5OjpjbG9zZVBvcHVwKToKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1Bh Z2VQb3B1cEJsYWNrQmVycnkuaDoKICAgICAgICAoUGFnZVBvcHVwQmxhY2tCZXJyeSk6Ci0tLQog U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDIx ICsrKysrCiAuLi4vV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAgICAg ICB8ICAgIDUgKy0KIC4uLi9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmNwcCAg ICAgICAgIHwgICA4MyArKy0tLS0tLS0tLS0tLS0tLS0tLQogLi4uL1dlYkNvcmVTdXBwb3J0L1Bh Z2VQb3B1cEJsYWNrQmVycnkuaCAgICAgICAgICAgfCAgICA2IC0tCiA0IGZpbGVzIGNoYW5nZWQs IDI5IGluc2VydGlvbnMoKyksIDg2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hh bmdlTG9nCmluZGV4IDY3ZWM2ZjguLjllNzFiNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA2LTA3ICBDcnlzdGFsIFpoYW5nICA8aGFpemhh bmdAcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gU2hvdWxkIFVzZSB0aGUgV2ViUGFn ZSBBbHJlYWR5IENyZWF0ZWQgYnkgQ2xpZW50LCBObyBOZWVkIHRvIENyZWF0ZSBOZXcgT25lLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg1NzYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIFBhZ2VQ b3B1cEJsYWNrQmVycnk6OmluaXQoKSBpcyBjYWxsZWQsIGEgV2ViUGFnZSBpcyBhbHJlYWR5IGNy ZWF0ZWQsIHdlIGNhbiBqdXN0IHVzZSAKKyAgICAgICAgdGhpcyB0byBsb2FkIHBvcHVwLCBubyBu ZWVkIHRvIGNyZWF0ZSBhIG5ldyBvbmUuIFRoZSBvbGQgY29kZSBpcyBiYXNlZCBvbiBhbiBvbGQg c29sdXRpb24gCisgICAgICAgIHdoaWNoIGhhcyBiZWVuIGFiYW5kb25lZC4KKworICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6b3BlblBhZ2VQb3B1cCk6CisgICAgICAgICog V2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlUG9wdXBCbGFja0JlcnJ5Ojppbml0KToKKyAgICAgICAgKFdlYkNvcmU6OnNldFZhbHVl QW5kQ2xvc2VQb3B1cENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VQb3B1cEJsYWNr QmVycnk6OmhhbmRsZU1vdXNlRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVBvcHVwQmxh Y2tCZXJyeTo6Y2xvc2VQb3B1cCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVw QmxhY2tCZXJyeS5oOgorICAgICAgICAoUGFnZVBvcHVwQmxhY2tCZXJyeSk6CisKIDIwMTItMDYt MDcgIEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0Jl cnJ5XSBVc2VyIHZpZXdwb3J0IGFyZ3VtZW50cyBhcmUgbm90IHJlc3BlY3RlZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJs YWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0No cm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCmluZGV4IDI0MDc5OTguLmYyZDAxYjMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRC bGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBv cnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTMwNywxMCArMzA3LDkgQEAgUGFnZVBv cHVwKiBDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpvcGVuUGFnZVBvcHVwKFBhZ2VQb3B1cENsaWVu dCogY2xpZW50LCBjb25zdAogICAgICAgICB3ZWJQb3B1cCA9IG5ldyBQYWdlUG9wdXBCbGFja0Jl cnJ5KG1fd2ViUGFnZVByaXZhdGUsIGNsaWVudCwKICAgICAgICAgICAgICAgICByb290Vmlld1Rv U2NyZWVuKG9yaWdpbkJvdW5kc0luUm9vdFZpZXcpKTsKICAgICAgICAgbV93ZWJQYWdlUHJpdmF0 ZS0+bV93ZWJQYWdlLT5wb3B1cE9wZW5lZCh3ZWJQb3B1cCk7Ci0gICAgfSBlbHNlIHsKKyAgICB9 IGVsc2UKICAgICAgICAgd2ViUG9wdXAgPSBtX3dlYlBhZ2VQcml2YXRlLT5tX3dlYlBhZ2UtPnBv cHVwKCk7Ci0gICAgICAgIHdlYlBvcHVwLT5jbG9zZVdlYlBhZ2UoKTsKLSAgICB9CisKICAgICB3 ZWJQb3B1cC0+c2VuZENyZWF0ZVBvcHVwV2ViVmlld1JlcXVlc3QoKTsKICAgICByZXR1cm4gd2Vi UG9wdXA7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1 cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHAKaW5kZXggYjU3MGM1Yi4uMmFi ZTQzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0 L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmNwcApAQCAtMTksMTAgKzE5LDggQEAK IAogI2luY2x1ZGUgIlBhZ2VQb3B1cEJsYWNrQmVycnkuaCIKIAotI2luY2x1ZGUgIkNocm9tZUNs aWVudEJsYWNrQmVycnkuaCIKICNpbmNsdWRlICJFbXB0eUNsaWVudHMuaCIKICNpbmNsdWRlICJG cmFtZVZpZXcuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JDbGllbnRCbGFja0JlcnJ5LmgiCiAjaW5j bHVkZSAiSlNET01CaW5kaW5nLmgiCiAjaW5jbHVkZSAiSlNET01XaW5kb3dCYXNlLmgiCiAjaW5j bHVkZSAiSlNPYmplY3QuaCIKQEAgLTQ3LDMwICs0NSw2IEBAIHVzaW5nIG5hbWVzcGFjZSBCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M7CiB1c2luZyBuYW1lc3BhY2UgQmxhY2tCZXJyeTo6 V2ViS2l0OwogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBQYWdlUG9wdXBDaHJvbWVDbGll bnQgOiBwdWJsaWMgQ2hyb21lQ2xpZW50QmxhY2tCZXJyeSB7Ci1wdWJsaWM6Ci0gICAgZXhwbGlj aXQgUGFnZVBvcHVwQ2hyb21lQ2xpZW50KFdlYlBhZ2VQcml2YXRlKiB3ZWJwYWdlLCBQYWdlUG9w dXBCbGFja0JlcnJ5KiBwb3B1cCkKLSAgICAgICAgOiBDaHJvbWVDbGllbnRCbGFja0JlcnJ5KHdl YnBhZ2UpCi0gICAgICAgICwgbV9wb3B1cChwb3B1cCkKLSAgICAgICAgLCBtX3dlYlBhZ2Uod2Vi cGFnZSkKLSAgICB7Ci0gICAgfQotCi0gICAgdmlydHVhbCB2b2lkIGNsb3NlV2luZG93U29vbigp Ci0gICAgewotICAgICAgICBtX3BvcHVwLT5jbG9zZVBvcHVwKCk7Ci0gICAgfQotCi0gICAgV2Vi UGFnZVByaXZhdGUqIHdlYlBhZ2UoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIG1fd2ViUGFnZTsK LSAgICB9Ci0KLSAgICBQYWdlUG9wdXBCbGFja0JlcnJ5KiBtX3BvcHVwOwotICAgIFdlYlBhZ2VQ cml2YXRlKiBtX3dlYlBhZ2U7Ci0gICAgSW50UmVjdCBtX3JlY3Q7Ci19OwotCiBQYWdlUG9wdXBC bGFja0JlcnJ5OjpQYWdlUG9wdXBCbGFja0JlcnJ5KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFn ZVByaXZhdGUqIHdlYlBhZ2UsIFBhZ2VQb3B1cENsaWVudCogY2xpZW50LCBjb25zdCBJbnRSZWN0 JiByZWN0KQogICAgIDogbV93ZWJQYWdlUHJpdmF0ZSh3ZWJQYWdlKQogICAgICwgbV9jbGllbnQo YWRvcHRQdHIoY2xpZW50KSkKQEAgLTg5LDQwICs2MywxMCBAQCB2b2lkIFBhZ2VQb3B1cEJsYWNr QmVycnk6OnNlbmRDcmVhdGVQb3B1cFdlYlZpZXdSZXF1ZXN0KCkKIAogYm9vbCBQYWdlUG9wdXBC bGFja0JlcnJ5Ojppbml0KFdlYlBhZ2UqIHdlYnBhZ2UpCiB7Ci0gICAgc3RhdGljIEZyYW1lTG9h ZGVyQ2xpZW50KiBlbXB0eUZyYW1lTG9hZGVyQ2xpZW50ID0gbmV3IEVtcHR5RnJhbWVMb2FkZXJD bGllbnQ7Ci0gICAgUGFnZTo6UGFnZUNsaWVudHMgcGFnZUNsaWVudHM7Ci0gICAgbV9jaHJvbWVD bGllbnQgPSBhZG9wdFB0cihuZXcgUGFnZVBvcHVwQ2hyb21lQ2xpZW50KHdlYnBhZ2UtPmQsIHRo aXMpKTsKLSAgICBzdGF0aWMgRWRpdG9yQ2xpZW50KiBlbXB0eUVkaXRvckNsaWVudCA9IG5ldyBF bXB0eUVkaXRvckNsaWVudDsKLSAgICBwYWdlQ2xpZW50cy5jaHJvbWVDbGllbnQgPSBtX2Nocm9t ZUNsaWVudC5nZXQoKTsKLSAgICBwYWdlQ2xpZW50cy5lZGl0b3JDbGllbnQgPSBlbXB0eUVkaXRv ckNsaWVudDsKLSNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKLSAgICBzdGF0aWMgQ29udGV4dE1l bnVDbGllbnQqIGVtcHR5Q29udGV4dE1lbnVDbGllbnQgPSBuZXcgRW1wdHlDb250ZXh0TWVudUNs aWVudDsKLSAgICBwYWdlQ2xpZW50cy5jb250ZXh0TWVudUNsaWVudCA9IGVtcHR5Q29udGV4dE1l bnVDbGllbnQ7Ci0jZW5kaWYKLSNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQotICAgIHN0YXRpYyBE cmFnQ2xpZW50KiBlbXB0eURyYWdDbGllbnQgPSBuZXcgRW1wdHlEcmFnQ2xpZW50OwotICAgIHBh Z2VDbGllbnRzLmRyYWdDbGllbnQgPSBlbXB0eURyYWdDbGllbnQ7Ci0jZW5kaWYKLSNpZiBFTkFC TEUoSU5TUEVDVE9SKQotICAgIHN0YXRpYyBJbnNwZWN0b3JDbGllbnQqIGVtcHR5SW5zcGVjdG9y Q2xpZW50ID0gbmV3IEVtcHR5SW5zcGVjdG9yQ2xpZW50OwotICAgIHBhZ2VDbGllbnRzLmluc3Bl Y3RvckNsaWVudCA9IGVtcHR5SW5zcGVjdG9yQ2xpZW50OwotI2VuZGlmCi0KLSAgICBtX3BhZ2Ug PSBhZG9wdFB0cihuZXcgUGFnZShwYWdlQ2xpZW50cykpOwotICAgIG1fcGFnZS0+c2V0dGluZ3Mo KS0+c2V0U2NyaXB0RW5hYmxlZCh0cnVlKTsKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldEFs bG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzKHRydWUpOwotCi0gICAgUmVmUHRyPEZyYW1lPiBmcmFt ZSA9IEZyYW1lOjpjcmVhdGUobV9wYWdlLmdldCgpLCAwLAotICAgICAgICAgICAgZW1wdHlGcmFt ZUxvYWRlckNsaWVudCk7Ci0gICAgZnJhbWUtPnNldFZpZXcoRnJhbWVWaWV3OjpjcmVhdGUoZnJh bWUuZ2V0KCkpKTsKLSAgICBmcmFtZS0+aW5pdCgpOwotICAgIGZyYW1lLT52aWV3KCktPnJlc2l6 ZShtX2NsaWVudC0+Y29udGVudFNpemUoKSk7Ci0KLSAgICBDU3RyaW5nIGh0bWxTb3VyY2UgPSBt X2NsaWVudC0+aHRtbFNvdXJjZSgpLnV0ZjgoKTsKLSAgICBEb2N1bWVudFdyaXRlciogd3JpdGVy ID0gZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpLT53cml0ZXIoKTsKKyAg ICBEb2N1bWVudFdyaXRlciogd3JpdGVyID0gd2VicGFnZS0+ZC0+bWFpbkZyYW1lKCktPmxvYWRl cigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpLT53cml0ZXIoKTsKICAgICBtX2NsaWVudC0+d3Jp dGVEb2N1bWVudCgqd3JpdGVyKTsKIAotICAgIGluc3RhbGxEb21GdW5jdGlvbihmcmFtZS5nZXQo KSk7CisgICAgaW5zdGFsbERvbUZ1bmN0aW9uKHdlYnBhZ2UtPmQtPm1haW5GcmFtZSgpKTsKIAog ICAgIHdlYnBhZ2UtPmQtPnNldFBhcmVudFBvcHVwKHRoaXMpOwogCkBAIC0xMzksNyArODMsNyBA QCBzdGF0aWMgSlNWYWx1ZVJlZiBzZXRWYWx1ZUFuZENsb3NlUG9wdXBDYWxsYmFjayhKU0NvbnRl eHRSZWYgY29udGV4dCwKIAogICAgIEpTU3RyaW5nUmVmIHN0cmluZyA9IEpTVmFsdWVUb1N0cmlu Z0NvcHkoY29udGV4dCwgYXJndW1lbnRzWzBdLCAwKTsKICAgICBzaXplX3Qgc2l6ZVVURjggPSBK U1N0cmluZ0dldE1heGltdW1VVEY4Q1N0cmluZ1NpemUoc3RyaW5nKTsKLSAgICBXVEY6OlZlY3Rv cjxjaGFyPiBzdHJBcmdzKHNpemVVVEY4ICsgMSk7CisgICAgVmVjdG9yPGNoYXI+IHN0ckFyZ3Mo c2l6ZVVURjggKyAxKTsKICAgICBzdHJBcmdzW3NpemVVVEY4XSA9IDA7CiAgICAgSlNTdHJpbmdH ZXRVVEY4Q1N0cmluZyhzdHJpbmcsIHN0ckFyZ3MuZGF0YSgpLCBzaXplVVRGOCk7CiAgICAgSlNT dHJpbmdSZWxlYXNlKHN0cmluZyk7CkBAIC0yMTcsMTYgKzE2MSwxMyBAQCB2b2lkIFBhZ2VQb3B1 cEJsYWNrQmVycnk6Omluc3RhbGxEb21GdW5jdGlvbihGcmFtZSogZnJhbWUpCiAKIGJvb2wgUGFn ZVBvcHVwQmxhY2tCZXJyeTo6aGFuZGxlTW91c2VFdmVudChQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2 ZW50KQogewotICAgIGlmICghbV9wYWdlLT5tYWluRnJhbWUoKSB8fCAhbV9wYWdlLT5tYWluRnJh bWUoKS0+dmlldygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBzd2l0Y2ggKGV2ZW50 LnR5cGUoKSkgewogICAgIGNhc2UgUGxhdGZvcm1FdmVudDo6TW91c2VNb3ZlZDoKLSAgICAgICAg cmV0dXJuIG1fcGFnZS0+bWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5oYW5kbGVNb3VzZU1v dmVFdmVudChldmVudCk7CisgICAgICAgIHJldHVybiBtX3dlYlBhZ2VQcml2YXRlLT5tYWluRnJh bWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZU1vdXNlTW92ZUV2ZW50KGV2ZW50KTsKICAgICBj YXNlIFBsYXRmb3JtRXZlbnQ6Ok1vdXNlUHJlc3NlZDoKLSAgICAgICAgcmV0dXJuIG1fcGFnZS0+ bWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5oYW5kbGVNb3VzZVByZXNzRXZlbnQoZXZlbnQp OworICAgICAgICByZXR1cm4gbV93ZWJQYWdlUHJpdmF0ZS0+bWFpbkZyYW1lKCktPmV2ZW50SGFu ZGxlcigpLT5oYW5kbGVNb3VzZVByZXNzRXZlbnQoZXZlbnQpOwogICAgIGNhc2UgUGxhdGZvcm1F dmVudDo6TW91c2VSZWxlYXNlZDoKLSAgICAgICAgcmV0dXJuIG1fcGFnZS0+bWFpbkZyYW1lKCkt PmV2ZW50SGFuZGxlcigpLT5oYW5kbGVNb3VzZVJlbGVhc2VFdmVudChldmVudCk7CisgICAgICAg IHJldHVybiBtX3dlYlBhZ2VQcml2YXRlLT5tYWluRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhh bmRsZU1vdXNlUmVsZWFzZUV2ZW50KGV2ZW50KTsKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQpAQCAtMjM0LDIxICsxNzUsOSBAQCBib29sIFBhZ2VQb3B1cEJsYWNr QmVycnk6OmhhbmRsZU1vdXNlRXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkKIAogdm9p ZCBQYWdlUG9wdXBCbGFja0JlcnJ5OjpjbG9zZVBvcHVwKCkKIHsKLSAgICBjbG9zZVdlYlBhZ2Uo KTsKICAgICBtX2NsaWVudC0+ZGlkQ2xvc2VQb3B1cCgpOwogICAgIG1fd2ViUGFnZVByaXZhdGUt PmNsaWVudCgpLT5jbG9zZVBvcHVwV2ViVmlldygpOwogfQogCi12b2lkIFBhZ2VQb3B1cEJsYWNr QmVycnk6OmNsb3NlV2ViUGFnZSgpCi17Ci0gICAgaWYgKCFtX3BhZ2UpCi0gICAgICAgIHJldHVy bjsKLQotICAgIG1fcGFnZS0+c2V0R3JvdXBOYW1lKFN0cmluZygpKTsKLSAgICBtX3BhZ2UtPm1h aW5GcmFtZSgpLT5sb2FkZXIoKS0+c3RvcEFsbExvYWRlcnMoKTsKLSAgICBtX3BhZ2UtPm1haW5G cmFtZSgpLT5sb2FkZXIoKS0+c3RvcExvYWRpbmcoVW5sb2FkRXZlbnRQb2xpY3lOb25lKTsKLSAg ICBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPmNsZWFyKCk7Ci0gICAgbV9wYWdlLmNsZWFy KCk7Ci19CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3Jl U3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5oCmluZGV4IGQ1YzcyY2VlLi5kNmY4 ZjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQv UGFnZVBvcHVwQmxhY2tCZXJyeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJD b3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmgKQEAgLTMzLDcgKzMzLDYgQEAgY2xhc3Mg V2ViUGFnZVByaXZhdGU7CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBGcmFtZTsKIGNsYXNz IFBhZ2U7Ci1jbGFzcyBQYWdlUG9wdXBDaHJvbWVDbGllbnQ7CiBjbGFzcyBQYWdlUG9wdXBDbGll bnQ7CiBjbGFzcyBQbGF0Zm9ybU1vdXNlRXZlbnQ7CiAKQEAgLTQ3LDcgKzQ2LDYgQEAgcHVibGlj OgogICAgIHZvaWQgY2xvc2VQb3B1cCgpOwogICAgIHZvaWQgaW5zdGFsbERvbUZ1bmN0aW9uKEZy YW1lKik7CiAgICAgdm9pZCBzZXRSZWN0KCk7Ci0gICAgdm9pZCBjbG9zZVdlYlBhZ2UoKTsKIAog ICAgIGJvb2wgaGFuZGxlTW91c2VFdmVudChQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKIApAQCAtNTYs MTAgKzU0LDYgQEAgcHJpdmF0ZToKICAgICBCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2 YXRlKiBtX3dlYlBhZ2VQcml2YXRlOwogICAgIE93blB0cjxQYWdlUG9wdXBDbGllbnQ+IG1fY2xp ZW50OwogICAgIEludFJlY3QgbV9yZWN0OwotICAgIE93blB0cjxXZWJDb3JlOjpQYWdlPiBtX3Bh Z2U7Ci0gICAgT3duUHRyPFBhZ2VQb3B1cENocm9tZUNsaWVudD4gbV9jaHJvbWVDbGllbnQ7Ci0K LSAgICBmcmllbmQgY2xhc3MgUGFnZVBvcHVwQ2hyb21lQ2xpZW50OwogfTsKIAogfQotLSAKMS43 LjEwLjEKCg==