48368 2010-10-26 12:54:03 -0700 Update ProgressTracker when moving a frame between documents 2010-11-09 05:01:35 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jennb jennb commit-queue dimich webkit-ews oldest_to_newest 299740 0 jennb 2010-10-26 12:54:03 -0700 When a live iframe is moved to a different document via adoptNode, the frame's resources are still being tracked by the former page's ProgressTracker. When a resource load is transferred to a different document/page, the ProgressTracker should treat that item as being completed. (Decrementing the progress of bytes received seems wrong.) Need more study to determine how the new page's ProgressTracker is affected by the resource load being transferred to the new page. 303796 1 72769 jennb 2010-11-02 16:54:14 -0700 Created attachment 72769 patch 303806 2 webkit-ews 2010-11-02 17:09:40 -0700 Attachment 72769 did not build on qt: Build output: http://queues.webkit.org/results/5047005 304173 3 72848 jennb 2010-11-03 11:54:44 -0700 Created attachment 72848 updated patch - fix compile error If someone knows of a way to test this from JS, I'm all ears. 304392 4 72848 dimich 2010-11-03 18:14:50 -0700 Comment on attachment 72848 updated patch - fix compile error View in context: https://bugs.webkit.org/attachment.cgi?id=72848&action=review Looks good! One small iteration... > WebCore/loader/ResourceLoadNotifier.cpp:167 > + oldPage->progress()->completeProgress(identifier); Could we add ASSERT documenting that new page and old page are guaranteed different here? This code actually uses this assumptions (because otherwise it immediately deletes the just-transfered 'identifier' from the progress tracker). 304905 5 72987 jennb 2010-11-04 15:08:39 -0700 Created attachment 72987 updated patch - added assert 306513 6 72987 dimich 2010-11-08 17:40:20 -0800 Comment on attachment 72987 updated patch - added assert r=me 306610 7 commit-queue 2010-11-08 21:48:29 -0800 The commit-queue encountered the following flaky tests while processing attachment 72987: animations/suspend-resume-animation.html compositing/video/video-background-color.html Please file bugs against the tests. These tests were authored by cmarrin@apple.com and simon.fraser@apple.com. The commit-queue is continuing to process your patch. 306724 8 72987 commit-queue 2010-11-09 05:01:30 -0800 Comment on attachment 72987 updated patch - added assert Clearing flags on attachment: 72987 Committed r71625: <http://trac.webkit.org/changeset/71625> 306725 9 commit-queue 2010-11-09 05:01:35 -0800 All reviewed patches have been landed. Closing bug. 72769 2010-11-02 16:54:14 -0700 2010-11-03 09:46:30 -0700 patch patch48368.txt text/plain 6705 jennb ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGEwOTg2NS4uYjcwMThhMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMC0xMS0wMiAgSmVubiBCcmFpdGh3 YWl0ZSAgPGplbm5iQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgUHJvZ3Jlc3NUcmFja2VyIHdoZW4gbW92aW5nIGEg ZnJhbWUgYmV0d2VlbiBkb2N1bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ4MzY4CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBhbmRlcnNjYSBp bmZvcm1zIG1lIGl0J3Mgbm90IHBvc3NpYmxlIHRvIHRlc3QKKyAgICAgICAgUHJvZ3Jlc3NUcmFj a2VyIGNoYW5nZXMgdmlhIGxheW91dHRlc3RzLiBSZXZpZXcgZXh0cmEgY2FyZWZ1bGx5Li4uCisK KyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnRMb2FkZXI6OnRyYW5zZmVyTG9hZGluZ1Jlc291cmNlc0Zyb21QYWdlKToKKyAgICAg ICAgQ2hhbmdlZCB0byB1c2UgRnJhbWVMb2FkZXIgdG8gZGVsaXZlciB0aGUgbm90aWZpY2F0aW9u IHRvIHRoZQorICAgICAgICBjbGllbnQgdmlhIHRoZSBub3RpZmllci4KKyAgICAgICAgKiBsb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6O3RyYW5z ZmVyTG9hZGluZ1Jlc291cmNlc0Zyb21QYWdlKToKKyAgICAgICAgVXBkYXRlIG9sZCBhbmQgbmV3 IHByb2dyZXNzIHRyYWNrZXIgYWJvdXQgZnJhbWUgcHJvZ3Jlc3MuCisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKToK KyAgICAgICAgQWRkZWQgdG8gcm91dGUgbm90aWZpY2F0aW9uIHZpYSB0aGUgbm90aWZpZXIuCisg ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL1Byb2dyZXNz VHJhY2tlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNrZXI6OmNvbXBsZXRl UHJvZ3Jlc3MpOgorICAgICAgICBDb21tZW50IGNoYW5nZSBvbmx5LgorICAgICAgICAqIGxvYWRl ci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxv YWROb3RpZmllcjo6ZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKToKKyAg ICAgICAgQWRkZWQgdG8gcHJvdmlkZSBvbmUgcGxhY2UgdG8gbm90aWZ5IGNsaWVudCBhbmQgcHJv Z3Jlc3MgdHJhY2tlciAtCisgICAgICAgIGFuZCBwcm9iYWJseSBpbnNwZWN0b3IgY29udHJvbGxl ciAoc2VwYXJhdGUgcGF0Y2gpLgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWROb3RpZmll ci5oOgorCiAyMDEwLTExLTAyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gRm9sbG93IHVwIHRvIHI3MTEzOTogcmVtb3Zpbmcg dW51c2VkIGltYWdlcy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcCBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCAzMGI4MGViLi4x YmMzODIwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysr IGIvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC03OTEsMTAgKzc5MSwxMiBA QCB2b2lkIERvY3VtZW50TG9hZGVyOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZXNGcm9tUGFnZShQ YWdlKiBvbGRQYWdlKQogewogICAgIEFTU0VSVChvbGRQYWdlICE9IG1fZnJhbWUtPnBhZ2UoKSk7 CiAKLSAgICBGcmFtZUxvYWRlckNsaWVudCogZnJhbWVMb2FkZXJDbGllbnQgPSBmcmFtZUxvYWRl cigpLT5jbGllbnQoKTsKKyAgICBGcmFtZUxvYWRlciogbG9hZGVyID0gZnJhbWVMb2FkZXIoKTsK KyAgICBBU1NFUlQobG9hZGVyKTsKKwogICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCA9IG9yaWdpbmFsUmVxdWVzdCgpOwogICAgIGlmIChpc0xvYWRpbmdNYWluUmVzb3VyY2UoKSkg ewotICAgICAgICBmcmFtZUxvYWRlckNsaWVudC0+dHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VGcm9t UGFnZSgKKyAgICAgICAgbG9hZGVyLT5kaXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJv bVBhZ2UoCiAgICAgICAgICAgICBtX21haW5SZXNvdXJjZUxvYWRlci0+aWRlbnRpZmllcigpLCB0 aGlzLCByZXF1ZXN0LCBvbGRQYWdlKTsKICAgICB9CiAKQEAgLTgwMiw3ICs4MDQsNyBAQCB2b2lk IERvY3VtZW50TG9hZGVyOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZXNGcm9tUGFnZShQYWdlKiBv bGRQYWdlKQogICAgICAgICBSZXNvdXJjZUxvYWRlclNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBt X3N1YnJlc291cmNlTG9hZGVycy5iZWdpbigpOwogICAgICAgICBSZXNvdXJjZUxvYWRlclNldDo6 Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9zdWJyZXNvdXJjZUxvYWRlcnMuZW5kKCk7CiAgICAgICAg IGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgICAgIGZyYW1lTG9hZGVyQ2xpZW50 LT50cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKAorICAgICAgICAgICAgbG9hZGVyLT5k aXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UoCiAgICAgICAgICAgICAgICAg KCppdCktPmlkZW50aWZpZXIoKSwgdGhpcywgcmVxdWVzdCwgb2xkUGFnZSk7CiAgICAgICAgIH0K ICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggYjkwYjE4Yy4uY2FkZTU0NSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcApAQCAtMTc0OCw4ICsxNzQ4LDE3IEBAIGJvb2wgRnJhbWVMb2FkZXI6 OmZyYW1lSGFzTG9hZGVkKCkgY29uc3QKIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5zZmVyTG9hZGlu Z1Jlc291cmNlc0Zyb21QYWdlKFBhZ2UqIG9sZFBhZ2UpCiB7CiAgICAgQVNTRVJUKG9sZFBhZ2Ug IT0gbV9mcmFtZS0+cGFnZSgpKTsKLSAgICBpZiAoaXNMb2FkaW5nKCkpCisgICAgaWYgKGlzTG9h ZGluZygpKSB7CiAgICAgICAgIGFjdGl2ZURvY3VtZW50TG9hZGVyKCktPnRyYW5zZmVyTG9hZGlu Z1Jlc291cmNlc0Zyb21QYWdlKG9sZFBhZ2UpOworICAgICAgICBvbGRQYWdlLT5wcm9ncmVzcygp LT5wcm9ncmVzc0NvbXBsZXRlZChtX2ZyYW1lKTsKKyAgICAgICAgaWYgKG1fZnJhbWUtPnBhZ2Uo KSkKKyAgICAgICAgICAgIG1fZnJhbWUtPnBhZ2UoKS0+cHJvZ3Jlc3NTdGFydGVkKG1fZnJhbWUp OworICAgIH0KK30KKwordm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdS ZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIq IGRvY0xvYWRlciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBQYWdlKiBvbGRQYWdl KQoreworICAgIG5vdGlmaWVyKCktPmRpc3BhdGNoVHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VGcm9t UGFnZShpZGVudGlmaWVyLCBkb2NMb2FkZXIsIHJlcXVlc3QsIG9sZFBhZ2UpOwogfQogCiB2b2lk IEZyYW1lTG9hZGVyOjpzZXREb2N1bWVudExvYWRlcihEb2N1bWVudExvYWRlciogbG9hZGVyKQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgKaW5kZXggNTdiYTA3YS4uOWViZWYyOSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o CkBAIC0xMzQsNiArMTM0LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNMb2FkaW5nKCkgY29uc3Q7 CiAgICAgYm9vbCBmcmFtZUhhc0xvYWRlZCgpIGNvbnN0OwogICAgIHZvaWQgdHJhbnNmZXJMb2Fk aW5nUmVzb3VyY2VzRnJvbVBhZ2UoUGFnZSopOworICAgIHZvaWQgZGlzcGF0Y2hUcmFuc2Zlckxv YWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcsIERvY3VtZW50TG9hZGVyKiwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiwgUGFnZSopOwogCiAgICAgaW50IG51bVBlbmRpbmdPckxvYWRp bmdSZXF1ZXN0cyhib29sIHJlY3Vyc2UpIGNvbnN0OwogICAgIFN0cmluZyByZWZlcnJlcigpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcCBiL1dl YkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5jcHAKaW5kZXggNTYxZTZiYy4uZTU2MWYwMCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcAorKysgYi9XZWJD b3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwCkBAIC0yNDEsNyArMjQxLDcgQEAgdm9pZCBQ cm9ncmVzc1RyYWNrZXI6OmNvbXBsZXRlUHJvZ3Jlc3ModW5zaWduZWQgbG9uZyBpZGVudGlmaWVy KQogewogICAgIFByb2dyZXNzSXRlbSogaXRlbSA9IG1fcHJvZ3Jlc3NJdGVtcy5nZXQoaWRlbnRp Zmllcik7CiAgICAgCi0gICAgLy8gRklYTUU6IENhbiB0aGlzIGhhcHBlbj8KKyAgICAvLyBUaGlz IGNhbiBoYXBwZW4gaWYgYSBsb2FkIGZhaWxzIHdpdGhvdXQgcmVjZWl2aW5nIGFueSByZXNwb25z ZSBkYXRhLgogICAgIGlmICghaXRlbSkKICAgICAgICAgcmV0dXJuOwogICAgIApkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwIGIvV2ViQ29yZS9sb2Fk ZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwCmluZGV4IGIzMmI3MzcuLjAyMzE0MTIgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNwcAorKysgYi9XZWJD b3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHAKQEAgLTE2MCw2ICsxNjAsMTMgQEAg dm9pZCBSZXNvdXJjZUxvYWROb3RpZmllcjo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkaW5nKERvY3Vt ZW50TG9hZGVyKiBsb2FkZXIsIHVuc2kKICNlbmRpZgogfQogCit2b2lkIFJlc291cmNlTG9hZE5v dGlmaWVyOjpkaXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UodW5zaWduZWQg bG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBSZXNvdXJjZVJl cXVlc3QmIHJlcXVlc3QsIFBhZ2UqIG9sZFBhZ2UpCit7CisgICAgbV9mcmFtZS0+bG9hZGVyKCkt PmNsaWVudCgpLT50cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKGlkZW50aWZpZXIsIGxv YWRlciwgcmVxdWVzdCwgb2xkUGFnZSk7CisKKyAgICBvbGRQYWdlLT5wcm9ncmVzcygpLT5jb21w bGV0ZVByb2dyZXNzKGlkZW50aWZpZXIpOworfQorCiB2b2lkIFJlc291cmNlTG9hZE5vdGlmaWVy OjpzZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhEb2N1bWVudExvYWRlciogbG9hZGVyLCB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl LCBpbnQgbGVuZ3RoLCBjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKICAgICBpZiAoIXJl c3BvbnNlLmlzTnVsbCgpKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2Fk Tm90aWZpZXIuaCBiL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmgKaW5kZXgg OTNmY2NjYy4uMmYxMDg1NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2Fk Tm90aWZpZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5oCkBA IC0zNyw2ICszNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlOwogY2xhc3MgRG9jdW1lbnRMb2FkZXI7CiBjbGFzcyBGcmFtZTsKK2NsYXNzIFBh Z2U7CiBjbGFzcyBSZXNvdXJjZUVycm9yOwogY2xhc3MgUmVzb3VyY2VMb2FkZXI7CiBjbGFzcyBS ZXNvdXJjZVJlc3BvbnNlOwpAQCAtNjAsNiArNjEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNw YXRjaERpZFJlY2VpdmVSZXNwb25zZShEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRS ZWNlaXZlQ29udGVudExlbmd0aChEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgaW50IGxlbmd0aCk7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZpbmlzaExvYWRpbmcoRG9j dW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGRvdWJsZSBmaW5pc2hUaW1l KTsKKyAgICB2b2lkIGRpc3BhdGNoVHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VGcm9tUGFnZSh1bnNp Z25lZCBsb25nLCBEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIFBhZ2Uq KTsKIAogICAgIHZvaWQgc2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMoRG9jdW1lbnRMb2Fk ZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBp bnQgbGVuZ3RoLCBjb25zdCBSZXNvdXJjZUVycm9yJik7CiAK 72848 2010-11-03 11:54:44 -0700 2010-11-04 15:08:39 -0700 updated patch - fix compile error patch48368-2.txt text/plain 6717 jennb ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGEwOTg2NS4uYjcwMThhMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMC0xMS0wMiAgSmVubiBCcmFpdGh3 YWl0ZSAgPGplbm5iQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgUHJvZ3Jlc3NUcmFja2VyIHdoZW4gbW92aW5nIGEg ZnJhbWUgYmV0d2VlbiBkb2N1bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ4MzY4CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBhbmRlcnNjYSBp bmZvcm1zIG1lIGl0J3Mgbm90IHBvc3NpYmxlIHRvIHRlc3QKKyAgICAgICAgUHJvZ3Jlc3NUcmFj a2VyIGNoYW5nZXMgdmlhIGxheW91dHRlc3RzLiBSZXZpZXcgZXh0cmEgY2FyZWZ1bGx5Li4uCisK KyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnRMb2FkZXI6OnRyYW5zZmVyTG9hZGluZ1Jlc291cmNlc0Zyb21QYWdlKToKKyAgICAg ICAgQ2hhbmdlZCB0byB1c2UgRnJhbWVMb2FkZXIgdG8gZGVsaXZlciB0aGUgbm90aWZpY2F0aW9u IHRvIHRoZQorICAgICAgICBjbGllbnQgdmlhIHRoZSBub3RpZmllci4KKyAgICAgICAgKiBsb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6O3RyYW5z ZmVyTG9hZGluZ1Jlc291cmNlc0Zyb21QYWdlKToKKyAgICAgICAgVXBkYXRlIG9sZCBhbmQgbmV3 IHByb2dyZXNzIHRyYWNrZXIgYWJvdXQgZnJhbWUgcHJvZ3Jlc3MuCisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKToK KyAgICAgICAgQWRkZWQgdG8gcm91dGUgbm90aWZpY2F0aW9uIHZpYSB0aGUgbm90aWZpZXIuCisg ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL1Byb2dyZXNz VHJhY2tlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNrZXI6OmNvbXBsZXRl UHJvZ3Jlc3MpOgorICAgICAgICBDb21tZW50IGNoYW5nZSBvbmx5LgorICAgICAgICAqIGxvYWRl ci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxv YWROb3RpZmllcjo6ZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKToKKyAg ICAgICAgQWRkZWQgdG8gcHJvdmlkZSBvbmUgcGxhY2UgdG8gbm90aWZ5IGNsaWVudCBhbmQgcHJv Z3Jlc3MgdHJhY2tlciAtCisgICAgICAgIGFuZCBwcm9iYWJseSBpbnNwZWN0b3IgY29udHJvbGxl ciAoc2VwYXJhdGUgcGF0Y2gpLgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWROb3RpZmll ci5oOgorCiAyMDEwLTExLTAyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gRm9sbG93IHVwIHRvIHI3MTEzOTogcmVtb3Zpbmcg dW51c2VkIGltYWdlcy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcCBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCAzMGI4MGViLi4x YmMzODIwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysr IGIvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC03OTEsMTAgKzc5MSwxMiBA QCB2b2lkIERvY3VtZW50TG9hZGVyOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZXNGcm9tUGFnZShQ YWdlKiBvbGRQYWdlKQogewogICAgIEFTU0VSVChvbGRQYWdlICE9IG1fZnJhbWUtPnBhZ2UoKSk7 CiAKLSAgICBGcmFtZUxvYWRlckNsaWVudCogZnJhbWVMb2FkZXJDbGllbnQgPSBmcmFtZUxvYWRl cigpLT5jbGllbnQoKTsKKyAgICBGcmFtZUxvYWRlciogbG9hZGVyID0gZnJhbWVMb2FkZXIoKTsK KyAgICBBU1NFUlQobG9hZGVyKTsKKwogICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCA9IG9yaWdpbmFsUmVxdWVzdCgpOwogICAgIGlmIChpc0xvYWRpbmdNYWluUmVzb3VyY2UoKSkg ewotICAgICAgICBmcmFtZUxvYWRlckNsaWVudC0+dHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VGcm9t UGFnZSgKKyAgICAgICAgbG9hZGVyLT5kaXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJv bVBhZ2UoCiAgICAgICAgICAgICBtX21haW5SZXNvdXJjZUxvYWRlci0+aWRlbnRpZmllcigpLCB0 aGlzLCByZXF1ZXN0LCBvbGRQYWdlKTsKICAgICB9CiAKQEAgLTgwMiw3ICs4MDQsNyBAQCB2b2lk IERvY3VtZW50TG9hZGVyOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZXNGcm9tUGFnZShQYWdlKiBv bGRQYWdlKQogICAgICAgICBSZXNvdXJjZUxvYWRlclNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBt X3N1YnJlc291cmNlTG9hZGVycy5iZWdpbigpOwogICAgICAgICBSZXNvdXJjZUxvYWRlclNldDo6 Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9zdWJyZXNvdXJjZUxvYWRlcnMuZW5kKCk7CiAgICAgICAg IGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgICAgIGZyYW1lTG9hZGVyQ2xpZW50 LT50cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKAorICAgICAgICAgICAgbG9hZGVyLT5k aXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UoCiAgICAgICAgICAgICAgICAg KCppdCktPmlkZW50aWZpZXIoKSwgdGhpcywgcmVxdWVzdCwgb2xkUGFnZSk7CiAgICAgICAgIH0K ICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggYjkwYjE4Yy4uZDA4YTM3ZCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcApAQCAtMTc0OCw4ICsxNzQ4LDE3IEBAIGJvb2wgRnJhbWVMb2FkZXI6 OmZyYW1lSGFzTG9hZGVkKCkgY29uc3QKIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5zZmVyTG9hZGlu Z1Jlc291cmNlc0Zyb21QYWdlKFBhZ2UqIG9sZFBhZ2UpCiB7CiAgICAgQVNTRVJUKG9sZFBhZ2Ug IT0gbV9mcmFtZS0+cGFnZSgpKTsKLSAgICBpZiAoaXNMb2FkaW5nKCkpCisgICAgaWYgKGlzTG9h ZGluZygpKSB7CiAgICAgICAgIGFjdGl2ZURvY3VtZW50TG9hZGVyKCktPnRyYW5zZmVyTG9hZGlu Z1Jlc291cmNlc0Zyb21QYWdlKG9sZFBhZ2UpOworICAgICAgICBvbGRQYWdlLT5wcm9ncmVzcygp LT5wcm9ncmVzc0NvbXBsZXRlZChtX2ZyYW1lKTsKKyAgICAgICAgaWYgKG1fZnJhbWUtPnBhZ2Uo KSkKKyAgICAgICAgICAgIG1fZnJhbWUtPnBhZ2UoKS0+cHJvZ3Jlc3MoKS0+cHJvZ3Jlc3NTdGFy dGVkKG1fZnJhbWUpOworICAgIH0KK30KKwordm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hUcmFu c2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9j dW1lbnRMb2FkZXIqIGRvY0xvYWRlciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBQ YWdlKiBvbGRQYWdlKQoreworICAgIG5vdGlmaWVyKCktPmRpc3BhdGNoVHJhbnNmZXJMb2FkaW5n UmVzb3VyY2VGcm9tUGFnZShpZGVudGlmaWVyLCBkb2NMb2FkZXIsIHJlcXVlc3QsIG9sZFBhZ2Up OwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpzZXREb2N1bWVudExvYWRlcihEb2N1bWVudExvYWRl ciogbG9hZGVyKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggNTdiYTA3YS4uOWViZWYyOSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5oCkBAIC0xMzQsNiArMTM0LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNMb2Fk aW5nKCkgY29uc3Q7CiAgICAgYm9vbCBmcmFtZUhhc0xvYWRlZCgpIGNvbnN0OwogICAgIHZvaWQg dHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VzRnJvbVBhZ2UoUGFnZSopOworICAgIHZvaWQgZGlzcGF0 Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcsIERvY3VtZW50 TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUGFnZSopOwogCiAgICAgaW50IG51bVBl bmRpbmdPckxvYWRpbmdSZXF1ZXN0cyhib29sIHJlY3Vyc2UpIGNvbnN0OwogICAgIFN0cmluZyBy ZWZlcnJlcigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFj a2VyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5jcHAKaW5kZXggNTYxZTZi Yy4uZTU2MWYwMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNw cAorKysgYi9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwCkBAIC0yNDEsNyArMjQx LDcgQEAgdm9pZCBQcm9ncmVzc1RyYWNrZXI6OmNvbXBsZXRlUHJvZ3Jlc3ModW5zaWduZWQgbG9u ZyBpZGVudGlmaWVyKQogewogICAgIFByb2dyZXNzSXRlbSogaXRlbSA9IG1fcHJvZ3Jlc3NJdGVt cy5nZXQoaWRlbnRpZmllcik7CiAgICAgCi0gICAgLy8gRklYTUU6IENhbiB0aGlzIGhhcHBlbj8K KyAgICAvLyBUaGlzIGNhbiBoYXBwZW4gaWYgYSBsb2FkIGZhaWxzIHdpdGhvdXQgcmVjZWl2aW5n IGFueSByZXNwb25zZSBkYXRhLgogICAgIGlmICghaXRlbSkKICAgICAgICAgcmV0dXJuOwogICAg IApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwIGIv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwCmluZGV4IGIzMmI3MzcuLjAy MzE0MTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNw cAorKysgYi9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHAKQEAgLTE2MCw2 ICsxNjAsMTMgQEAgdm9pZCBSZXNvdXJjZUxvYWROb3RpZmllcjo6ZGlzcGF0Y2hEaWRGaW5pc2hM b2FkaW5nKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIHVuc2kKICNlbmRpZgogfQogCit2b2lkIFJl c291cmNlTG9hZE5vdGlmaWVyOjpkaXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBh Z2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFBhZ2UqIG9sZFBhZ2UpCit7CisgICAgbV9mcmFt ZS0+bG9hZGVyKCktPmNsaWVudCgpLT50cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKGlk ZW50aWZpZXIsIGxvYWRlciwgcmVxdWVzdCwgb2xkUGFnZSk7CisKKyAgICBvbGRQYWdlLT5wcm9n cmVzcygpLT5jb21wbGV0ZVByb2dyZXNzKGlkZW50aWZpZXIpOworfQorCiB2b2lkIFJlc291cmNl TG9hZE5vdGlmaWVyOjpzZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhEb2N1bWVudExvYWRl ciogbG9hZGVyLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlLCBpbnQgbGVuZ3RoLCBjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsK ICAgICBpZiAoIXJlc3BvbnNlLmlzTnVsbCgpKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkTm90aWZpZXIuaCBiL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlm aWVyLmgKaW5kZXggOTNmY2NjYy4uMmYxMDg1NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkTm90aWZpZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRO b3RpZmllci5oCkBAIC0zNyw2ICszNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOwogY2xhc3MgRG9jdW1lbnRMb2FkZXI7CiBjbGFzcyBGcmFt ZTsKK2NsYXNzIFBhZ2U7CiBjbGFzcyBSZXNvdXJjZUVycm9yOwogY2xhc3MgUmVzb3VyY2VMb2Fk ZXI7CiBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwpAQCAtNjAsNiArNjEsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBkaXNwYXRjaERpZFJlY2VpdmVSZXNwb25zZShEb2N1bWVudExvYWRlciosIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHZvaWQg ZGlzcGF0Y2hEaWRSZWNlaXZlQ29udGVudExlbmd0aChEb2N1bWVudExvYWRlciosIHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllciwgaW50IGxlbmd0aCk7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZpbmlz aExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGRvdWJs ZSBmaW5pc2hUaW1lKTsKKyAgICB2b2lkIGRpc3BhdGNoVHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VG cm9tUGFnZSh1bnNpZ25lZCBsb25nLCBEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVx dWVzdCYsIFBhZ2UqKTsKIAogICAgIHZvaWQgc2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMo RG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmLCBpbnQgbGVuZ3RoLCBjb25zdCBSZXNvdXJjZUVycm9yJik7CiAK 72987 2010-11-04 15:08:39 -0700 2010-11-09 05:01:30 -0800 updated patch - added assert patch48368-3.txt text/plain 6758 jennb ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGEwOTg2NS4uYjcwMThhMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMC0xMS0wMiAgSmVubiBCcmFpdGh3 YWl0ZSAgPGplbm5iQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgUHJvZ3Jlc3NUcmFja2VyIHdoZW4gbW92aW5nIGEg ZnJhbWUgYmV0d2VlbiBkb2N1bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ4MzY4CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBhbmRlcnNjYSBp bmZvcm1zIG1lIGl0J3Mgbm90IHBvc3NpYmxlIHRvIHRlc3QKKyAgICAgICAgUHJvZ3Jlc3NUcmFj a2VyIGNoYW5nZXMgdmlhIGxheW91dHRlc3RzLiBSZXZpZXcgZXh0cmEgY2FyZWZ1bGx5Li4uCisK KyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnRMb2FkZXI6OnRyYW5zZmVyTG9hZGluZ1Jlc291cmNlc0Zyb21QYWdlKToKKyAgICAg ICAgQ2hhbmdlZCB0byB1c2UgRnJhbWVMb2FkZXIgdG8gZGVsaXZlciB0aGUgbm90aWZpY2F0aW9u IHRvIHRoZQorICAgICAgICBjbGllbnQgdmlhIHRoZSBub3RpZmllci4KKyAgICAgICAgKiBsb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6O3RyYW5z ZmVyTG9hZGluZ1Jlc291cmNlc0Zyb21QYWdlKToKKyAgICAgICAgVXBkYXRlIG9sZCBhbmQgbmV3 IHByb2dyZXNzIHRyYWNrZXIgYWJvdXQgZnJhbWUgcHJvZ3Jlc3MuCisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKToK KyAgICAgICAgQWRkZWQgdG8gcm91dGUgbm90aWZpY2F0aW9uIHZpYSB0aGUgbm90aWZpZXIuCisg ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL1Byb2dyZXNz VHJhY2tlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNrZXI6OmNvbXBsZXRl UHJvZ3Jlc3MpOgorICAgICAgICBDb21tZW50IGNoYW5nZSBvbmx5LgorICAgICAgICAqIGxvYWRl ci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxv YWROb3RpZmllcjo6ZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKToKKyAg ICAgICAgQWRkZWQgdG8gcHJvdmlkZSBvbmUgcGxhY2UgdG8gbm90aWZ5IGNsaWVudCBhbmQgcHJv Z3Jlc3MgdHJhY2tlciAtCisgICAgICAgIGFuZCBwcm9iYWJseSBpbnNwZWN0b3IgY29udHJvbGxl ciAoc2VwYXJhdGUgcGF0Y2gpLgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWROb3RpZmll ci5oOgorCiAyMDEwLTExLTAyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gRm9sbG93IHVwIHRvIHI3MTEzOTogcmVtb3Zpbmcg dW51c2VkIGltYWdlcy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcCBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCAzMGI4MGViLi4x YmMzODIwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysr IGIvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC03OTEsMTAgKzc5MSwxMiBA QCB2b2lkIERvY3VtZW50TG9hZGVyOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZXNGcm9tUGFnZShQ YWdlKiBvbGRQYWdlKQogewogICAgIEFTU0VSVChvbGRQYWdlICE9IG1fZnJhbWUtPnBhZ2UoKSk7 CiAKLSAgICBGcmFtZUxvYWRlckNsaWVudCogZnJhbWVMb2FkZXJDbGllbnQgPSBmcmFtZUxvYWRl cigpLT5jbGllbnQoKTsKKyAgICBGcmFtZUxvYWRlciogbG9hZGVyID0gZnJhbWVMb2FkZXIoKTsK KyAgICBBU1NFUlQobG9hZGVyKTsKKwogICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCA9IG9yaWdpbmFsUmVxdWVzdCgpOwogICAgIGlmIChpc0xvYWRpbmdNYWluUmVzb3VyY2UoKSkg ewotICAgICAgICBmcmFtZUxvYWRlckNsaWVudC0+dHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VGcm9t UGFnZSgKKyAgICAgICAgbG9hZGVyLT5kaXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJv bVBhZ2UoCiAgICAgICAgICAgICBtX21haW5SZXNvdXJjZUxvYWRlci0+aWRlbnRpZmllcigpLCB0 aGlzLCByZXF1ZXN0LCBvbGRQYWdlKTsKICAgICB9CiAKQEAgLTgwMiw3ICs4MDQsNyBAQCB2b2lk IERvY3VtZW50TG9hZGVyOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZXNGcm9tUGFnZShQYWdlKiBv bGRQYWdlKQogICAgICAgICBSZXNvdXJjZUxvYWRlclNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBt X3N1YnJlc291cmNlTG9hZGVycy5iZWdpbigpOwogICAgICAgICBSZXNvdXJjZUxvYWRlclNldDo6 Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9zdWJyZXNvdXJjZUxvYWRlcnMuZW5kKCk7CiAgICAgICAg IGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgICAgIGZyYW1lTG9hZGVyQ2xpZW50 LT50cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKAorICAgICAgICAgICAgbG9hZGVyLT5k aXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UoCiAgICAgICAgICAgICAgICAg KCppdCktPmlkZW50aWZpZXIoKSwgdGhpcywgcmVxdWVzdCwgb2xkUGFnZSk7CiAgICAgICAgIH0K ICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggYjkwYjE4Yy4uZDA4YTM3ZCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcApAQCAtMTc0OCw4ICsxNzQ4LDE3IEBAIGJvb2wgRnJhbWVMb2FkZXI6 OmZyYW1lSGFzTG9hZGVkKCkgY29uc3QKIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5zZmVyTG9hZGlu Z1Jlc291cmNlc0Zyb21QYWdlKFBhZ2UqIG9sZFBhZ2UpCiB7CiAgICAgQVNTRVJUKG9sZFBhZ2Ug IT0gbV9mcmFtZS0+cGFnZSgpKTsKLSAgICBpZiAoaXNMb2FkaW5nKCkpCisgICAgaWYgKGlzTG9h ZGluZygpKSB7CiAgICAgICAgIGFjdGl2ZURvY3VtZW50TG9hZGVyKCktPnRyYW5zZmVyTG9hZGlu Z1Jlc291cmNlc0Zyb21QYWdlKG9sZFBhZ2UpOworICAgICAgICBvbGRQYWdlLT5wcm9ncmVzcygp LT5wcm9ncmVzc0NvbXBsZXRlZChtX2ZyYW1lKTsKKyAgICAgICAgaWYgKG1fZnJhbWUtPnBhZ2Uo KSkKKyAgICAgICAgICAgIG1fZnJhbWUtPnBhZ2UoKS0+cHJvZ3Jlc3MoKS0+cHJvZ3Jlc3NTdGFy dGVkKG1fZnJhbWUpOworICAgIH0KK30KKwordm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hUcmFu c2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9j dW1lbnRMb2FkZXIqIGRvY0xvYWRlciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBQ YWdlKiBvbGRQYWdlKQoreworICAgIG5vdGlmaWVyKCktPmRpc3BhdGNoVHJhbnNmZXJMb2FkaW5n UmVzb3VyY2VGcm9tUGFnZShpZGVudGlmaWVyLCBkb2NMb2FkZXIsIHJlcXVlc3QsIG9sZFBhZ2Up OwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpzZXREb2N1bWVudExvYWRlcihEb2N1bWVudExvYWRl ciogbG9hZGVyKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggNTdiYTA3YS4uOWViZWYyOSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5oCkBAIC0xMzQsNiArMTM0LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNMb2Fk aW5nKCkgY29uc3Q7CiAgICAgYm9vbCBmcmFtZUhhc0xvYWRlZCgpIGNvbnN0OwogICAgIHZvaWQg dHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VzRnJvbVBhZ2UoUGFnZSopOworICAgIHZvaWQgZGlzcGF0 Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcsIERvY3VtZW50 TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUGFnZSopOwogCiAgICAgaW50IG51bVBl bmRpbmdPckxvYWRpbmdSZXF1ZXN0cyhib29sIHJlY3Vyc2UpIGNvbnN0OwogICAgIFN0cmluZyBy ZWZlcnJlcigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFj a2VyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5jcHAKaW5kZXggNTYxZTZi Yy4uZTU2MWYwMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNw cAorKysgYi9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwCkBAIC0yNDEsNyArMjQx LDcgQEAgdm9pZCBQcm9ncmVzc1RyYWNrZXI6OmNvbXBsZXRlUHJvZ3Jlc3ModW5zaWduZWQgbG9u ZyBpZGVudGlmaWVyKQogewogICAgIFByb2dyZXNzSXRlbSogaXRlbSA9IG1fcHJvZ3Jlc3NJdGVt cy5nZXQoaWRlbnRpZmllcik7CiAgICAgCi0gICAgLy8gRklYTUU6IENhbiB0aGlzIGhhcHBlbj8K KyAgICAvLyBUaGlzIGNhbiBoYXBwZW4gaWYgYSBsb2FkIGZhaWxzIHdpdGhvdXQgcmVjZWl2aW5n IGFueSByZXNwb25zZSBkYXRhLgogICAgIGlmICghaXRlbSkKICAgICAgICAgcmV0dXJuOwogICAg IApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwIGIv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwCmluZGV4IGIzMmI3MzcuLmQw MDJlZjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNw cAorKysgYi9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHAKQEAgLTE2MCw2 ICsxNjAsMTQgQEAgdm9pZCBSZXNvdXJjZUxvYWROb3RpZmllcjo6ZGlzcGF0Y2hEaWRGaW5pc2hM b2FkaW5nKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIHVuc2kKICNlbmRpZgogfQogCit2b2lkIFJl c291cmNlTG9hZE5vdGlmaWVyOjpkaXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBh Z2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFBhZ2UqIG9sZFBhZ2UpCit7CisgICAgQVNTRVJU KG9sZFBhZ2UgIT0gbV9mcmFtZS0+cGFnZSgpKTsKKyAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xp ZW50KCktPnRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UoaWRlbnRpZmllciwgbG9hZGVy LCByZXF1ZXN0LCBvbGRQYWdlKTsKKworICAgIG9sZFBhZ2UtPnByb2dyZXNzKCktPmNvbXBsZXRl UHJvZ3Jlc3MoaWRlbnRpZmllcik7Cit9CisKIHZvaWQgUmVzb3VyY2VMb2FkTm90aWZpZXI6OnNl bmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGlu dCBsZW5ndGgsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogewogICAgIGlmICghcmVzcG9u c2UuaXNOdWxsKCkpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3Rp Zmllci5oIGIvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuaAppbmRleCA5M2Zj Y2NjLi4yZjEwODU2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3Rp Zmllci5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmgKQEAgLTM3 LDYgKzM3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQXV0aGVudGljYXRpb25DaGFs bGVuZ2U7CiBjbGFzcyBEb2N1bWVudExvYWRlcjsKIGNsYXNzIEZyYW1lOworY2xhc3MgUGFnZTsK IGNsYXNzIFJlc291cmNlRXJyb3I7CiBjbGFzcyBSZXNvdXJjZUxvYWRlcjsKIGNsYXNzIFJlc291 cmNlUmVzcG9uc2U7CkBAIC02MCw2ICs2MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc3BhdGNo RGlkUmVjZWl2ZVJlc3BvbnNlKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgdm9pZCBkaXNwYXRjaERpZFJlY2Vp dmVDb250ZW50TGVuZ3RoKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBpbnQgbGVuZ3RoKTsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmluaXNoTG9hZGluZyhEb2N1bWVu dExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgZG91YmxlIGZpbmlzaFRpbWUpOwor ICAgIHZvaWQgZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVk IGxvbmcsIERvY3VtZW50TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUGFnZSopOwog CiAgICAgdm9pZCBzZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhEb2N1bWVudExvYWRlcios IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIGludCBs ZW5ndGgsIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKIAo=