48363 2010-10-26 12:33:14 -0700 Chromium: Update resource tracking when moving a frame between documents 2010-11-03 19:13:43 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 44713 1 jennb jennb abarth commit-queue dimich fishd oldest_to_newest 299711 0 jennb 2010-10-26 12:33:14 -0700 Chromium fix for bug reported in 44713. That patch provides the framework for the fix and fixes the Mac platform. Separate patches will be submitted for other platforms, thus this separate bug. 300742 1 72121 jennb 2010-10-27 17:46:50 -0700 Created attachment 72121 patch 301410 2 72121 dimich 2010-10-28 16:09:48 -0700 Comment on attachment 72121 patch View in context: https://bugs.webkit.org/attachment.cgi?id=72121&action=review > WebKit/chromium/src/FrameLoaderClientImpl.cpp:1394 > + oldWebFrame->client()->removeIdentifierForRequest(oldWebFrame, identifier); It looks like we are passing here wrong webFrame... Do we really need this parameter? 301466 3 72261 jennb 2010-10-28 16:55:46 -0700 Created attachment 72261 updated patch to remove unnecessary frame parameter 302506 4 abarth 2010-10-31 18:08:36 -0700 Needs fishd for WebKit API review. 302799 5 72526 jennb 2010-11-01 11:25:46 -0700 Created attachment 72526 updated patch - use map.contains() 302874 6 72526 fishd 2010-11-01 13:21:25 -0700 Comment on attachment 72526 updated patch - use map.contains() API change looks good to me. Is it possible to write a layout test for this? 302881 7 jennb 2010-11-01 13:26:47 -0700 (In reply to comment #6) > (From update of attachment 72526 [details]) > API change looks good to me. Is it possible to write a layout test for this? The layout test is in the patch submitted with bug 44713. Both that test (fast/frames/iframe-reparenting-fail-load.html) and fast/frames/iframe-reparenting-adopt-node.html cover this change. 304175 8 72526 dimich 2010-11-03 11:55:15 -0700 Comment on attachment 72526 updated patch - use map.contains() r=me 304421 9 72526 commit-queue 2010-11-03 19:13:38 -0700 Comment on attachment 72526 updated patch - use map.contains() Clearing flags on attachment: 72526 Committed r71297: <http://trac.webkit.org/changeset/71297> 304422 10 commit-queue 2010-11-03 19:13:43 -0700 All reviewed patches have been landed. Closing bug. 72121 2010-10-27 17:46:50 -0700 2010-10-28 16:55:46 -0700 patch patch48363.txt text/plain 7042 jennb ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGEzYTBlNjEuLjExMjMzNTggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTEwLTI3ICBKZW5uIEJyYWl0aHdhaXRlICA8amVubmJAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENocm9t aXVtOiBVcGRhdGUgcmVzb3VyY2UgdHJhY2tpbmcgd2hlbiBtb3ZpbmcgYSBmcmFtZSBiZXR3ZWVu IGRvY3VtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDgzNjMKKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZUNsaWVudC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZUNsaWVudDo6cmVtb3ZlSWRlbnRpZmllckZvclJlcXVlc3QpOgorICAg ICAgICBBZGRlZAorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudEltcGw6OnRyYW5zZmVyTG9hZGluZ1Jlc291 cmNlRnJvbVBhZ2UpOgorICAgICAgICBOb3RpZnkgY3VycmVudCBXZWJGcmFtZUNsaWVudCBvZiB0 aGUgcmVzb3VyY2UgYW5kIHJlbW92ZSBmcm9tCisgICAgICAgIGZvcm1lciBXZWJGcmFtZUNsaWVu dC4KKwogMjAxMC0xMC0yNyAgU2F0aXNoIFNhbXBhdGggIDxzYXRpc2hAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3MDY2NS4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRnJhbWVDbGllbnQuaAppbmRleCA0NTg2MDRlLi41NjY0YjA1IDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKKysrIGIvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCkBAIC0yNDAsNiArMjQwLDEwIEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgYXNzaWduSWRlbnRpZmllclRvUmVxdWVzdCgKICAgICAgICAg V2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBXZWJVUkxSZXF1ZXN0JikgeyB9 CiAKKyAgICAgLy8gUmVtb3ZlIHRoZSBhc3NvY2lhdGlvbiBiZXR3ZWVuIGFuIGlkZW50aWZpZXIg YXNzaWduZWQgdG8gYSByZXF1ZXN0IGlmCisgICAgIC8vIHRoZSBjbGllbnQga2VlcHMgc3VjaCBh biBhc3NvY2lhdGlvbi4KKyAgICAgdmlydHVhbCB2b2lkIHJlbW92ZUlkZW50aWZpZXJGb3JSZXF1 ZXN0KFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllcikgeyB9CisKICAgICAvLyBBIHJlcXVl c3QgaXMgYWJvdXQgdG8gYmUgc2VudCBvdXQsIGFuZCB0aGUgY2xpZW50IG1heSBtb2RpZnkgaXQu ICBSZXF1ZXN0CiAgICAgLy8gaXMgd3JpdGFibGUsIGFuZCBjaGFuZ2VzIHRvIHRoZSBVUkwsIGZv ciBleGFtcGxlLCB3aWxsIGNoYW5nZSB0aGUgcmVxdWVzdAogICAgIC8vIG1hZGUuICBJZiB0aGlz IHJlcXVlc3QgaXMgdGhlIHJlc3VsdCBvZiBhIHJlZGlyZWN0LCB0aGVuIHJlZGlyZWN0UmVzcG9u c2UKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBs LmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAppbmRl eCBjODFjZmMwLi4yZDViNGJkIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1l TG9hZGVyQ2xpZW50SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRl ckNsaWVudEltcGwuY3BwCkBAIC0xMzg1LDkgKzEzODUsMTMgQEAgdm9pZCBGcmFtZUxvYWRlckNs aWVudEltcGw6OmRpZFRyYW5zZmVyQ2hpbGRGcmFtZVRvTmV3RG9jdW1lbnQoUGFnZSopCiAgICAg bV93ZWJGcmFtZS0+c2V0Q2xpZW50KG5ld1BhcmVudC0+Y2xpZW50KCkpOwogfQogCi12b2lkIEZy YW1lTG9hZGVyQ2xpZW50SW1wbDo6dHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VGcm9tUGFnZSh1bnNp Z25lZCBsb25nLCBEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIFBhZ2Uq KQordm9pZCBGcmFtZUxvYWRlckNsaWVudEltcGw6OnRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJv bVBhZ2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBj b25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFBhZ2UqIG9sZFBhZ2UpCiB7Ci0gICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICBhc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdChpZGVu dGlmaWVyLCBsb2FkZXIsIHJlcXVlc3QpOworCisgICAgV2ViRnJhbWVJbXBsKiBvbGRXZWJGcmFt ZSA9IFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKG9sZFBhZ2UtPm1haW5GcmFtZSgpKTsKKyAgICBp ZiAob2xkV2ViRnJhbWUgJiYgb2xkV2ViRnJhbWUtPmNsaWVudCgpKQorICAgICAgICBvbGRXZWJG cmFtZS0+Y2xpZW50KCktPnJlbW92ZUlkZW50aWZpZXJGb3JSZXF1ZXN0KG9sZFdlYkZyYW1lLCBp ZGVudGlmaWVyKTsKIH0KIAogUGFzc1JlZlB0cjxXaWRnZXQ+IEZyYW1lTG9hZGVyQ2xpZW50SW1w bDo6Y3JlYXRlUGx1Z2luKApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFlY2Y2NzQuLmY4OTdkMmQgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMSBAQAorMjAxMC0xMC0yNyAgSmVubiBCcmFpdGh3YWl0ZSAgPGplbm5iQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaHJv bWl1bTogVXBkYXRlIHJlc291cmNlIHRyYWNraW5nIHdoZW4gbW92aW5nIGEgZnJhbWUgYmV0d2Vl biBkb2N1bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ4MzYzCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9z dC5jcHA6CisgICAgICAgIChXZWJWaWV3SG9zdDo6YXNzaWduSWRlbnRpZmllclRvUmVxdWVzdCk6 CisgICAgICAgIEFsd2F5cyBwdXQgcmVzb3VyY2UgaWQgaW4gbWFwIHNvIHdlIGNhbiBtYWtlIGFz c3VtcHRpb25zIGFib3V0IGl0cworICAgICAgICBwcmVzZW5jZS4KKyAgICAgICAgKFdlYlZpZXdI b3N0OjpyZW1vdmVJZGVudGlmaWVyRm9yUmVxdWVzdCk6CisgICAgICAgIEFkZGVkLgorICAgICAg ICAoV2ViVmlld0hvc3Q6OmRpZEZpbmlzaFJlc291cmNlTG9hZCk6CisgICAgICAgIChXZWJWaWV3 SG9zdDo6ZGlkRmFpbFJlc291cmNlTG9hZCk6CisgICAgICAgIENoZWNrIGV4aXN0ZW5jZSBvZiBy ZXNvdXJjZSBpZCBiZWZvcmUgcmVtb3ZpbmcgZnJvbSBtYXAuCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaDoKKwogMjAxMC0xMC0yNyAgR2Fib3IgUmFwY3Nh bnlpICA8cmdhYm9yQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255 IENoYW5nLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v V2ViVmlld0hvc3QuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2Vi Vmlld0hvc3QuY3BwCmluZGV4IDk3Njc2MDUuLjE5YjA1NGUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcAorKysgYi9XZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKQEAgLTk0MCwxMSAr OTQwLDE2IEBAIHZvaWQgV2ViVmlld0hvc3Q6OmRpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZShX ZWJGcmFtZSogZnJhbWUpCiAKIHZvaWQgV2ViVmlld0hvc3Q6OmFzc2lnbklkZW50aWZpZXJUb1Jl cXVlc3QoV2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBXZWJVUkxSZXF1ZXN0 JiByZXF1ZXN0KQogewotICAgIGlmICghbV9zaGVsbC0+c2hvdWxkRHVtcFJlc291cmNlTG9hZENh bGxiYWNrcygpKQotICAgICAgICByZXR1cm47CisgICAgQVNTRVJUKG1fcmVzb3VyY2VJZGVudGlm aWVyTWFwLmZpbmQoaWRlbnRpZmllcikgPT0gbV9yZXNvdXJjZUlkZW50aWZpZXJNYXAuZW5kKCkp OwogICAgIG1fcmVzb3VyY2VJZGVudGlmaWVyTWFwLnNldChpZGVudGlmaWVyLCBkZXNjcmlwdGlv blN1aXRhYmxlRm9yVGVzdFJlc3VsdChyZXF1ZXN0LnVybCgpLnNwZWMoKSkpOwogfQogCit2b2lk IFdlYlZpZXdIb3N0OjpyZW1vdmVJZGVudGlmaWVyRm9yUmVxdWVzdChXZWJGcmFtZSosIHVuc2ln bmVkIGlkZW50aWZpZXIpCit7CisgICAgQVNTRVJUKG1fcmVzb3VyY2VJZGVudGlmaWVyTWFwLmZp bmQoaWRlbnRpZmllcikgIT0gbV9yZXNvdXJjZUlkZW50aWZpZXJNYXAuZW5kKCkpOworICAgIG1f cmVzb3VyY2VJZGVudGlmaWVyTWFwLnJlbW92ZShpZGVudGlmaWVyKTsKK30KKwogdm9pZCBXZWJW aWV3SG9zdDo6d2lsbFNlbmRSZXF1ZXN0KFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllciwg V2ViVVJMUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgV2ViVVJMUmVzcG9uc2UmIHJlZGlyZWN0UmVz cG9uc2UpCiB7CiAgICAgLy8gTmVlZCB0byB1c2UgR1VSTCBmb3IgaG9zdCgpIGFuZCBTY2hlbWVJ cygpCkBAIC0xMDE2LDE2ICsxMDIxLDE2IEBAIHZvaWQgV2ViVmlld0hvc3Q6OmRpZFJlY2VpdmVS ZXNwb25zZShXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIGNvbnN0IFdlYlVSCiAgICAg fQogfQogCi12b2lkIFdlYlZpZXdIb3N0OjpkaWRGaW5pc2hSZXNvdXJjZUxvYWQoV2ViRnJhbWUq LCB1bnNpZ25lZCBpZGVudGlmaWVyKQordm9pZCBXZWJWaWV3SG9zdDo6ZGlkRmluaXNoUmVzb3Vy Y2VMb2FkKFdlYkZyYW1lKiBmcmFtZSwgdW5zaWduZWQgaWRlbnRpZmllcikKIHsKICAgICBpZiAo bV9zaGVsbC0+c2hvdWxkRHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpKSB7CiAgICAgICAgIHBy aW50UmVzb3VyY2VEZXNjcmlwdGlvbihpZGVudGlmaWVyKTsKICAgICAgICAgZnB1dHMoIiAtIGRp ZEZpbmlzaExvYWRpbmdcbiIsIHN0ZG91dCk7CiAgICAgfQotICAgIG1fcmVzb3VyY2VJZGVudGlm aWVyTWFwLnJlbW92ZShpZGVudGlmaWVyKTsKKyAgICByZW1vdmVJZGVudGlmaWVyRm9yUmVxdWVz dChmcmFtZSwgaWRlbnRpZmllcik7CiB9CiAKLXZvaWQgV2ViVmlld0hvc3Q6OmRpZEZhaWxSZXNv dXJjZUxvYWQoV2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBXZWJVUkxFcnJv ciYgZXJyb3IpCit2b2lkIFdlYlZpZXdIb3N0OjpkaWRGYWlsUmVzb3VyY2VMb2FkKFdlYkZyYW1l KiBmcmFtZSwgdW5zaWduZWQgaWRlbnRpZmllciwgY29uc3QgV2ViVVJMRXJyb3ImIGVycm9yKQog ewogICAgIGlmIChtX3NoZWxsLT5zaG91bGREdW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkpIHsK ICAgICAgICAgcHJpbnRSZXNvdXJjZURlc2NyaXB0aW9uKGlkZW50aWZpZXIpOwpAQCAtMTAzMyw3 ICsxMDM4LDcgQEAgdm9pZCBXZWJWaWV3SG9zdDo6ZGlkRmFpbFJlc291cmNlTG9hZChXZWJGcmFt ZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIGNvbnN0IFdlYlUKICAgICAgICAgZnB1dHMod2Via2l0 X3N1cHBvcnQ6Ok1ha2VVUkxFcnJvckRlc2NyaXB0aW9uKGVycm9yKS5jX3N0cigpLCBzdGRvdXQp OwogICAgICAgICBmcHV0cygiXG4iLCBzdGRvdXQpOwogICAgIH0KLSAgICBtX3Jlc291cmNlSWRl bnRpZmllck1hcC5yZW1vdmUoaWRlbnRpZmllcik7CisgICAgcmVtb3ZlSWRlbnRpZmllckZvclJl cXVlc3QoZnJhbWUsIGlkZW50aWZpZXIpOwogfQogCiB2b2lkIFdlYlZpZXdIb3N0OjpkaWREaXNw bGF5SW5zZWN1cmVDb250ZW50KFdlYkZyYW1lKikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmggYi9XZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCmluZGV4IGVhNzA1NzQuLjBjMTI1ODMgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0 LmgKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3Qu aApAQCAtMTg1LDYgKzE4NSw3IEBAIGNsYXNzIFdlYlZpZXdIb3N0IDogcHVibGljIFdlYktpdDo6 V2ViVmlld0NsaWVudCwgcHVibGljIFdlYktpdDo6V2ViRnJhbWVDbGllbnQsCiAgICAgdmlydHVh bCB2b2lkIGRpZE5hdmlnYXRlV2l0aGluUGFnZShXZWJLaXQ6OldlYkZyYW1lKiwgYm9vbCBpc05l d05hdmlnYXRpb24pOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBh Z2UoV2ViS2l0OjpXZWJGcmFtZSopOwogICAgIHZpcnR1YWwgdm9pZCBhc3NpZ25JZGVudGlmaWVy VG9SZXF1ZXN0KFdlYktpdDo6V2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBX ZWJLaXQ6OldlYlVSTFJlcXVlc3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlSWRlbnRpZmll ckZvclJlcXVlc3QoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIpOwogICAg IHZpcnR1YWwgdm9pZCB3aWxsU2VuZFJlcXVlc3QoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2lnbmVk IGlkZW50aWZpZXIsIFdlYktpdDo6V2ViVVJMUmVxdWVzdCYsIGNvbnN0IFdlYktpdDo6V2ViVVJM UmVzcG9uc2UmKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKFdlYktpdDo6 V2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlc3Bv bnNlJik7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaFJlc291cmNlTG9hZChXZWJLaXQ6Oldl YkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllcik7Cg== 72261 2010-10-28 16:55:46 -0700 2010-11-01 11:25:46 -0700 updated patch to remove unnecessary frame parameter patch48363-2.txt text/plain 6533 jennb ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGEzYTBlNjEuLjExMjMzNTggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTEwLTI3ICBKZW5uIEJyYWl0aHdhaXRlICA8amVubmJAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENocm9t aXVtOiBVcGRhdGUgcmVzb3VyY2UgdHJhY2tpbmcgd2hlbiBtb3ZpbmcgYSBmcmFtZSBiZXR3ZWVu IGRvY3VtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDgzNjMKKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZUNsaWVudC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZUNsaWVudDo6cmVtb3ZlSWRlbnRpZmllckZvclJlcXVlc3QpOgorICAg ICAgICBBZGRlZAorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudEltcGw6OnRyYW5zZmVyTG9hZGluZ1Jlc291 cmNlRnJvbVBhZ2UpOgorICAgICAgICBOb3RpZnkgY3VycmVudCBXZWJGcmFtZUNsaWVudCBvZiB0 aGUgcmVzb3VyY2UgYW5kIHJlbW92ZSBmcm9tCisgICAgICAgIGZvcm1lciBXZWJGcmFtZUNsaWVu dC4KKwogMjAxMC0xMC0yNyAgU2F0aXNoIFNhbXBhdGggIDxzYXRpc2hAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3MDY2NS4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRnJhbWVDbGllbnQuaAppbmRleCA0NTg2MDRlLi4xNjgyNzAxIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKKysrIGIvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCkBAIC0yNDAsNiArMjQwLDEwIEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgYXNzaWduSWRlbnRpZmllclRvUmVxdWVzdCgKICAgICAgICAg V2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBXZWJVUkxSZXF1ZXN0JikgeyB9 CiAKKyAgICAgLy8gUmVtb3ZlIHRoZSBhc3NvY2lhdGlvbiBiZXR3ZWVuIGFuIGlkZW50aWZpZXIg YXNzaWduZWQgdG8gYSByZXF1ZXN0IGlmCisgICAgIC8vIHRoZSBjbGllbnQga2VlcHMgc3VjaCBh biBhc3NvY2lhdGlvbi4KKyAgICAgdmlydHVhbCB2b2lkIHJlbW92ZUlkZW50aWZpZXJGb3JSZXF1 ZXN0KHVuc2lnbmVkIGlkZW50aWZpZXIpIHsgfQorCiAgICAgLy8gQSByZXF1ZXN0IGlzIGFib3V0 IHRvIGJlIHNlbnQgb3V0LCBhbmQgdGhlIGNsaWVudCBtYXkgbW9kaWZ5IGl0LiAgUmVxdWVzdAog ICAgIC8vIGlzIHdyaXRhYmxlLCBhbmQgY2hhbmdlcyB0byB0aGUgVVJMLCBmb3IgZXhhbXBsZSwg d2lsbCBjaGFuZ2UgdGhlIHJlcXVlc3QKICAgICAvLyBtYWRlLiAgSWYgdGhpcyByZXF1ZXN0IGlz IHRoZSByZXN1bHQgb2YgYSByZWRpcmVjdCwgdGhlbiByZWRpcmVjdFJlc3BvbnNlCmRpZmYgLS1n aXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9XZWJL aXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXggYzgxY2ZjMC4u ZmRhZWU3NSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVu dEltcGwuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBs LmNwcApAQCAtMTM4NSw5ICsxMzg1LDEzIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpk aWRUcmFuc2ZlckNoaWxkRnJhbWVUb05ld0RvY3VtZW50KFBhZ2UqKQogICAgIG1fd2ViRnJhbWUt PnNldENsaWVudChuZXdQYXJlbnQtPmNsaWVudCgpKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlckNs aWVudEltcGw6OnRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UodW5zaWduZWQgbG9uZywg RG9jdW1lbnRMb2FkZXIqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBQYWdlKikKK3ZvaWQgRnJh bWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBQYWdlKiBvbGRQYWdlKQogewotICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgYXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QoaWRlbnRpZmllciwgbG9h ZGVyLCByZXF1ZXN0KTsKKworICAgIFdlYkZyYW1lSW1wbCogb2xkV2ViRnJhbWUgPSBXZWJGcmFt ZUltcGw6OmZyb21GcmFtZShvbGRQYWdlLT5tYWluRnJhbWUoKSk7CisgICAgaWYgKG9sZFdlYkZy YW1lICYmIG9sZFdlYkZyYW1lLT5jbGllbnQoKSkKKyAgICAgICAgb2xkV2ViRnJhbWUtPmNsaWVu dCgpLT5yZW1vdmVJZGVudGlmaWVyRm9yUmVxdWVzdChpZGVudGlmaWVyKTsKIH0KIAogUGFzc1Jl ZlB0cjxXaWRnZXQ+IEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6Y3JlYXRlUGx1Z2luKApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGFlY2Y2NzQuLmY4OTdkMmQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysg Yi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMC0yNyAgSmVu biBCcmFpdGh3YWl0ZSAgPGplbm5iQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaHJvbWl1bTogVXBkYXRlIHJlc291cmNlIHRy YWNraW5nIHdoZW4gbW92aW5nIGEgZnJhbWUgYmV0d2VlbiBkb2N1bWVudHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzYzCisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHA6CisgICAgICAgIChXZWJWaWV3 SG9zdDo6YXNzaWduSWRlbnRpZmllclRvUmVxdWVzdCk6CisgICAgICAgIEFsd2F5cyBwdXQgcmVz b3VyY2UgaWQgaW4gbWFwIHNvIHdlIGNhbiBtYWtlIGFzc3VtcHRpb25zIGFib3V0IGl0cworICAg ICAgICBwcmVzZW5jZS4KKyAgICAgICAgKFdlYlZpZXdIb3N0OjpyZW1vdmVJZGVudGlmaWVyRm9y UmVxdWVzdCk6CisgICAgICAgIEFkZGVkLgorICAgICAgICAoV2ViVmlld0hvc3Q6OmRpZEZpbmlz aFJlc291cmNlTG9hZCk6CisgICAgICAgIChXZWJWaWV3SG9zdDo6ZGlkRmFpbFJlc291cmNlTG9h ZCk6CisgICAgICAgIENoZWNrIGV4aXN0ZW5jZSBvZiByZXNvdXJjZSBpZCBiZWZvcmUgcmVtb3Zp bmcgZnJvbSBtYXAuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hv c3QuaDoKKwogMjAxMC0xMC0yNyAgR2Fib3IgUmFwY3NhbnlpICA8cmdhYm9yQGluZi51LXN6ZWdl ZC5odT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwIGIvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCmluZGV4IDk3Njc2 MDUuLmFlM2I5YmQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9XZWJWaWV3SG9zdC5jcHAKQEAgLTk0MCwxMSArOTQwLDE2IEBAIHZvaWQgV2ViVmlld0hv c3Q6OmRpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZShXZWJGcmFtZSogZnJhbWUpCiAKIHZvaWQg V2ViVmlld0hvc3Q6OmFzc2lnbklkZW50aWZpZXJUb1JlcXVlc3QoV2ViRnJhbWUqLCB1bnNpZ25l ZCBpZGVudGlmaWVyLCBjb25zdCBXZWJVUkxSZXF1ZXN0JiByZXF1ZXN0KQogewotICAgIGlmICgh bV9zaGVsbC0+c2hvdWxkRHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpKQotICAgICAgICByZXR1 cm47CisgICAgQVNTRVJUKG1fcmVzb3VyY2VJZGVudGlmaWVyTWFwLmZpbmQoaWRlbnRpZmllcikg PT0gbV9yZXNvdXJjZUlkZW50aWZpZXJNYXAuZW5kKCkpOwogICAgIG1fcmVzb3VyY2VJZGVudGlm aWVyTWFwLnNldChpZGVudGlmaWVyLCBkZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdChy ZXF1ZXN0LnVybCgpLnNwZWMoKSkpOwogfQogCit2b2lkIFdlYlZpZXdIb3N0OjpyZW1vdmVJZGVu dGlmaWVyRm9yUmVxdWVzdCh1bnNpZ25lZCBpZGVudGlmaWVyKQoreworICAgIEFTU0VSVChtX3Jl c291cmNlSWRlbnRpZmllck1hcC5maW5kKGlkZW50aWZpZXIpICE9IG1fcmVzb3VyY2VJZGVudGlm aWVyTWFwLmVuZCgpKTsKKyAgICBtX3Jlc291cmNlSWRlbnRpZmllck1hcC5yZW1vdmUoaWRlbnRp Zmllcik7Cit9CisKIHZvaWQgV2ViVmlld0hvc3Q6OndpbGxTZW5kUmVxdWVzdChXZWJGcmFtZSos IHVuc2lnbmVkIGlkZW50aWZpZXIsIFdlYlVSTFJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFdlYlVS TFJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogewogICAgIC8vIE5lZWQgdG8gdXNlIEdVUkwg Zm9yIGhvc3QoKSBhbmQgU2NoZW1lSXMoKQpAQCAtMTAyMiw3ICsxMDI3LDcgQEAgdm9pZCBXZWJW aWV3SG9zdDo6ZGlkRmluaXNoUmVzb3VyY2VMb2FkKFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRp ZmllcikKICAgICAgICAgcHJpbnRSZXNvdXJjZURlc2NyaXB0aW9uKGlkZW50aWZpZXIpOwogICAg ICAgICBmcHV0cygiIC0gZGlkRmluaXNoTG9hZGluZ1xuIiwgc3Rkb3V0KTsKICAgICB9Ci0gICAg bV9yZXNvdXJjZUlkZW50aWZpZXJNYXAucmVtb3ZlKGlkZW50aWZpZXIpOworICAgIHJlbW92ZUlk ZW50aWZpZXJGb3JSZXF1ZXN0KGlkZW50aWZpZXIpOwogfQogCiB2b2lkIFdlYlZpZXdIb3N0Ojpk aWRGYWlsUmVzb3VyY2VMb2FkKFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllciwgY29uc3Qg V2ViVVJMRXJyb3ImIGVycm9yKQpAQCAtMTAzMyw3ICsxMDM4LDcgQEAgdm9pZCBXZWJWaWV3SG9z dDo6ZGlkRmFpbFJlc291cmNlTG9hZChXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIGNv bnN0IFdlYlUKICAgICAgICAgZnB1dHMod2Via2l0X3N1cHBvcnQ6Ok1ha2VVUkxFcnJvckRlc2Ny aXB0aW9uKGVycm9yKS5jX3N0cigpLCBzdGRvdXQpOwogICAgICAgICBmcHV0cygiXG4iLCBzdGRv dXQpOwogICAgIH0KLSAgICBtX3Jlc291cmNlSWRlbnRpZmllck1hcC5yZW1vdmUoaWRlbnRpZmll cik7CisgICAgcmVtb3ZlSWRlbnRpZmllckZvclJlcXVlc3QoaWRlbnRpZmllcik7CiB9CiAKIHZv aWQgV2ViVmlld0hvc3Q6OmRpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnQoV2ViRnJhbWUqKQpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3Qu aCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKaW5k ZXggZWE3MDU3NC4uZDY0MzQ1ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCkBAIC0xODUsNiArMTg1LDcgQEAgY2xhc3MgV2ViVmll d0hvc3QgOiBwdWJsaWMgV2ViS2l0OjpXZWJWaWV3Q2xpZW50LCBwdWJsaWMgV2ViS2l0OjpXZWJG cmFtZUNsaWVudCwKICAgICB2aXJ0dWFsIHZvaWQgZGlkTmF2aWdhdGVXaXRoaW5QYWdlKFdlYktp dDo6V2ViRnJhbWUqLCBib29sIGlzTmV3TmF2aWdhdGlvbik7CiAgICAgdmlydHVhbCB2b2lkIGRp ZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZShXZWJLaXQ6OldlYkZyYW1lKik7CiAgICAgdmlydHVh bCB2b2lkIGFzc2lnbklkZW50aWZpZXJUb1JlcXVlc3QoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2ln bmVkIGlkZW50aWZpZXIsIGNvbnN0IFdlYktpdDo6V2ViVVJMUmVxdWVzdCYpOworICAgIHZpcnR1 YWwgdm9pZCByZW1vdmVJZGVudGlmaWVyRm9yUmVxdWVzdCh1bnNpZ25lZCBpZGVudGlmaWVyKTsK ICAgICB2aXJ0dWFsIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KFdlYktpdDo6V2ViRnJhbWUqLCB1bnNp Z25lZCBpZGVudGlmaWVyLCBXZWJLaXQ6OldlYlVSTFJlcXVlc3QmLCBjb25zdCBXZWJLaXQ6Oldl YlVSTFJlc3BvbnNlJik7CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShXZWJL aXQ6OldlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllciwgY29uc3QgV2ViS2l0OjpXZWJVUkxS ZXNwb25zZSYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hSZXNvdXJjZUxvYWQoV2ViS2l0 OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIpOwo= 72526 2010-11-01 11:25:46 -0700 2010-11-03 19:13:37 -0700 updated patch - use map.contains() patch48363-3.txt text/plain 6476 jennb ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGEzYTBlNjEuLjExMjMzNTggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTEwLTI3ICBKZW5uIEJyYWl0aHdhaXRlICA8amVubmJAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENocm9t aXVtOiBVcGRhdGUgcmVzb3VyY2UgdHJhY2tpbmcgd2hlbiBtb3ZpbmcgYSBmcmFtZSBiZXR3ZWVu IGRvY3VtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDgzNjMKKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZUNsaWVudC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZUNsaWVudDo6cmVtb3ZlSWRlbnRpZmllckZvclJlcXVlc3QpOgorICAg ICAgICBBZGRlZAorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudEltcGw6OnRyYW5zZmVyTG9hZGluZ1Jlc291 cmNlRnJvbVBhZ2UpOgorICAgICAgICBOb3RpZnkgY3VycmVudCBXZWJGcmFtZUNsaWVudCBvZiB0 aGUgcmVzb3VyY2UgYW5kIHJlbW92ZSBmcm9tCisgICAgICAgIGZvcm1lciBXZWJGcmFtZUNsaWVu dC4KKwogMjAxMC0xMC0yNyAgU2F0aXNoIFNhbXBhdGggIDxzYXRpc2hAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3MDY2NS4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRnJhbWVDbGllbnQuaAppbmRleCA0NTg2MDRlLi4xNjgyNzAxIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKKysrIGIvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCkBAIC0yNDAsNiArMjQwLDEwIEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgYXNzaWduSWRlbnRpZmllclRvUmVxdWVzdCgKICAgICAgICAg V2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVudGlmaWVyLCBjb25zdCBXZWJVUkxSZXF1ZXN0JikgeyB9 CiAKKyAgICAgLy8gUmVtb3ZlIHRoZSBhc3NvY2lhdGlvbiBiZXR3ZWVuIGFuIGlkZW50aWZpZXIg YXNzaWduZWQgdG8gYSByZXF1ZXN0IGlmCisgICAgIC8vIHRoZSBjbGllbnQga2VlcHMgc3VjaCBh biBhc3NvY2lhdGlvbi4KKyAgICAgdmlydHVhbCB2b2lkIHJlbW92ZUlkZW50aWZpZXJGb3JSZXF1 ZXN0KHVuc2lnbmVkIGlkZW50aWZpZXIpIHsgfQorCiAgICAgLy8gQSByZXF1ZXN0IGlzIGFib3V0 IHRvIGJlIHNlbnQgb3V0LCBhbmQgdGhlIGNsaWVudCBtYXkgbW9kaWZ5IGl0LiAgUmVxdWVzdAog ICAgIC8vIGlzIHdyaXRhYmxlLCBhbmQgY2hhbmdlcyB0byB0aGUgVVJMLCBmb3IgZXhhbXBsZSwg d2lsbCBjaGFuZ2UgdGhlIHJlcXVlc3QKICAgICAvLyBtYWRlLiAgSWYgdGhpcyByZXF1ZXN0IGlz IHRoZSByZXN1bHQgb2YgYSByZWRpcmVjdCwgdGhlbiByZWRpcmVjdFJlc3BvbnNlCmRpZmYgLS1n aXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9XZWJL aXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXggYzgxY2ZjMC4u ZmRhZWU3NSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVu dEltcGwuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBs LmNwcApAQCAtMTM4NSw5ICsxMzg1LDEzIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpk aWRUcmFuc2ZlckNoaWxkRnJhbWVUb05ld0RvY3VtZW50KFBhZ2UqKQogICAgIG1fd2ViRnJhbWUt PnNldENsaWVudChuZXdQYXJlbnQtPmNsaWVudCgpKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlckNs aWVudEltcGw6OnRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UodW5zaWduZWQgbG9uZywg RG9jdW1lbnRMb2FkZXIqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBQYWdlKikKK3ZvaWQgRnJh bWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBQYWdlKiBvbGRQYWdlKQogewotICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgYXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QoaWRlbnRpZmllciwgbG9h ZGVyLCByZXF1ZXN0KTsKKworICAgIFdlYkZyYW1lSW1wbCogb2xkV2ViRnJhbWUgPSBXZWJGcmFt ZUltcGw6OmZyb21GcmFtZShvbGRQYWdlLT5tYWluRnJhbWUoKSk7CisgICAgaWYgKG9sZFdlYkZy YW1lICYmIG9sZFdlYkZyYW1lLT5jbGllbnQoKSkKKyAgICAgICAgb2xkV2ViRnJhbWUtPmNsaWVu dCgpLT5yZW1vdmVJZGVudGlmaWVyRm9yUmVxdWVzdChpZGVudGlmaWVyKTsKIH0KIAogUGFzc1Jl ZlB0cjxXaWRnZXQ+IEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6Y3JlYXRlUGx1Z2luKApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGFlY2Y2NzQuLmY4OTdkMmQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysg Yi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMC0yNyAgSmVu biBCcmFpdGh3YWl0ZSAgPGplbm5iQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaHJvbWl1bTogVXBkYXRlIHJlc291cmNlIHRy YWNraW5nIHdoZW4gbW92aW5nIGEgZnJhbWUgYmV0d2VlbiBkb2N1bWVudHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzYzCisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHA6CisgICAgICAgIChXZWJWaWV3 SG9zdDo6YXNzaWduSWRlbnRpZmllclRvUmVxdWVzdCk6CisgICAgICAgIEFsd2F5cyBwdXQgcmVz b3VyY2UgaWQgaW4gbWFwIHNvIHdlIGNhbiBtYWtlIGFzc3VtcHRpb25zIGFib3V0IGl0cworICAg ICAgICBwcmVzZW5jZS4KKyAgICAgICAgKFdlYlZpZXdIb3N0OjpyZW1vdmVJZGVudGlmaWVyRm9y UmVxdWVzdCk6CisgICAgICAgIEFkZGVkLgorICAgICAgICAoV2ViVmlld0hvc3Q6OmRpZEZpbmlz aFJlc291cmNlTG9hZCk6CisgICAgICAgIChXZWJWaWV3SG9zdDo6ZGlkRmFpbFJlc291cmNlTG9h ZCk6CisgICAgICAgIENoZWNrIGV4aXN0ZW5jZSBvZiByZXNvdXJjZSBpZCBiZWZvcmUgcmVtb3Zp bmcgZnJvbSBtYXAuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hv c3QuaDoKKwogMjAxMC0xMC0yNyAgR2Fib3IgUmFwY3NhbnlpICA8cmdhYm9yQGluZi51LXN6ZWdl ZC5odT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwIGIvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCmluZGV4IDk3Njc2 MDUuLjUxMTI4ZGYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9XZWJWaWV3SG9zdC5jcHAKQEAgLTk0MCwxMSArOTQwLDE2IEBAIHZvaWQgV2ViVmlld0hv c3Q6OmRpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZShXZWJGcmFtZSogZnJhbWUpCiAKIHZvaWQg V2ViVmlld0hvc3Q6OmFzc2lnbklkZW50aWZpZXJUb1JlcXVlc3QoV2ViRnJhbWUqLCB1bnNpZ25l ZCBpZGVudGlmaWVyLCBjb25zdCBXZWJVUkxSZXF1ZXN0JiByZXF1ZXN0KQogewotICAgIGlmICgh bV9zaGVsbC0+c2hvdWxkRHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpKQotICAgICAgICByZXR1 cm47CisgICAgQVNTRVJUKCFtX3Jlc291cmNlSWRlbnRpZmllck1hcC5jb250YWlucyhpZGVudGlm aWVyKSk7CiAgICAgbV9yZXNvdXJjZUlkZW50aWZpZXJNYXAuc2V0KGlkZW50aWZpZXIsIGRlc2Ny aXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KHJlcXVlc3QudXJsKCkuc3BlYygpKSk7CiB9CiAK K3ZvaWQgV2ViVmlld0hvc3Q6OnJlbW92ZUlkZW50aWZpZXJGb3JSZXF1ZXN0KHVuc2lnbmVkIGlk ZW50aWZpZXIpCit7CisgICAgQVNTRVJUKG1fcmVzb3VyY2VJZGVudGlmaWVyTWFwLmNvbnRhaW5z KGlkZW50aWZpZXIpKTsKKyAgICBtX3Jlc291cmNlSWRlbnRpZmllck1hcC5yZW1vdmUoaWRlbnRp Zmllcik7Cit9CisKIHZvaWQgV2ViVmlld0hvc3Q6OndpbGxTZW5kUmVxdWVzdChXZWJGcmFtZSos IHVuc2lnbmVkIGlkZW50aWZpZXIsIFdlYlVSTFJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFdlYlVS TFJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogewogICAgIC8vIE5lZWQgdG8gdXNlIEdVUkwg Zm9yIGhvc3QoKSBhbmQgU2NoZW1lSXMoKQpAQCAtMTAyMiw3ICsxMDI3LDcgQEAgdm9pZCBXZWJW aWV3SG9zdDo6ZGlkRmluaXNoUmVzb3VyY2VMb2FkKFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRp ZmllcikKICAgICAgICAgcHJpbnRSZXNvdXJjZURlc2NyaXB0aW9uKGlkZW50aWZpZXIpOwogICAg ICAgICBmcHV0cygiIC0gZGlkRmluaXNoTG9hZGluZ1xuIiwgc3Rkb3V0KTsKICAgICB9Ci0gICAg bV9yZXNvdXJjZUlkZW50aWZpZXJNYXAucmVtb3ZlKGlkZW50aWZpZXIpOworICAgIHJlbW92ZUlk ZW50aWZpZXJGb3JSZXF1ZXN0KGlkZW50aWZpZXIpOwogfQogCiB2b2lkIFdlYlZpZXdIb3N0Ojpk aWRGYWlsUmVzb3VyY2VMb2FkKFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllciwgY29uc3Qg V2ViVVJMRXJyb3ImIGVycm9yKQpAQCAtMTAzMyw3ICsxMDM4LDcgQEAgdm9pZCBXZWJWaWV3SG9z dDo6ZGlkRmFpbFJlc291cmNlTG9hZChXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIGNv bnN0IFdlYlUKICAgICAgICAgZnB1dHMod2Via2l0X3N1cHBvcnQ6Ok1ha2VVUkxFcnJvckRlc2Ny aXB0aW9uKGVycm9yKS5jX3N0cigpLCBzdGRvdXQpOwogICAgICAgICBmcHV0cygiXG4iLCBzdGRv dXQpOwogICAgIH0KLSAgICBtX3Jlc291cmNlSWRlbnRpZmllck1hcC5yZW1vdmUoaWRlbnRpZmll cik7CisgICAgcmVtb3ZlSWRlbnRpZmllckZvclJlcXVlc3QoaWRlbnRpZmllcik7CiB9CiAKIHZv aWQgV2ViVmlld0hvc3Q6OmRpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnQoV2ViRnJhbWUqKQpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3Qu aCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKaW5k ZXggZWE3MDU3NC4uZDY0MzQ1ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCkBAIC0xODUsNiArMTg1LDcgQEAgY2xhc3MgV2ViVmll d0hvc3QgOiBwdWJsaWMgV2ViS2l0OjpXZWJWaWV3Q2xpZW50LCBwdWJsaWMgV2ViS2l0OjpXZWJG cmFtZUNsaWVudCwKICAgICB2aXJ0dWFsIHZvaWQgZGlkTmF2aWdhdGVXaXRoaW5QYWdlKFdlYktp dDo6V2ViRnJhbWUqLCBib29sIGlzTmV3TmF2aWdhdGlvbik7CiAgICAgdmlydHVhbCB2b2lkIGRp ZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZShXZWJLaXQ6OldlYkZyYW1lKik7CiAgICAgdmlydHVh bCB2b2lkIGFzc2lnbklkZW50aWZpZXJUb1JlcXVlc3QoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2ln bmVkIGlkZW50aWZpZXIsIGNvbnN0IFdlYktpdDo6V2ViVVJMUmVxdWVzdCYpOworICAgIHZpcnR1 YWwgdm9pZCByZW1vdmVJZGVudGlmaWVyRm9yUmVxdWVzdCh1bnNpZ25lZCBpZGVudGlmaWVyKTsK ICAgICB2aXJ0dWFsIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KFdlYktpdDo6V2ViRnJhbWUqLCB1bnNp Z25lZCBpZGVudGlmaWVyLCBXZWJLaXQ6OldlYlVSTFJlcXVlc3QmLCBjb25zdCBXZWJLaXQ6Oldl YlVSTFJlc3BvbnNlJik7CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShXZWJL aXQ6OldlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllciwgY29uc3QgV2ViS2l0OjpXZWJVUkxS ZXNwb25zZSYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hSZXNvdXJjZUxvYWQoV2ViS2l0 OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIpOwo=