31310 2009-11-10 13:39:57 -0800 Fix back/forwards cache with JSC isolated worlds. 2009-11-10 14:22:20 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 162197 0 barraclough 2009-11-10 13:39:57 -0800 <rdar://problem/7328111> Cached back navigation doesn't restore global object in extension isolated world 162199 1 42891 barraclough 2009-11-10 13:54:41 -0800 Created attachment 42891 The patch 162209 2 42891 ggaren 2009-11-10 14:18:24 -0800 Comment on attachment 42891 The patch r=me I think it would be good to move away from weak pointers to worlds in the future. Objects that point to worlds should just ref them. 162219 3 barraclough 2009-11-10 14:22:20 -0800 Sending WebCore/ChangeLog Sending WebCore/bindings/js/JSDOMBinding.cpp Sending WebCore/bindings/js/JSDOMBinding.h Sending WebCore/bindings/js/ScriptCachedFrameData.cpp Sending WebCore/bindings/js/ScriptCachedFrameData.h Sending WebCore/bindings/js/ScriptController.h Transmitting file data ...... Committed revision 50767. 42891 2009-11-10 13:54:41 -0800 2009-11-10 14:18:24 -0800 The patch patch.backfor.txt text/plain 9238 barraclough SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDc1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMTEtMTAgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91 Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEZpeCBiYWNrL2ZvcndhcmRzIGNhY2hlIHdpdGggSlNDIGlzb2xhdGVkIHdvcmxkcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMzEwCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MzI4MTExPiBDYWNoZWQgYmFjayBuYXZpZ2F0aW9uIGRv ZXNuJ3QgcmVzdG9yZSBnbG9iYWwgb2JqZWN0IGluIGV4dGVuc2lvbiBpc29sYXRlZCB3b3JsZAor CisgICAgICAgIFN0b3JlIHRoZSBnbG9iYWwgb2JqZWN0IGZvciBhbGwgd29ybGRzLCBub3QganVz dCB0aGUgbm9ybWFsIHdvcmxkLgorICAgICAgICBBbHNvIG1haW50YWluIGJpZGlyZWN0aW9uYWwg d2VhayByZWZlcmVuY2VzIGJldHdlZW4gdGhlIFNjcmlwdENhY2hlZEZyYW1lRGF0YSBhbmQgdGhl IERPTVdyYXBwZXJXb3JsZCwKKyAgICAgICAgc28gd2UgY2FuIGZvcmdldCBnbG9iYWwgb2JqZWN0 cyBpZiBhIHdvcmxkIGdvZXMgYXdheS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NQmlu ZGluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XcmFwcGVyV29ybGQ6On5ET01XcmFwcGVy V29ybGQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oOgorICAgICAgICAo V2ViQ29yZTo6RE9NV3JhcHBlcldvcmxkOjpyZW1lbWJlclNjcmlwdENhY2hlZEZyYW1lRGF0YSk6 CisgICAgICAgIChXZWJDb3JlOjpET01XcmFwcGVyV29ybGQ6OmZvcmdldFNjcmlwdENhY2hlZEZy YW1lRGF0YSk6CisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q2FjaGVkRnJhbWVEYXRhLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENhY2hlZEZyYW1lRGF0YTo6U2NyaXB0Q2FjaGVk RnJhbWVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENhY2hlZEZyYW1lRGF0YTo6Zm9y Z2V0V29ybGQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q2FjaGVkRnJhbWVEYXRhOjpkb21X aW5kb3cpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q2FjaGVkRnJhbWVEYXRhOjpyZXN0b3Jl KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENhY2hlZEZyYW1lRGF0YTo6Y2xlYXIpOgorICAg ICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENhY2hlZEZyYW1lRGF0YS5oOgorICAgICAgICAqIGJp bmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuaDoKKwogMjAwOS0xMS0xMCAgS2Vpc2hpIEhhdHRv cmkgIDxjYXNleS5oYXR0b3JpQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1v dGh5IEhhdGNoZXIuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3BwCShyZXZp c2lvbiA1MDc1OSkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBAQAogI2luY2x1ZGUgIktVUkwuaCIKICNpbmNsdWRl ICJNZXNzYWdlUG9ydC5oIgogI2luY2x1ZGUgIlJhbmdlRXhjZXB0aW9uLmgiCisjaW5jbHVkZSAi U2NyaXB0Q2FjaGVkRnJhbWVEYXRhLmgiCiAjaW5jbHVkZSAiU2NyaXB0Q29udHJvbGxlci5oIgog I2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiWE1MSHR0cFJlcXVlc3RFeGNlcHRpb24u aCIKQEAgLTE2OSw2ICsxNzAsOCBAQCBET01XcmFwcGVyV29ybGQ6On5ET01XcmFwcGVyV29ybGQo KQogICAgICAgICBmb3JnZXRXb3JsZE9mRE9NTm9kZXNGb3JEb2N1bWVudCgqaXRlciwgdGhpcyk7 CiAgICAgZm9yIChIYXNoU2V0PFNjcmlwdENvbnRyb2xsZXIqPjo6aXRlcmF0b3IgaXRlciA9IHNj cmlwdENvbnRyb2xsZXJzV2l0aFNoZWxscy5iZWdpbigpOyBpdGVyICE9IHNjcmlwdENvbnRyb2xs ZXJzV2l0aFNoZWxscy5lbmQoKTsgKytpdGVyKQogICAgICAgICAoKml0ZXIpLT5mb3JnZXRXb3Js ZCh0aGlzKTsKKyAgICBmb3IgKEhhc2hTZXQ8U2NyaXB0Q2FjaGVkRnJhbWVEYXRhKj46Oml0ZXJh dG9yIGl0ZXIgPSBiYWNrRm9yd2FyZENhY2hlc1dpdGhTaGVsbHMuYmVnaW4oKTsgaXRlciAhPSBi YWNrRm9yd2FyZENhY2hlc1dpdGhTaGVsbHMuZW5kKCk7ICsraXRlcikKKyAgICAgICAgKCppdGVy KS0+Zm9yZ2V0V29ybGQodGhpcyk7CiB9CiAKIEVudGVyRE9NV3JhcHBlcldvcmxkOjpFbnRlckRP TVdyYXBwZXJXb3JsZChKU0M6OkpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSwgRE9NV3JhcHBlcldv cmxkKiBpc29sYXRlZFdvcmxkKQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRp bmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCShy ZXZpc2lvbiA1MDc1OSkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmgJKHdv cmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNs YXNzIE5vZGU7CiAgICAgY2xhc3MgU3RyaW5nOwogICAgIGNsYXNzIFNjcmlwdENvbnRyb2xsZXI7 CisgICAgY2xhc3MgU2NyaXB0Q2FjaGVkRnJhbWVEYXRhOwogCiAgICAgdHlwZWRlZiBpbnQgRXhj ZXB0aW9uQ29kZTsKIApAQCAtMTQ5LDYgKzE1MCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgdm9pZCBmb3JnZXREb2N1bWVudChEb2N1bWVudCogZG9jdW1lbnQpIHsgZG9jdW1lbnRz V2l0aFdyYXBwZXJzLnJlbW92ZShkb2N1bWVudCk7IH0KICAgICAgICAgdm9pZCByZW1lbWJlclNj cmlwdENvbnRyb2xsZXIoU2NyaXB0Q29udHJvbGxlciogc2NyaXB0Q29udHJvbGxlcikgeyBzY3Jp cHRDb250cm9sbGVyc1dpdGhTaGVsbHMuYWRkKHNjcmlwdENvbnRyb2xsZXIpOyB9CiAgICAgICAg IHZvaWQgZm9yZ2V0U2NyaXB0Q29udHJvbGxlcihTY3JpcHRDb250cm9sbGVyKiBzY3JpcHRDb250 cm9sbGVyKSB7IHNjcmlwdENvbnRyb2xsZXJzV2l0aFNoZWxscy5yZW1vdmUoc2NyaXB0Q29udHJv bGxlcik7IH0KKyAgICAgICAgdm9pZCByZW1lbWJlclNjcmlwdENhY2hlZEZyYW1lRGF0YShTY3Jp cHRDYWNoZWRGcmFtZURhdGEqIGJhY2tGb3J3YXJkQ2FjaGUpIHsgYmFja0ZvcndhcmRDYWNoZXNX aXRoU2hlbGxzLmFkZChiYWNrRm9yd2FyZENhY2hlKTsgfQorICAgICAgICB2b2lkIGZvcmdldFNj cmlwdENhY2hlZEZyYW1lRGF0YShTY3JpcHRDYWNoZWRGcmFtZURhdGEqIGJhY2tGb3J3YXJkQ2Fj aGUpIHsgYmFja0ZvcndhcmRDYWNoZXNXaXRoU2hlbGxzLnJlbW92ZShiYWNrRm9yd2FyZENhY2hl KTsgfQogCiAgICAgICAgIC8vIEZJWE1FOiBjYW4gd2UgbWFrZSB0aGlzIHByaXZhdGU/CiAgICAg ICAgIERPTU9iamVjdFdyYXBwZXJNYXAgbV93cmFwcGVyczsKQEAgLTE1Nyw2ICsxNjAsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEpTQzo6SlNHbG9iYWxEYXRhKiBtX2dsb2JhbERh dGE7CiAgICAgICAgIEhhc2hTZXQ8RG9jdW1lbnQqPiBkb2N1bWVudHNXaXRoV3JhcHBlcnM7CiAg ICAgICAgIEhhc2hTZXQ8U2NyaXB0Q29udHJvbGxlcio+IHNjcmlwdENvbnRyb2xsZXJzV2l0aFNo ZWxsczsKKyAgICAgICAgSGFzaFNldDxTY3JpcHRDYWNoZWRGcmFtZURhdGEqPiBiYWNrRm9yd2Fy ZENhY2hlc1dpdGhTaGVsbHM7CiAgICAgfTsKIAogICAgIC8vIE1hcCBmcm9tIHN0YXRpYyBIYXNo VGFibGUgaW5zdGFuY2VzIHRvIHBlci1HbG9iYWxEYXRhIG9uZXMuCkluZGV4OiBXZWJDb3JlL2Jp bmRpbmdzL2pzL1NjcmlwdENhY2hlZEZyYW1lRGF0YS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9iaW5kaW5ncy9qcy9TY3JpcHRDYWNoZWRGcmFtZURhdGEuY3BwCShyZXZpc2lvbiA1MDc1OSkK KysrIFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q2FjaGVkRnJhbWVEYXRhLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDQsMTkgKzQ0LDM1IEBAIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIFNjcmlwdENhY2hlZEZyYW1lRGF0YTo6U2NyaXB0Q2FjaGVkRnJhbWVE YXRhKEZyYW1lKiBmcmFtZSkKKyAgICA6IG1fZG9tV2luZG93KDApCiB7CiAgICAgSlNMb2NrIGxv Y2soU2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKIAogICAgIFNjcmlwdENvbnRyb2xsZXIqIHNjcmlw dENvbnRyb2xsZXIgPSBmcmFtZS0+c2NyaXB0KCk7Ci0gICAgLy8gRklYTUU6IGV4cGxpY2l0bHkg c2F2ZSBhbmQgcmVzdG9yZSBpc29sYXRlZCB3b3JsZHMnIGdsb2JhbCBvYmplY3RzIHdoZW4gdXNp bmcgdGhlIGJhY2svZm9yd2FyZCBjYWNoZS4gPHJkYXI6Ly9wcm9ibGVtLzczMjgxMTE+Ci0gICAg aWYgKEpTRE9NV2luZG93U2hlbGwqIHdpbmRvd1NoZWxsID0gc2NyaXB0Q29udHJvbGxlci0+ZXhp c3RpbmdXaW5kb3dTaGVsbChtYWluVGhyZWFkTm9ybWFsV29ybGQoKSkpIHsKLSAgICAgICAgbV93 aW5kb3cgPSB3aW5kb3dTaGVsbC0+d2luZG93KCk7Ci0gICAgICAgIHNjcmlwdENvbnRyb2xsZXIt PmF0dGFjaERlYnVnZ2VyKDApOworICAgIFNjcmlwdENvbnRyb2xsZXI6OlNoZWxsTWFwJiB3aW5k b3dTaGVsbHMgPSBzY3JpcHRDb250cm9sbGVyLT5tX3dpbmRvd1NoZWxsczsKKworICAgIFNjcmlw dENvbnRyb2xsZXI6OlNoZWxsTWFwOjppdGVyYXRvciB3aW5kb3dTaGVsbHNFbmQgPSB3aW5kb3dT aGVsbHMuZW5kKCk7CisgICAgZm9yIChTY3JpcHRDb250cm9sbGVyOjpTaGVsbE1hcDo6aXRlcmF0 b3IgaXRlciA9IHdpbmRvd1NoZWxscy5iZWdpbigpOyBpdGVyICE9IHdpbmRvd1NoZWxsc0VuZDsg KytpdGVyKSB7CisgICAgICAgIERPTVdyYXBwZXJXb3JsZCogd29ybGQgPSBpdGVyLT5maXJzdDsK KyAgICAgICAgSlNET01XaW5kb3cqIHdpbmRvdyA9IGl0ZXItPnNlY29uZC0+d2luZG93KCk7Cisg ICAgICAgIAorICAgICAgICB3b3JsZC0+cmVtZW1iZXJTY3JpcHRDYWNoZWRGcmFtZURhdGEodGhp cyk7CisgICAgICAgIG1fd2luZG93cy5hZGQod29ybGQsIHdpbmRvdyk7CisKKyAgICAgICAgbV9k b21XaW5kb3cgPSB3aW5kb3ctPmltcGwoKTsKICAgICB9CisKKyAgICBzY3JpcHRDb250cm9sbGVy LT5hdHRhY2hEZWJ1Z2dlcigwKTsKIH0KIAotRE9NV2luZG93KiBTY3JpcHRDYWNoZWRGcmFtZURh dGE6OmRvbVdpbmRvdygpIGNvbnN0IHsKLSAgICByZXR1cm4gbV93aW5kb3cgPyBtX3dpbmRvdy0+ aW1wbCgpIDogMDsKK3ZvaWQgU2NyaXB0Q2FjaGVkRnJhbWVEYXRhOjpmb3JnZXRXb3JsZChET01X cmFwcGVyV29ybGQqIHdvcmxkKQoreworICAgIG1fd2luZG93cy5yZW1vdmUod29ybGQpOworfQor CitET01XaW5kb3cqIFNjcmlwdENhY2hlZEZyYW1lRGF0YTo6ZG9tV2luZG93KCkgY29uc3QKK3sK KyAgICByZXR1cm4gbV9kb21XaW5kb3c7CiB9CiAKIFNjcmlwdENhY2hlZEZyYW1lRGF0YTo6flNj cmlwdENhY2hlZEZyYW1lRGF0YSgpCkBAIC03MSwyNiArODcsMzkgQEAgdm9pZCBTY3JpcHRDYWNo ZWRGcmFtZURhdGE6OnJlc3RvcmUoRnJhbQogICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRp b25zT25seSk7CiAKICAgICBTY3JpcHRDb250cm9sbGVyKiBzY3JpcHRDb250cm9sbGVyID0gZnJh bWUtPnNjcmlwdCgpOwotICAgIC8vIEZJWE1FOiBleHBsaWNpdGx5IHNhdmUgYW5kIHJlc3RvcmUg aXNvbGF0ZWQgd29ybGRzJyBnbG9iYWwgb2JqZWN0cyB3aGVuIHVzaW5nIHRoZSBiYWNrL2Zvcndh cmQgY2FjaGUuIDxyZGFyOi8vcHJvYmxlbS83MzI4MTExPgotICAgIGlmIChKU0RPTVdpbmRvd1No ZWxsKiB3aW5kb3dTaGVsbCA9IHNjcmlwdENvbnRyb2xsZXItPmV4aXN0aW5nV2luZG93U2hlbGwo bWFpblRocmVhZE5vcm1hbFdvcmxkKCkpKSB7Ci0gICAgICAgIGlmIChtX3dpbmRvdykKLSAgICAg ICAgICAgIHdpbmRvd1NoZWxsLT5zZXRXaW5kb3cobV93aW5kb3cuZ2V0KCkpOworICAgIFNjcmlw dENvbnRyb2xsZXI6OlNoZWxsTWFwJiB3aW5kb3dTaGVsbHMgPSBzY3JpcHRDb250cm9sbGVyLT5t X3dpbmRvd1NoZWxsczsKKworICAgIFNjcmlwdENvbnRyb2xsZXI6OlNoZWxsTWFwOjppdGVyYXRv ciB3aW5kb3dTaGVsbHNFbmQgPSB3aW5kb3dTaGVsbHMuZW5kKCk7CisgICAgZm9yIChTY3JpcHRD b250cm9sbGVyOjpTaGVsbE1hcDo6aXRlcmF0b3IgaXRlciA9IHdpbmRvd1NoZWxscy5iZWdpbigp OyBpdGVyICE9IHdpbmRvd1NoZWxsc0VuZDsgKytpdGVyKSB7CisgICAgICAgIERPTVdyYXBwZXJX b3JsZCogd29ybGQgPSBpdGVyLT5maXJzdDsKKyAgICAgICAgSlNET01XaW5kb3dTaGVsbCogd2lu ZG93U2hlbGwgPSBpdGVyLT5zZWNvbmQuZ2V0KCk7CisKKyAgICAgICAgaWYgKEpTRE9NV2luZG93 KiB3aW5kb3cgPSBtX3dpbmRvd3MuZ2V0KHdvcmxkKSkKKyAgICAgICAgICAgIHdpbmRvd1NoZWxs LT5zZXRXaW5kb3cod2luZG93KTsKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICB3aW5kb3dT aGVsbC0+c2V0V2luZG93KGZyYW1lLT5kb21XaW5kb3coKSk7Ci0gICAgICAgICAgICBzY3JpcHRD b250cm9sbGVyLT5hdHRhY2hEZWJ1Z2dlcihwYWdlLT5kZWJ1Z2dlcigpKTsKLSAgICAgICAgICAg IHdpbmRvd1NoZWxsLT53aW5kb3coKS0+c2V0UHJvZmlsZUdyb3VwKHBhZ2UtPmdyb3VwKCkuaWRl bnRpZmllcigpKTsKKyAgICAgICAgICAgIGlmICh3b3JsZCA9PSBkZWJ1Z2dlcldvcmxkKCkpIHsK KyAgICAgICAgICAgICAgICBzY3JpcHRDb250cm9sbGVyLT5hdHRhY2hEZWJ1Z2dlcihwYWdlLT5k ZWJ1Z2dlcigpKTsKKyAgICAgICAgICAgICAgICB3aW5kb3dTaGVsbC0+d2luZG93KCktPnNldFBy b2ZpbGVHcm91cChwYWdlLT5ncm91cCgpLmlkZW50aWZpZXIoKSk7CisgICAgICAgICAgICB9CiAg ICAgICAgIH0KICAgICB9CiB9CiAKIHZvaWQgU2NyaXB0Q2FjaGVkRnJhbWVEYXRhOjpjbGVhcigp CiB7CisgICAgaWYgKG1fd2luZG93cy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKwogICAg IEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAKLSAgICBpZiAobV93aW5kb3cp IHsKLSAgICAgICAgbV93aW5kb3cgPSAwOwotICAgICAgICBnY0NvbnRyb2xsZXIoKS5nYXJiYWdl Q29sbGVjdFNvb24oKTsKKyAgICBmb3IgKEpTRE9NV2luZG93U2V0OjppdGVyYXRvciBpdGVyID0g bV93aW5kb3dzLmJlZ2luKCk7IGl0ZXIgIT0gbV93aW5kb3dzLmVuZCgpOyArK2l0ZXIpIHsKKyAg ICAgICAgRE9NV3JhcHBlcldvcmxkKiB3b3JsZCA9IGl0ZXItPmZpcnN0OworICAgICAgICB3b3Js ZC0+Zm9yZ2V0U2NyaXB0Q2FjaGVkRnJhbWVEYXRhKHRoaXMpOwogICAgIH0KKworICAgIG1fd2lu ZG93cy5jbGVhcigpOworICAgIGdjQ29udHJvbGxlcigpLmdhcmJhZ2VDb2xsZWN0U29vbigpOwog fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdENhY2hlZEZyYW1lRGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvanMv U2NyaXB0Q2FjaGVkRnJhbWVEYXRhLmgJKHJldmlzaW9uIDUwNzU5KQorKysgV2ViQ29yZS9iaW5k aW5ncy9qcy9TY3JpcHRDYWNoZWRGcmFtZURhdGEuaAkod29ya2luZyBjb3B5KQpAQCAtMzgsOCAr MzgsMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIEZyYW1lOwogICAgIGNsYXNz IEpTRE9NV2luZG93OwogICAgIGNsYXNzIERPTVdpbmRvdzsKKyAgICBjbGFzcyBET01XcmFwcGVy V29ybGQ7CiAKICAgICBjbGFzcyBTY3JpcHRDYWNoZWRGcmFtZURhdGEgIHsKKyAgICAgICAgdHlw ZWRlZiBIYXNoTWFwPERPTVdyYXBwZXJXb3JsZCosIEpTQzo6UHJvdGVjdGVkUHRyPEpTRE9NV2lu ZG93PiA+IEpTRE9NV2luZG93U2V0OworCiAgICAgcHVibGljOgogICAgICAgICBTY3JpcHRDYWNo ZWRGcmFtZURhdGEoRnJhbWUqKTsKICAgICAgICAgflNjcmlwdENhY2hlZEZyYW1lRGF0YSgpOwpA QCAtNDcsOSArNTAsMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHJlc3Rv cmUoRnJhbWUqKTsKICAgICAgICAgdm9pZCBjbGVhcigpOwogICAgICAgICBET01XaW5kb3cqIGRv bVdpbmRvdygpIGNvbnN0OworICAgICAgICB2b2lkIGZvcmdldFdvcmxkKERPTVdyYXBwZXJXb3Js ZCopOwogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgSlNDOjpQcm90ZWN0ZWRQdHI8SlNET01XaW5k b3c+IG1fd2luZG93OworICAgICAgICBKU0RPTVdpbmRvd1NldCBtX3dpbmRvd3M7CisgICAgICAg IERPTVdpbmRvdyogbV9kb21XaW5kb3c7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmgJKHJldmlzaW9uIDUw NzU5KQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTYzLDYgKzYzLDcgQEAgY2xhc3MgWFNTQXVkaXRvcjsKIHR5cGVkZWYgSGFzaE1h cDx2b2lkKiwgUmVmUHRyPEpTQzo6QmluZGluZ3M6OlJvb3RPYmplY3Q+ID4gUm9vdE9iamVjdE1h cDsKIAogY2xhc3MgU2NyaXB0Q29udHJvbGxlciB7CisgICAgZnJpZW5kIGNsYXNzIFNjcmlwdENh Y2hlZEZyYW1lRGF0YTsKICAgICB0eXBlZGVmIFdURjo6SGFzaE1hcDxET01XcmFwcGVyV29ybGQq LCBKU0M6OlByb3RlY3RlZFB0cjxKU0RPTVdpbmRvd1NoZWxsPiA+IFNoZWxsTWFwOwogCiBwdWJs aWM6Cg==