38178 2010-04-27 00:08:12 -0700 [Chromium] Remove deprecated form of didChangeLocationWithinPage 2010-04-27 17:28:42 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd commit-queue dglazkov webkit.review.bot oldest_to_newest 217556 0 fishd 2010-04-27 00:08:12 -0700 [Chromium] Remove deprecated form of didChangeLocationWithinPage 217557 1 54391 fishd 2010-04-27 00:13:23 -0700 Created attachment 54391 v1 patch The changes to WebViewHost.{h,cpp} mirror the changes made here: http://src.chromium.org/viewvc/chrome/trunk/src/webkit/tools/test_shell/test_webview_delegate.cc?r1=41850&r2=41849&pathrev=41850 217573 2 webkit.review.bot 2010-04-27 01:06:02 -0700 Attachment 54391 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/1882079 217768 3 54428 fishd 2010-04-27 10:24:15 -0700 Created attachment 54428 v2 patch Fixed DRT bustage. 217769 4 54428 dglazkov 2010-04-27 10:25:53 -0700 Comment on attachment 54428 v2 patch r=me. 218078 5 54428 commit-queue 2010-04-27 17:28:36 -0700 Comment on attachment 54428 v2 patch Clearing flags on attachment: 54428 Committed r58358: <http://trac.webkit.org/changeset/58358> 218079 6 commit-queue 2010-04-27 17:28:42 -0700 All reviewed patches have been landed. Closing bug. 54391 2010-04-27 00:13:23 -0700 2010-04-27 10:24:15 -0700 v1 patch patch_1.txt text/plain 5203 fishd SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdFRvb2xz L0NoYW5nZUxvZwkocmV2aXNpb24gNTgyOTQpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNC0yNyAgRGFyaW4gRmlzaGVyICA8 ZGFyaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVtb3ZlIGRlcHJlY2F0ZWQgZm9ybSBvZiBkaWRDaGFu Z2VMb2NhdGlvbldpdGhpblBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM4MTc4CisKKyAgICAgICAgU3dpdGNoIG92ZXIgdG8gaW1wbGVtZW50aW5n IGRpZE5hdmlnYXRlV2l0aGluUGFnZS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmNwcDoKKyAgICAgICAgKFRlc3RXZWJWaWV3RGVsZWdhdGU6OmRpZE5h dmlnYXRlV2l0aGluUGFnZSk6CisgICAgICAgIChXZWJWaWV3SG9zdDo6ZGlkQ2hhbmdlTG9jYXRp b25XaXRoaW5QYWdlKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3 SG9zdC5oOgorCiAyMDEwLTA0LTI2ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCShyZXZpc2lvbiA1 ODI2MSkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODQwLDE0ICs4NDAsMTkgQEAgdm9pZCBXZWJWaWV3SG9z dDo6ZGlkRmluaXNoTG9hZChXZWJGcmFtZQogICAgIGxvY2F0aW9uQ2hhbmdlRG9uZShmcmFtZSk7 CiB9CiAKLXZvaWQgV2ViVmlld0hvc3Q6OmRpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZShXZWJG cmFtZSogZnJhbWUsIGJvb2wgaXNOZXdOYXZpZ2F0aW9uKQordm9pZCBUZXN0V2ViVmlld0RlbGVn YXRlOjpkaWROYXZpZ2F0ZVdpdGhpblBhZ2UoV2ViRnJhbWUqIGZyYW1lLCBib29sIGlzTmV3TmF2 aWdhdGlvbikKIHsKICAgICBmcmFtZS0+ZGF0YVNvdXJjZSgpLT5zZXRFeHRyYURhdGEobV9wZW5k aW5nRXh0cmFEYXRhLnJlbGVhc2UoKSk7CisKKyAgICB1cGRhdGVGb3JDb21taXR0ZWRMb2FkKGZy YW1lLCBpc05ld05hdmlnYXRpb24pOworfQorCit2b2lkIFdlYlZpZXdIb3N0OjpkaWRDaGFuZ2VM b2NhdGlvbldpdGhpblBhZ2UoV2ViRnJhbWUqIGZyYW1lKQorewogICAgIGlmIChtX3NoZWxsLT5z aG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpIHsKICAgICAgICAgcHJpbnRGcmFtZURlc2Ny aXB0aW9uKGZyYW1lKTsKICAgICAgICAgZnB1dHMoIiAtIGRpZENoYW5nZUxvY2F0aW9uV2l0aGlu UGFnZUZvckZyYW1lXG4iLCBzdGRvdXQpOwogICAgIH0KLSAgICB1cGRhdGVGb3JDb21taXR0ZWRM b2FkKGZyYW1lLCBpc05ld05hdmlnYXRpb24pOwogfQogCiB2b2lkIFdlYlZpZXdIb3N0Ojphc3Np Z25JZGVudGlmaWVyVG9SZXF1ZXN0KFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllciwgY29u c3QgV2ViVVJMUmVxdWVzdCYgcmVxdWVzdCkKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCShyZXZpc2lvbiA1ODI2MSkKKysr IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgJKHdvcmtp bmcgY29weSkKQEAgLTE2Myw3ICsxNjMsOCBAQCBjbGFzcyBXZWJWaWV3SG9zdCA6IHB1YmxpYyBX ZWJLaXQ6OldlYlZpCiAgICAgdmlydHVhbCB2b2lkIGRpZEhhbmRsZU9ubG9hZEV2ZW50cyhXZWJL aXQ6OldlYkZyYW1lKik7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWxMb2FkKFdlYktpdDo6V2Vi RnJhbWUqLCBjb25zdCBXZWJLaXQ6OldlYlVSTEVycm9yJik7CiAgICAgdmlydHVhbCB2b2lkIGRp ZEZpbmlzaExvYWQoV2ViS2l0OjpXZWJGcmFtZSopOwotICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFu Z2VMb2NhdGlvbldpdGhpblBhZ2UoV2ViS2l0OjpXZWJGcmFtZSosIGJvb2wgaXNOZXdOYXZpZ2F0 aW9uKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkTmF2aWdhdGVXaXRoaW5QYWdlKFdlYktpdDo6V2Vi RnJhbWUqLCBib29sIGlzTmV3TmF2aWdhdGlvbik7CisgICAgdmlydHVhbCB2b2lkIGRpZENoYW5n ZUxvY2F0aW9uV2l0aGluUGFnZShXZWJLaXQ6OldlYkZyYW1lKik7CiAgICAgdmlydHVhbCB2b2lk IGFzc2lnbklkZW50aWZpZXJUb1JlcXVlc3QoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlk ZW50aWZpZXIsIGNvbnN0IFdlYktpdDo6V2ViVVJMUmVxdWVzdCYpOwogICAgIHZpcnR1YWwgdm9p ZCB3aWxsU2VuZFJlcXVlc3QoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIs IFdlYktpdDo6V2ViVVJMUmVxdWVzdCYsIGNvbnN0IFdlYktpdDo6V2ViVVJMUmVzcG9uc2UmKTsK ICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKFdlYktpdDo6V2ViRnJhbWUqLCB1 bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlc3BvbnNlJik7CkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTgyOTQpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMjcgIERhcmluIEZp c2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92ZSBkZXByZWNhdGVkIGZvcm0gb2Yg ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zODE3OAorCisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xp ZW50Lmg6CisgICAgICAgICogc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHA6CisgICAgICAg IChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhp blBhZ2UpOgorCiAyMDEwLTA0LTI2ICBKb2huIEFiZC1FbC1NYWxlayAgPGphbUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpJbmRleDogV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCShyZXZpc2lvbiA1ODI5MikKKysrIFdlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjE0 LDggKzIxNCw2IEBAIHB1YmxpYzoKIAogICAgIC8vIFRoZSBuYXZpZ2F0aW9uIHJlc3VsdGVkIGlu IHNjcm9sbGluZyB0aGUgcGFnZSB0byBhIG5hbWVkIGFuY2hvciBpbnN0ZWFkCiAgICAgLy8gb2Yg ZG93bmxvYWRpbmcgYSBuZXcgZG9jdW1lbnQuCi0gICAgLy8gRklYTUU6IFRoZSBpc05ld05hdmln YXRpb24gcGFyYW1ldGVyIGlzIERFUFJFQ0FURUQuCi0gICAgdmlydHVhbCB2b2lkIGRpZENoYW5n ZUxvY2F0aW9uV2l0aGluUGFnZShXZWJGcmFtZSosIGJvb2wgaXNOZXdOYXZpZ2F0aW9uKSB7IH0K ICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKFdlYkZyYW1lKikg eyB9CiAKICAgICAvLyBDYWxsZWQgdXBvbiB1cGRhdGUgdG8gc2Nyb2xsIHBvc2l0aW9uLCBkb2N1 bWVudCBzdGF0ZSwgYW5kIG90aGVyCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9h ZGVyQ2xpZW50SW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0Zy YW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDU4MjkyKQorKysgV2ViS2l0L2Nocm9t aXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Mjgs MTQgKzYyOCw5IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERpZE4KIAog ICAgIGJvb2wgaXNOZXdOYXZpZ2F0aW9uOwogICAgIHdlYlZpZXctPmRpZENvbW1pdExvYWQoJmlz TmV3TmF2aWdhdGlvbik7Ci0gICAgaWYgKG1fd2ViRnJhbWUtPmNsaWVudCgpKSB7CisgICAgaWYg KG1fd2ViRnJhbWUtPmNsaWVudCgpKQogICAgICAgICBtX3dlYkZyYW1lLT5jbGllbnQoKS0+ZGlk TmF2aWdhdGVXaXRoaW5QYWdlKG1fd2ViRnJhbWUsIGlzTmV3TmF2aWdhdGlvbik7CiAKLSAgICAg ICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIG5vdGlmaWNhdGlvbiBvbmNlIGl0IGlzIG5vIGxvbmdl ciBjb25zdW1lZCBkb3duc3RyZWFtLgotICAgICAgICBpZiAoaXNIYXNoQ2hhbmdlKQotICAgICAg ICAgICAgbV93ZWJGcmFtZS0+Y2xpZW50KCktPmRpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSht X3dlYkZyYW1lLCBpc05ld05hdmlnYXRpb24pOwotICAgIH0KLQogICAgIC8vIEdlbmVyYXRlIGRp ZFN0b3BMb2FkaW5nIGlmIGxvYWRlciBpcyBjb21wbGV0ZWQuCiAgICAgaWYgKHdlYlZpZXctPmNs aWVudCgpICYmIGxvYWRlckNvbXBsZXRlZCkKICAgICAgICAgd2ViVmlldy0+Y2xpZW50KCktPmRp ZFN0b3BMb2FkaW5nKCk7Cg== 54428 2010-04-27 10:24:15 -0700 2010-04-27 17:28:36 -0700 v2 patch patch_2.txt text/plain 5204 fishd SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdFRvb2xz L0NoYW5nZUxvZwkocmV2aXNpb24gNTgzMTMpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNC0yNyAgRGFyaW4gRmlzaGVyICA8 ZGFyaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVtb3ZlIGRlcHJlY2F0ZWQgZm9ybSBvZiBkaWRDaGFu Z2VMb2NhdGlvbldpdGhpblBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM4MTc4CisKKyAgICAgICAgU3dpdGNoIG92ZXIgdG8gaW1wbGVtZW50aW5n IGRpZE5hdmlnYXRlV2l0aGluUGFnZS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmNwcDoKKyAgICAgICAgKFRlc3RXZWJWaWV3RGVsZWdhdGU6OmRpZE5h dmlnYXRlV2l0aGluUGFnZSk6CisgICAgICAgIChXZWJWaWV3SG9zdDo6ZGlkQ2hhbmdlTG9jYXRp b25XaXRoaW5QYWdlKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3 SG9zdC5oOgorCiAyMDEwLTA0LTI3ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCkluZGV4OiBXZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHANCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0t LSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAJKHJl dmlzaW9uIDU4MzEzKQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2Vi Vmlld0hvc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NDAsMTQgKzg0MCwxOSBAQCB2b2lkIFdl YlZpZXdIb3N0OjpkaWRGaW5pc2hMb2FkKFdlYkZyYW1lCiAgICAgbG9jYXRpb25DaGFuZ2VEb25l KGZyYW1lKTsKIH0KIAotdm9pZCBXZWJWaWV3SG9zdDo6ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5Q YWdlKFdlYkZyYW1lKiBmcmFtZSwgYm9vbCBpc05ld05hdmlnYXRpb24pCit2b2lkIFdlYlZpZXdI b3N0OjpkaWROYXZpZ2F0ZVdpdGhpblBhZ2UoV2ViRnJhbWUqIGZyYW1lLCBib29sIGlzTmV3TmF2 aWdhdGlvbikKIHsKICAgICBmcmFtZS0+ZGF0YVNvdXJjZSgpLT5zZXRFeHRyYURhdGEobV9wZW5k aW5nRXh0cmFEYXRhLnJlbGVhc2UoKSk7CisKKyAgICB1cGRhdGVGb3JDb21taXR0ZWRMb2FkKGZy YW1lLCBpc05ld05hdmlnYXRpb24pOworfQorCit2b2lkIFdlYlZpZXdIb3N0OjpkaWRDaGFuZ2VM b2NhdGlvbldpdGhpblBhZ2UoV2ViRnJhbWUqIGZyYW1lKQorewogICAgIGlmIChtX3NoZWxsLT5z aG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpIHsKICAgICAgICAgcHJpbnRGcmFtZURlc2Ny aXB0aW9uKGZyYW1lKTsKICAgICAgICAgZnB1dHMoIiAtIGRpZENoYW5nZUxvY2F0aW9uV2l0aGlu UGFnZUZvckZyYW1lXG4iLCBzdGRvdXQpOwogICAgIH0KLSAgICB1cGRhdGVGb3JDb21taXR0ZWRM b2FkKGZyYW1lLCBpc05ld05hdmlnYXRpb24pOwogfQogCiB2b2lkIFdlYlZpZXdIb3N0Ojphc3Np Z25JZGVudGlmaWVyVG9SZXF1ZXN0KFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllciwgY29u c3QgV2ViVVJMUmVxdWVzdCYgcmVxdWVzdCkKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCShyZXZpc2lvbiA1ODMxMykKKysr IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgJKHdvcmtp bmcgY29weSkKQEAgLTE2Myw3ICsxNjMsOCBAQCBjbGFzcyBXZWJWaWV3SG9zdCA6IHB1YmxpYyBX ZWJLaXQ6OldlYlZpCiAgICAgdmlydHVhbCB2b2lkIGRpZEhhbmRsZU9ubG9hZEV2ZW50cyhXZWJL aXQ6OldlYkZyYW1lKik7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWxMb2FkKFdlYktpdDo6V2Vi RnJhbWUqLCBjb25zdCBXZWJLaXQ6OldlYlVSTEVycm9yJik7CiAgICAgdmlydHVhbCB2b2lkIGRp ZEZpbmlzaExvYWQoV2ViS2l0OjpXZWJGcmFtZSopOwotICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFu Z2VMb2NhdGlvbldpdGhpblBhZ2UoV2ViS2l0OjpXZWJGcmFtZSosIGJvb2wgaXNOZXdOYXZpZ2F0 aW9uKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkTmF2aWdhdGVXaXRoaW5QYWdlKFdlYktpdDo6V2Vi RnJhbWUqLCBib29sIGlzTmV3TmF2aWdhdGlvbik7CisgICAgdmlydHVhbCB2b2lkIGRpZENoYW5n ZUxvY2F0aW9uV2l0aGluUGFnZShXZWJLaXQ6OldlYkZyYW1lKik7CiAgICAgdmlydHVhbCB2b2lk IGFzc2lnbklkZW50aWZpZXJUb1JlcXVlc3QoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlk ZW50aWZpZXIsIGNvbnN0IFdlYktpdDo6V2ViVVJMUmVxdWVzdCYpOwogICAgIHZpcnR1YWwgdm9p ZCB3aWxsU2VuZFJlcXVlc3QoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIs IFdlYktpdDo6V2ViVVJMUmVxdWVzdCYsIGNvbnN0IFdlYktpdDo6V2ViVVJMUmVzcG9uc2UmKTsK ICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKFdlYktpdDo6V2ViRnJhbWUqLCB1 bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlc3BvbnNlJik7CkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTgzMTMpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMjcgIERhcmluIEZp c2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92ZSBkZXByZWNhdGVkIGZvcm0gb2Yg ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zODE3OAorCisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xp ZW50Lmg6CisgICAgICAgICogc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHA6CisgICAgICAg IChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhp blBhZ2UpOgorCiAyMDEwLTA0LTI3ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaA0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAkocmV2aXNpb24gNTgzMTMpCisrKyBXZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTIx NCw4ICsyMTQsNiBAQCBwdWJsaWM6CiAKICAgICAvLyBUaGUgbmF2aWdhdGlvbiByZXN1bHRlZCBp biBzY3JvbGxpbmcgdGhlIHBhZ2UgdG8gYSBuYW1lZCBhbmNob3IgaW5zdGVhZAogICAgIC8vIG9m IGRvd25sb2FkaW5nIGEgbmV3IGRvY3VtZW50LgotICAgIC8vIEZJWE1FOiBUaGUgaXNOZXdOYXZp Z2F0aW9uIHBhcmFtZXRlciBpcyBERVBSRUNBVEVELgotICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFu Z2VMb2NhdGlvbldpdGhpblBhZ2UoV2ViRnJhbWUqLCBib29sIGlzTmV3TmF2aWdhdGlvbikgeyB9 CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZShXZWJGcmFtZSop IHsgfQogCiAgICAgLy8gQ2FsbGVkIHVwb24gdXBkYXRlIHRvIHNjcm9sbCBwb3NpdGlvbiwgZG9j dW1lbnQgc3RhdGUsIGFuZCBvdGhlcgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxv YWRlckNsaWVudEltcGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9G cmFtZUxvYWRlckNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA1ODMxMykKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjI4 LDE0ICs2MjgsOSBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hEaWROCiAK ICAgICBib29sIGlzTmV3TmF2aWdhdGlvbjsKICAgICB3ZWJWaWV3LT5kaWRDb21taXRMb2FkKCZp c05ld05hdmlnYXRpb24pOwotICAgIGlmIChtX3dlYkZyYW1lLT5jbGllbnQoKSkgeworICAgIGlm IChtX3dlYkZyYW1lLT5jbGllbnQoKSkKICAgICAgICAgbV93ZWJGcmFtZS0+Y2xpZW50KCktPmRp ZE5hdmlnYXRlV2l0aGluUGFnZShtX3dlYkZyYW1lLCBpc05ld05hdmlnYXRpb24pOwogCi0gICAg ICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBub3RpZmljYXRpb24gb25jZSBpdCBpcyBubyBsb25n ZXIgY29uc3VtZWQgZG93bnN0cmVhbS4KLSAgICAgICAgaWYgKGlzSGFzaENoYW5nZSkKLSAgICAg ICAgICAgIG1fd2ViRnJhbWUtPmNsaWVudCgpLT5kaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2Uo bV93ZWJGcmFtZSwgaXNOZXdOYXZpZ2F0aW9uKTsKLSAgICB9Ci0KICAgICAvLyBHZW5lcmF0ZSBk aWRTdG9wTG9hZGluZyBpZiBsb2FkZXIgaXMgY29tcGxldGVkLgogICAgIGlmICh3ZWJWaWV3LT5j bGllbnQoKSAmJiBsb2FkZXJDb21wbGV0ZWQpCiAgICAgICAgIHdlYlZpZXctPmNsaWVudCgpLT5k aWRTdG9wTG9hZGluZygpOwo=