27645 2009-07-24 03:28:44 -0700 Fix the last of the x-frame constructor calls to have the right prototype chains 2009-07-24 12:01:28 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 27634 1 eric webkit-unassigned abarth oldest_to_newest 134491 0 eric 2009-07-24 03:28:44 -0700 Fix the last of the x-frame constructor calls to have the right prototype chains I also augmented the test to be able to support arguments (Worker requires an argument). 134495 1 33423 eric 2009-07-24 03:36:51 -0700 Created attachment 33423 patch 134608 2 33423 abarth 2009-07-24 11:33:43 -0700 Comment on attachment 33423 patch + // FIXME: Why do we use the lexical global object here? I believe this is correct. See step 14 of: http://www.whatwg.org/specs/web-workers/current-work/#creating-workers 14. Let docs be the list of relevant Document objects to add given the global scope of the script that invoked the constructor. The lexical global object is "the global scope of the script that invoked the constructor". 134615 3 eric 2009-07-24 12:01:28 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/fast/dom/constructed-objects-prototypes-expected.txt M LayoutTests/fast/dom/resources/constructed-objects-prototypes.js M WebCore/ChangeLog M WebCore/bindings/js/JSAudioConstructor.cpp M WebCore/bindings/js/JSImageConstructor.cpp M WebCore/bindings/js/JSMessageChannelConstructor.cpp M WebCore/bindings/js/JSOptionConstructor.cpp M WebCore/bindings/js/JSWebKitPointConstructor.cpp M WebCore/bindings/js/JSWorkerConstructor.cpp Committed r46368 M WebCore/ChangeLog M WebCore/bindings/js/JSWorkerConstructor.cpp M WebCore/bindings/js/JSWebKitPointConstructor.cpp M WebCore/bindings/js/JSOptionConstructor.cpp M WebCore/bindings/js/JSImageConstructor.cpp M WebCore/bindings/js/JSAudioConstructor.cpp M WebCore/bindings/js/JSMessageChannelConstructor.cpp M LayoutTests/ChangeLog M LayoutTests/fast/dom/constructed-objects-prototypes-expected.txt M LayoutTests/fast/dom/resources/constructed-objects-prototypes.js r46368 = 363dcbf1234c0cb5b8f2db7b4829bc075bb640c4 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46368 33423 2009-07-24 03:36:51 -0700 2009-07-24 11:33:43 -0700 patch bug-27645-20090724033650.patch text/plain 14038 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzMDQyZWMwLi45NWM3NWQ1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMDktMDct MjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCB0aGUgbGFzdCBvZiB0aGUgeC1mcmFtZSBj b25zdHJ1Y3RvciBjYWxscyB0byBoYXZlIHRoZSByaWdodCBwcm90b3R5cGUgY2hhaW5zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzY0NQorCisgICAg ICAgIEkgYWxzbyBoYWQgdG8gYWRkIHN1cHBvcnQgZm9yIHBhc3NpbmcgYXJndW1lbnRzIHRvIGNv bnN0cnVjdG9ycworICAgICAgICBpbiBvcmRlciB0byB0ZXN0IHRoZSBXb3JrZXIgY29uc3RydWN0 b3IuCisKKyAgICAgICAgKiBmYXN0L2RvbS9jb25zdHJ1Y3RlZC1vYmplY3RzLXByb3RvdHlwZXMt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvZG9tL3Jlc291cmNlcy9jb25zdHJ1Y3RlZC1v YmplY3RzLXByb3RvdHlwZXMuanM6CisKKzIwMDktMDctMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3 ZWJraXQub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCiAKICAgICAgICAg VXBkYXRlIGFsbCBDUkVBVEVfRE9NXypfV1JBUFBFUiBjYWxsZXJzIHRvIHBhc3MgZ2xvYmFsT2Jq ZWN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9jb25zdHJ1Y3RlZC1vYmplY3Rz LXByb3RvdHlwZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vY29uc3RydWN0 ZWQtb2JqZWN0cy1wcm90b3R5cGVzLWV4cGVjdGVkLnR4dAppbmRleCA3MTM4MThjLi4yNjM5ZDNk IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9jb25zdHJ1Y3RlZC1vYmplY3RzLXBy b3RvdHlwZXMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2NvbnN0cnVj dGVkLW9iamVjdHMtcHJvdG90eXBlcy1leHBlY3RlZC50eHQKQEAgLTMsMjYgKzMsMjggQEAgTWFr ZSBzdXJlIHByb3RvdHlwZXMgYXJlIHNldCB1cCB1c2luZyB0aGUgd2luZG93IGEgcHJvcGVydHkg Y2FtZSBmcm9tLCBpbnN0ZWFkIG8KIE9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBv ZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KIAogCi1GQUlM IChuZXcgaW5uZXIuQXVkaW8pLmlzSW5uZXIgc2hvdWxkIGJlIHRydWUuIFdhcyBmYWxzZS4KLUZB SUwgKG5ldyBpbm5lci5BdWRpbykuY29uc3RydWN0b3IuaXNJbm5lciBzaG91bGQgYmUgdHJ1ZS4g V2FzIGZhbHNlLgotUEFTUyAobmV3IGlubmVyLkRPTVBhcnNlcikuaXNJbm5lciBpcyB0cnVlCi1Q QVNTIChuZXcgaW5uZXIuRE9NUGFyc2VyKS5jb25zdHJ1Y3Rvci5pc0lubmVyIGlzIHRydWUKLUZB SUwgKG5ldyBpbm5lci5JbWFnZSkuaXNJbm5lciBzaG91bGQgYmUgdHJ1ZS4gV2FzIGZhbHNlLgot RkFJTCAobmV3IGlubmVyLkltYWdlKS5jb25zdHJ1Y3Rvci5pc0lubmVyIHNob3VsZCBiZSB0cnVl LiBXYXMgZmFsc2UuCi1GQUlMIChuZXcgaW5uZXIuTWVzc2FnZUNoYW5uZWwpLmlzSW5uZXIgc2hv dWxkIGJlIHRydWUuIFdhcyBmYWxzZS4KLUZBSUwgKG5ldyBpbm5lci5NZXNzYWdlQ2hhbm5lbCku Y29uc3RydWN0b3IuaXNJbm5lciBzaG91bGQgYmUgdHJ1ZS4gV2FzIGZhbHNlLgotRkFJTCAobmV3 IGlubmVyLk9wdGlvbikuaXNJbm5lciBzaG91bGQgYmUgdHJ1ZS4gV2FzIGZhbHNlLgotRkFJTCAo bmV3IGlubmVyLk9wdGlvbikuY29uc3RydWN0b3IuaXNJbm5lciBzaG91bGQgYmUgdHJ1ZS4gV2Fz IGZhbHNlLgotUEFTUyAobmV3IGlubmVyLldlYktpdENTU01hdHJpeCkuaXNJbm5lciBpcyB0cnVl Ci1QQVNTIChuZXcgaW5uZXIuV2ViS2l0Q1NTTWF0cml4KS5jb25zdHJ1Y3Rvci5pc0lubmVyIGlz IHRydWUKLUZBSUwgKG5ldyBpbm5lci5XZWJLaXRQb2ludCkuaXNJbm5lciBzaG91bGQgYmUgdHJ1 ZS4gV2FzIGZhbHNlLgotRkFJTCAobmV3IGlubmVyLldlYktpdFBvaW50KS5jb25zdHJ1Y3Rvci5p c0lubmVyIHNob3VsZCBiZSB0cnVlLiBXYXMgZmFsc2UuCi1QQVNTIChuZXcgaW5uZXIuWE1MSHR0 cFJlcXVlc3QpLmlzSW5uZXIgaXMgdHJ1ZQotUEFTUyAobmV3IGlubmVyLlhNTEh0dHBSZXF1ZXN0 KS5jb25zdHJ1Y3Rvci5pc0lubmVyIGlzIHRydWUKLVBBU1MgKG5ldyBpbm5lci5YTUxTZXJpYWxp emVyKS5pc0lubmVyIGlzIHRydWUKLVBBU1MgKG5ldyBpbm5lci5YTUxTZXJpYWxpemVyKS5jb25z dHJ1Y3Rvci5pc0lubmVyIGlzIHRydWUKLVBBU1MgKG5ldyBpbm5lci5YUGF0aEV2YWx1YXRvciku aXNJbm5lciBpcyB0cnVlCi1QQVNTIChuZXcgaW5uZXIuWFBhdGhFdmFsdWF0b3IpLmNvbnN0cnVj dG9yLmlzSW5uZXIgaXMgdHJ1ZQorUEFTUyAobmV3IGlubmVyLkF1ZGlvKCkpLmlzSW5uZXIgaXMg dHJ1ZQorUEFTUyAobmV3IGlubmVyLkF1ZGlvKCkpLmNvbnN0cnVjdG9yLmlzSW5uZXIgaXMgdHJ1 ZQorUEFTUyAobmV3IGlubmVyLkRPTVBhcnNlcigpKS5pc0lubmVyIGlzIHRydWUKK1BBU1MgKG5l dyBpbm5lci5ET01QYXJzZXIoKSkuY29uc3RydWN0b3IuaXNJbm5lciBpcyB0cnVlCitQQVNTIChu ZXcgaW5uZXIuSW1hZ2UoKSkuaXNJbm5lciBpcyB0cnVlCitQQVNTIChuZXcgaW5uZXIuSW1hZ2Uo KSkuY29uc3RydWN0b3IuaXNJbm5lciBpcyB0cnVlCitQQVNTIChuZXcgaW5uZXIuTWVzc2FnZUNo YW5uZWwoKSkuaXNJbm5lciBpcyB0cnVlCitQQVNTIChuZXcgaW5uZXIuTWVzc2FnZUNoYW5uZWwo KSkuY29uc3RydWN0b3IuaXNJbm5lciBpcyB0cnVlCitQQVNTIChuZXcgaW5uZXIuT3B0aW9uKCkp LmlzSW5uZXIgaXMgdHJ1ZQorUEFTUyAobmV3IGlubmVyLk9wdGlvbigpKS5jb25zdHJ1Y3Rvci5p c0lubmVyIGlzIHRydWUKK1BBU1MgKG5ldyBpbm5lci5XZWJLaXRDU1NNYXRyaXgoKSkuaXNJbm5l ciBpcyB0cnVlCitQQVNTIChuZXcgaW5uZXIuV2ViS2l0Q1NTTWF0cml4KCkpLmNvbnN0cnVjdG9y LmlzSW5uZXIgaXMgdHJ1ZQorUEFTUyAobmV3IGlubmVyLldlYktpdFBvaW50KCkpLmlzSW5uZXIg aXMgdHJ1ZQorUEFTUyAobmV3IGlubmVyLldlYktpdFBvaW50KCkpLmNvbnN0cnVjdG9yLmlzSW5u ZXIgaXMgdHJ1ZQorUEFTUyAobmV3IGlubmVyLldvcmtlcignZm9vJykpLmlzSW5uZXIgaXMgdHJ1 ZQorUEFTUyAobmV3IGlubmVyLldvcmtlcignZm9vJykpLmNvbnN0cnVjdG9yLmlzSW5uZXIgaXMg dHJ1ZQorUEFTUyAobmV3IGlubmVyLlhNTEh0dHBSZXF1ZXN0KCkpLmlzSW5uZXIgaXMgdHJ1ZQor UEFTUyAobmV3IGlubmVyLlhNTEh0dHBSZXF1ZXN0KCkpLmNvbnN0cnVjdG9yLmlzSW5uZXIgaXMg dHJ1ZQorUEFTUyAobmV3IGlubmVyLlhNTFNlcmlhbGl6ZXIoKSkuaXNJbm5lciBpcyB0cnVlCitQ QVNTIChuZXcgaW5uZXIuWE1MU2VyaWFsaXplcigpKS5jb25zdHJ1Y3Rvci5pc0lubmVyIGlzIHRy dWUKK1BBU1MgKG5ldyBpbm5lci5YUGF0aEV2YWx1YXRvcigpKS5pc0lubmVyIGlzIHRydWUKK1BB U1MgKG5ldyBpbm5lci5YUGF0aEV2YWx1YXRvcigpKS5jb25zdHJ1Y3Rvci5pc0lubmVyIGlzIHRy dWUKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vcmVzb3VyY2VzL2NvbnN0cnVjdGVkLW9iamVj dHMtcHJvdG90eXBlcy5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9jb25zdHJ1 Y3RlZC1vYmplY3RzLXByb3RvdHlwZXMuanMKaW5kZXggZmRkMDAyZS4uNTZjZDQzNCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vcmVzb3VyY2VzL2NvbnN0cnVjdGVkLW9iamVjdHMt cHJvdG90eXBlcy5qcworKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9yZXNvdXJjZXMvY29uc3Ry dWN0ZWQtb2JqZWN0cy1wcm90b3R5cGVzLmpzCkBAIC0zNSwxOCArMzUsMjQgQEAgZnVuY3Rpb24g Y29uc3RydWN0b3JQcm9wZXJ0aWVzT25XaW5kb3coZ2xvYmFsT2JqZWN0KQogCiB2YXIgY29uc3Ry dWN0b3JOYW1lcyA9IGNvbnN0cnVjdG9yUHJvcGVydGllc09uV2luZG93KGlubmVyKTsKIAordmFy IGFyZ3VtZW50c0ZvckNvbnN0cnVjdG9yID0geworICAgICdXb3JrZXInIDogIidmb28nIiwKK30K KwogZm9yICh2YXIgeCA9IDA7IHggPCBjb25zdHJ1Y3Rvck5hbWVzLmxlbmd0aDsgeCsrKSB7CiAg ICAgdmFyIGNvbnN0cnVjdG9yTmFtZSA9IGNvbnN0cnVjdG9yTmFtZXNbeF07CisgICAgdmFyIGFy Z3VtZW50cyA9IGFyZ3VtZW50c0ZvckNvbnN0cnVjdG9yW2NvbnN0cnVjdG9yTmFtZV0gfHwgIiI7 CisgICAgdmFyIGFyZ3VtZW50c1N0cmluZyA9ICIoIiArIGFyZ3VtZW50cyArICIpIjsKICAgICAv LyBUZXN0IGZpcnN0IHRvIHNlZSBpZiB0aGUgb2JqZWN0IGlzIGNvbnN0cnVjdGFibGUKICAgICB2 YXIgY29uc3RydWN0ZWRPYmplY3Q7CiAgICAgdHJ5IHsKLSAgICAgICAgY29uc3RydWN0ZWRPYmpl Y3QgPSBldmFsKCJuZXcgaW5uZXIuIiArIGNvbnN0cnVjdG9yTmFtZSk7CisgICAgICAgIGNvbnN0 cnVjdGVkT2JqZWN0ID0gZXZhbCgibmV3IGlubmVyLiIgKyBjb25zdHJ1Y3Rvck5hbWUgKyBhcmd1 bWVudHNTdHJpbmcpOwogICAgIH0gY2F0Y2goZSkgewogICAgICAgICBjb250aW51ZTsKICAgICB9 CiAKLSAgICBzaG91bGRCZVRydWUoIihuZXcgaW5uZXIuIiArIGNvbnN0cnVjdG9yTmFtZSArICIp LmlzSW5uZXIiKTsKLSAgICBzaG91bGRCZVRydWUoIihuZXcgaW5uZXIuIiArIGNvbnN0cnVjdG9y TmFtZSArICIpLmNvbnN0cnVjdG9yLmlzSW5uZXIiKTsKKyAgICBzaG91bGRCZVRydWUoIihuZXcg aW5uZXIuIiArIGNvbnN0cnVjdG9yTmFtZSArIGFyZ3VtZW50c1N0cmluZyArICIpLmlzSW5uZXIi KTsKKyAgICBzaG91bGRCZVRydWUoIihuZXcgaW5uZXIuIiArIGNvbnN0cnVjdG9yTmFtZSArIGFy Z3VtZW50c1N0cmluZyArICIpLmNvbnN0cnVjdG9yLmlzSW5uZXIiKTsKIH0KIAogZG9jdW1lbnQu Ym9keS5yZW1vdmVDaGlsZChzdWJmcmFtZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDZhYjg3MjkuLjQ5ZWU3NjYgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMDktMDctMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCB0aGUgbGFzdCBvZiB0 aGUgeC1mcmFtZSBjb25zdHJ1Y3RvciBjYWxscyB0byBoYXZlIHRoZSByaWdodCBwcm90b3R5cGUg Y2hhaW5zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NzY0NQorCisgICAgICAgIEZpeCB0aGUgbGFzdCBmZXcgY29uc3RydWN0b3JzIHRvIHVzZSB0aGVp ciBzdG9yZWQgZ2xvYmFsT2JqZWN0IHBvaW50ZXIgd2hlbgorICAgICAgICBjb25zdHJ1Y3Rpbmcg b2JqZWN0cyBpbnN0ZWFkIG9mIHRoZSBsZXhpY2FsR2xvYmFsT2JqZWN0KCkuCisKKyAgICAgICAg KiBiaW5kaW5ncy9qcy9KU0F1ZGlvQ29uc3RydWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Y29uc3RydWN0QXVkaW8pOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTSW1hZ2VDb25zdHJ1Y3Rv ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1Y3RJbWFnZSk6CisgICAgICAgICogYmlu ZGluZ3MvanMvSlNNZXNzYWdlQ2hhbm5lbENvbnN0cnVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkpTTWVzc2FnZUNoYW5uZWxDb25zdHJ1Y3Rvcjo6Y29uc3RydWN0KToKKyAgICAgICAgKiBi aW5kaW5ncy9qcy9KU09wdGlvbkNvbnN0cnVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNv bnN0cnVjdEhUTUxPcHRpb25FbGVtZW50KToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1dlYktp dFBvaW50Q29uc3RydWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29uc3RydWN0V2ViS2l0 UG9pbnQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTV29ya2VyQ29uc3RydWN0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Y29uc3RydWN0V29ya2VyKToKKworMjAwOS0wNy0yNCAgRXJpYyBT ZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0 aC4KIAogICAgICAgICBVcGRhdGUgYWxsIENSRUFURV9ET01fKl9XUkFQUEVSIGNhbGxlcnMgdG8g cGFzcyBnbG9iYWxPYmplY3QKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNBdWRp b0NvbnN0cnVjdG9yLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNBdWRpb0NvbnN0cnVjdG9y LmNwcAppbmRleCAwZTJlYTYyLi44N2EzODgwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTQXVkaW9Db25zdHJ1Y3Rvci5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0F1 ZGlvQ29uc3RydWN0b3IuY3BwCkBAIC01MCw5ICs1MCw5IEBAIEpTQXVkaW9Db25zdHJ1Y3Rvcjo6 SlNBdWRpb0NvbnN0cnVjdG9yKEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGds b2JhCiAKIHN0YXRpYyBKU09iamVjdCogY29uc3RydWN0QXVkaW8oRXhlY1N0YXRlKiBleGVjLCBK U09iamVjdCogY29uc3RydWN0b3IsIGNvbnN0IEFyZ0xpc3QmIGFyZ3MpCiB7CisgICAgSlNBdWRp b0NvbnN0cnVjdG9yKiBqc0F1ZGlvID0gc3RhdGljX2Nhc3Q8SlNBdWRpb0NvbnN0cnVjdG9yKj4o Y29uc3RydWN0b3IpOwogICAgIC8vIEZJWE1FOiBXaHkgZG9lc24ndCB0aGlzIG5lZWQgdGhlIGNh bGwgdG9KUyBvbiB0aGUgZG9jdW1lbnQgbGlrZSBKU0ltYWdlQ29uc3RydWN0b3I/Ci0KLSAgICBE b2N1bWVudCogZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxKU0F1ZGlvQ29uc3RydWN0b3IqPihjb25z dHJ1Y3RvciktPmRvY3VtZW50KCk7CisgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0ganNBdWRpby0+ ZG9jdW1lbnQoKTsKICAgICBpZiAoIWRvY3VtZW50KQogICAgICAgICByZXR1cm4gdGhyb3dFcnJv cihleGVjLCBSZWZlcmVuY2VFcnJvciwgIkF1ZGlvIGNvbnN0cnVjdG9yIGFzc29jaWF0ZWQgZG9j dW1lbnQgaXMgdW5hdmFpbGFibGUiKTsKIApAQCAtNjIsNyArNjIsNyBAQCBzdGF0aWMgSlNPYmpl Y3QqIGNvbnN0cnVjdEF1ZGlvKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIGNvbnN0cnVjdG9y LCBjb25zdCBBcgogICAgICAgICBhdWRpby0+c2V0U3JjKGFyZ3MuYXQoMCkudG9TdHJpbmcoZXhl YykpOwogICAgICAgICBhdWRpby0+c2NoZWR1bGVMb2FkKCk7CiAgICAgfQotICAgIHJldHVybiBh c09iamVjdCh0b0pTKGV4ZWMsIGF1ZGlvLnJlbGVhc2UoKSkpOworICAgIHJldHVybiBhc09iamVj dCh0b0pTKGV4ZWMsIGpzQXVkaW8tPmdsb2JhbE9iamVjdCgpLCBhdWRpby5yZWxlYXNlKCkpKTsK IH0KIAogQ29uc3RydWN0VHlwZSBKU0F1ZGlvQ29uc3RydWN0b3I6OmdldENvbnN0cnVjdERhdGEo Q29uc3RydWN0RGF0YSYgY29uc3RydWN0RGF0YSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNJbWFnZUNvbnN0cnVjdG9yLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbWFn ZUNvbnN0cnVjdG9yLmNwcAppbmRleCA0OTBlNTBlLi5mYWFhZjQxIDEwMDY0NAotLS0gYS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTSW1hZ2VDb25zdHJ1Y3Rvci5jcHAKKysrIGIvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0ltYWdlQ29uc3RydWN0b3IuY3BwCkBAIC01NSwyMSArNTUsMjIgQEAgc3RhdGlj IEpTT2JqZWN0KiBjb25zdHJ1Y3RJbWFnZShFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiBjb25z dHJ1Y3RvciwgY29uc3QgQXIKICAgICAgICAgaGVpZ2h0ID0gYXJncy5hdCgxKS50b0ludDMyKGV4 ZWMpOwogICAgIH0KIAotICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0PEpTSW1h Z2VDb25zdHJ1Y3Rvcio+KGNvbnN0cnVjdG9yKS0+ZG9jdW1lbnQoKTsKKyAgICBKU0ltYWdlQ29u c3RydWN0b3IqIGpzQ29uc3RydWN0b3IgPSBzdGF0aWNfY2FzdDxKU0ltYWdlQ29uc3RydWN0b3Iq Pihjb25zdHJ1Y3Rvcik7CisgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0ganNDb25zdHJ1Y3Rvci0+ ZG9jdW1lbnQoKTsKICAgICBpZiAoIWRvY3VtZW50KQogICAgICAgICByZXR1cm4gdGhyb3dFcnJv cihleGVjLCBSZWZlcmVuY2VFcnJvciwgIkltYWdlIGNvbnN0cnVjdG9yIGFzc29jaWF0ZWQgZG9j dW1lbnQgaXMgdW5hdmFpbGFibGUiKTsKIAogICAgIC8vIENhbGxpbmcgdG9KUyBvbiB0aGUgZG9j dW1lbnQgY2F1c2VzIHRoZSBKUyBkb2N1bWVudCB3cmFwcGVyIHRvIGJlCiAgICAgLy8gYWRkZWQg dG8gdGhlIHdpbmRvdyBvYmplY3QuIFRoaXMgaXMgZG9uZSB0byBlbnN1cmUgdGhhdCBKU0RvY3Vt ZW50OjptYXJrCiAgICAgLy8gd2lsbCBiZSBjYWxsZWQgKHdoaWNoIHdpbGwgY2F1c2UgdGhlIGlt YWdlIGVsZW1lbnQgdG8gYmUgbWFya2VkIGlmIG5lY2Vzc2FyeSkuCi0gICAgdG9KUyhleGVjLCBk b2N1bWVudCk7CisgICAgdG9KUyhleGVjLCBqc0NvbnN0cnVjdG9yLT5nbG9iYWxPYmplY3QoKSwg ZG9jdW1lbnQpOwogCiAgICAgUmVmUHRyPEhUTUxJbWFnZUVsZW1lbnQ+IGltYWdlID0gbmV3IEhU TUxJbWFnZUVsZW1lbnQoSFRNTE5hbWVzOjppbWdUYWcsIGRvY3VtZW50KTsKICAgICBpZiAod2lk dGhTZXQpCiAgICAgICAgIGltYWdlLT5zZXRXaWR0aCh3aWR0aCk7CiAgICAgaWYgKGhlaWdodFNl dCkKICAgICAgICAgaW1hZ2UtPnNldEhlaWdodChoZWlnaHQpOwotICAgIHJldHVybiBhc09iamVj dCh0b0pTKGV4ZWMsIGltYWdlLnJlbGVhc2UoKSkpOworICAgIHJldHVybiBhc09iamVjdCh0b0pT KGV4ZWMsIGpzQ29uc3RydWN0b3ItPmdsb2JhbE9iamVjdCgpLCBpbWFnZS5yZWxlYXNlKCkpKTsK IH0KIAogQ29uc3RydWN0VHlwZSBKU0ltYWdlQ29uc3RydWN0b3I6OmdldENvbnN0cnVjdERhdGEo Q29uc3RydWN0RGF0YSYgY29uc3RydWN0RGF0YSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNNZXNzYWdlQ2hhbm5lbENvbnN0cnVjdG9yLmNwcCBiL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNNZXNzYWdlQ2hhbm5lbENvbnN0cnVjdG9yLmNwcAppbmRleCAyZDQ3NjA3Li4yNWE1Y2Iy IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTWVzc2FnZUNoYW5uZWxDb25zdHJ1 Y3Rvci5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU01lc3NhZ2VDaGFubmVsQ29uc3Ry dWN0b3IuY3BwCkBAIC01NSwxMSArNTUsMTIgQEAgQ29uc3RydWN0VHlwZSBKU01lc3NhZ2VDaGFu bmVsQ29uc3RydWN0b3I6OmdldENvbnN0cnVjdERhdGEoQ29uc3RydWN0RGF0YSYgY29uc3QKIAog SlNPYmplY3QqIEpTTWVzc2FnZUNoYW5uZWxDb25zdHJ1Y3Rvcjo6Y29uc3RydWN0KEV4ZWNTdGF0 ZSogZXhlYywgSlNPYmplY3QqIGNvbnN0cnVjdG9yLCBjb25zdCBBcmdMaXN0JikKIHsKLSAgICBT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0ID0gc3RhdGljX2Nhc3Q8SlNNZXNzYWdlQ2hh bm5lbENvbnN0cnVjdG9yKj4oY29uc3RydWN0b3IpLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCk7 CisgICAgSlNNZXNzYWdlQ2hhbm5lbENvbnN0cnVjdG9yKiBqc0NvbnN0cnVjdG9yID0gc3RhdGlj X2Nhc3Q8SlNNZXNzYWdlQ2hhbm5lbENvbnN0cnVjdG9yKj4oY29uc3RydWN0b3IpOworICAgIFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQgPSBqc0NvbnN0cnVjdG9yLT5zY3JpcHRFeGVj dXRpb25Db250ZXh0KCk7CiAgICAgaWYgKCFjb250ZXh0KQogICAgICAgICByZXR1cm4gdGhyb3dF cnJvcihleGVjLCBSZWZlcmVuY2VFcnJvciwgIk1lc3NhZ2VDaGFubmVsIGNvbnN0cnVjdG9yIGFz c29jaWF0ZWQgZG9jdW1lbnQgaXMgdW5hdmFpbGFibGUiKTsKIAotICAgIHJldHVybiBhc09iamVj dCh0b0pTKGV4ZWMsIE1lc3NhZ2VDaGFubmVsOjpjcmVhdGUoY29udGV4dCkpKTsKKyAgICByZXR1 cm4gYXNPYmplY3QodG9KUyhleGVjLCBqc0NvbnN0cnVjdG9yLT5nbG9iYWxPYmplY3QoKSwgTWVz c2FnZUNoYW5uZWw6OmNyZWF0ZShjb250ZXh0KSkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTT3B0aW9uQ29uc3RydWN0b3Iu Y3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU09wdGlvbkNvbnN0cnVjdG9yLmNwcAppbmRleCAw ZTBlMDg3Li4yYjhiZDVkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTT3B0aW9u Q29uc3RydWN0b3IuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNPcHRpb25Db25zdHJ1 Y3Rvci5jcHAKQEAgLTQzLDcgKzQzLDggQEAgSlNPcHRpb25Db25zdHJ1Y3Rvcjo6SlNPcHRpb25D b25zdHJ1Y3RvcihFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG8KIAogc3Rh dGljIEpTT2JqZWN0KiBjb25zdHJ1Y3RIVE1MT3B0aW9uRWxlbWVudChFeGVjU3RhdGUqIGV4ZWMs IEpTT2JqZWN0KiBjb25zdHJ1Y3RvciwgY29uc3QgQXJnTGlzdCYgYXJncykKIHsKLSAgICBEb2N1 bWVudCogZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxKU09wdGlvbkNvbnN0cnVjdG9yKj4oY29uc3Ry dWN0b3IpLT5kb2N1bWVudCgpOworICAgIEpTT3B0aW9uQ29uc3RydWN0b3IqIGpzQ29uc3RydWN0 b3IgPSBzdGF0aWNfY2FzdDxKU09wdGlvbkNvbnN0cnVjdG9yKj4oY29uc3RydWN0b3IpOworICAg IERvY3VtZW50KiBkb2N1bWVudCA9IGpzQ29uc3RydWN0b3ItPmRvY3VtZW50KCk7CiAgICAgaWYg KCFkb2N1bWVudCkKICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoZXhlYywgUmVmZXJlbmNlRXJy b3IsICJPcHRpb24gY29uc3RydWN0b3IgYXNzb2NpYXRlZCBkb2N1bWVudCBpcyB1bmF2YWlsYWJs ZSIpOwogCkBAIC02Nyw3ICs2OCw3IEBAIHN0YXRpYyBKU09iamVjdCogY29uc3RydWN0SFRNTE9w dGlvbkVsZW1lbnQoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogY29uc3RydWN0CiAgICAgICAg IHJldHVybiAwOwogICAgIH0KIAotICAgIHJldHVybiBhc09iamVjdCh0b0pTKGV4ZWMsIGVsZW1l bnQucmVsZWFzZSgpKSk7CisgICAgcmV0dXJuIGFzT2JqZWN0KHRvSlMoZXhlYywganNDb25zdHJ1 Y3Rvci0+Z2xvYmFsT2JqZWN0KCksIGVsZW1lbnQucmVsZWFzZSgpKSk7CiB9CiAKIENvbnN0cnVj dFR5cGUgSlNPcHRpb25Db25zdHJ1Y3Rvcjo6Z2V0Q29uc3RydWN0RGF0YShDb25zdHJ1Y3REYXRh JiBjb25zdHJ1Y3REYXRhKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dlYktp dFBvaW50Q29uc3RydWN0b3IuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dlYktpdFBvaW50 Q29uc3RydWN0b3IuY3BwCmluZGV4IGNkOGUzYjMuLjI3Y2MxZGIgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvYmluZGluZ3MvanMvSlNXZWJLaXRQb2ludENvbnN0cnVjdG9yLmNwcAorKysgYi9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTV2ViS2l0UG9pbnRDb25zdHJ1Y3Rvci5jcHAKQEAgLTQzLDggKzQzLDEw IEBAIEpTV2ViS2l0UG9pbnRDb25zdHJ1Y3Rvcjo6SlNXZWJLaXRQb2ludENvbnN0cnVjdG9yKEV4 ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPCiAgICAgcHV0RGlyZWN0KGV4ZWMtPnByb3BlcnR5 TmFtZXMoKS5sZW5ndGgsIGpzTnVtYmVyKGV4ZWMsIDIpLCBSZWFkT25seXxEb250RGVsZXRlfERv bnRFbnVtKTsKIH0KIAotc3RhdGljIEpTT2JqZWN0KiBjb25zdHJ1Y3RXZWJLaXRQb2ludChFeGVj U3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiwgY29uc3QgQXJnTGlzdCYgYXJncykKK3N0YXRpYyBKU09i amVjdCogY29uc3RydWN0V2ViS2l0UG9pbnQoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogY29u c3RydWN0b3IsIGNvbnN0IEFyZ0xpc3QmIGFyZ3MpCiB7CisgICAgSlNXZWJLaXRQb2ludENvbnN0 cnVjdG9yKiBqc0NvbnN0cnVjdG9yID0gc3RhdGljX2Nhc3Q8SlNXZWJLaXRQb2ludENvbnN0cnVj dG9yKj4oY29uc3RydWN0b3IpOworCiAgICAgZmxvYXQgeCA9IDA7CiAgICAgZmxvYXQgeSA9IDA7 CiAgICAgaWYgKGFyZ3Muc2l6ZSgpID49IDIpIHsKQEAgLTU1LDcgKzU3LDcgQEAgc3RhdGljIEpT T2JqZWN0KiBjb25zdHJ1Y3RXZWJLaXRQb2ludChFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0Kiwg Y29uc3QgQXJnTGlzdCYKICAgICAgICAgaWYgKGlzbmFuKHkpKQogICAgICAgICAgICAgeSA9IDA7 CiAgICAgfQotICAgIHJldHVybiBhc09iamVjdCh0b0pTKGV4ZWMsIFdlYktpdFBvaW50OjpjcmVh dGUoeCwgeSkpKTsKKyAgICByZXR1cm4gYXNPYmplY3QodG9KUyhleGVjLCBqc0NvbnN0cnVjdG9y LT5nbG9iYWxPYmplY3QoKSwgV2ViS2l0UG9pbnQ6OmNyZWF0ZSh4LCB5KSkpOwogfQogCiBKU0M6 OkNvbnN0cnVjdFR5cGUgSlNXZWJLaXRQb2ludENvbnN0cnVjdG9yOjpnZXRDb25zdHJ1Y3REYXRh KEpTQzo6Q29uc3RydWN0RGF0YSYgY29uc3RydWN0RGF0YSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUv YmluZGluZ3MvanMvSlNXb3JrZXJDb25zdHJ1Y3Rvci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTV29ya2VyQ29uc3RydWN0b3IuY3BwCmluZGV4IGU1YTU1NmYuLjZkOTA0ZmQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJDb25zdHJ1Y3Rvci5jcHAKKysrIGIvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU1dvcmtlckNvbnN0cnVjdG9yLmNwcApAQCAtNDgsOCArNDgsMTAg QEAgSlNXb3JrZXJDb25zdHJ1Y3Rvcjo6SlNXb3JrZXJDb25zdHJ1Y3RvcihFeGVjU3RhdGUqIGV4 ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG8KICAgICBwdXREaXJlY3QoZXhlYy0+cHJvcGVydHlO YW1lcygpLmxlbmd0aCwganNOdW1iZXIoZXhlYywgMSksIFJlYWRPbmx5fERvbnREZWxldGV8RG9u dEVudW0pOwogfQogCi1zdGF0aWMgSlNPYmplY3QqIGNvbnN0cnVjdFdvcmtlcihFeGVjU3RhdGUq IGV4ZWMsIEpTT2JqZWN0KiwgY29uc3QgQXJnTGlzdCYgYXJncykKK3N0YXRpYyBKU09iamVjdCog Y29uc3RydWN0V29ya2VyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIGNvbnN0cnVjdG9yLCBj b25zdCBBcmdMaXN0JiBhcmdzKQogeworICAgIEpTV29ya2VyQ29uc3RydWN0b3IqIGpzQ29uc3Ry dWN0b3IgPSBzdGF0aWNfY2FzdDxKU1dvcmtlckNvbnN0cnVjdG9yKj4oY29uc3RydWN0b3IpOwor CiAgICAgaWYgKGFyZ3Muc2l6ZSgpID09IDApCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGV4 ZWMsIFN5bnRheEVycm9yLCAiTm90IGVub3VnaCBhcmd1bWVudHMiKTsKIApAQCAtNTcsMTEgKzU5 LDEyIEBAIHN0YXRpYyBKU09iamVjdCogY29uc3RydWN0V29ya2VyKEV4ZWNTdGF0ZSogZXhlYywg SlNPYmplY3QqLCBjb25zdCBBcmdMaXN0JiBhcmdzCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlv bigpKQogICAgICAgICByZXR1cm4gMDsKIAorICAgIC8vIEZJWE1FOiBXaHkgZG8gd2UgdXNlIHRo ZSBsZXhpY2FsIGdsb2JhbCBvYmplY3QgaGVyZT8KICAgICBET01XaW5kb3cqIHdpbmRvdyA9IGFz SlNET01XaW5kb3coZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpKS0+aW1wbCgpOwotICAgIAor CiAgICAgUmVmUHRyPFdvcmtlcj4gd29ya2VyID0gV29ya2VyOjpjcmVhdGUoc2NyaXB0VVJMLCB3 aW5kb3ctPmRvY3VtZW50KCkpOwogCi0gICAgcmV0dXJuIGFzT2JqZWN0KHRvSlMoZXhlYywgd29y a2VyLnJlbGVhc2UoKSkpOworICAgIHJldHVybiBhc09iamVjdCh0b0pTKGV4ZWMsIGpzQ29uc3Ry dWN0b3ItPmdsb2JhbE9iamVjdCgpLCB3b3JrZXIucmVsZWFzZSgpKSk7CiB9CiAKIENvbnN0cnVj dFR5cGUgSlNXb3JrZXJDb25zdHJ1Y3Rvcjo6Z2V0Q29uc3RydWN0RGF0YShDb25zdHJ1Y3REYXRh JiBjb25zdHJ1Y3REYXRhKQ==