43019 2010-07-26 17:02:23 -0700 Plug-in views should be able to return JSObjects directly 2010-07-26 17:09:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 256343 0 andersca 2010-07-26 17:02:23 -0700 Plug-in views should be able to return JSObjects directly 256344 1 62631 andersca 2010-07-26 17:05:53 -0700 Created attachment 62631 Patch 256346 2 webkit.review.bot 2010-07-26 17:07:07 -0700 Attachment 62631 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/plugins/PluginViewBase.h:32: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 256347 3 62631 sam 2010-07-26 17:07:41 -0700 Comment on attachment 62631 Patch Lovely. r=me 256348 4 andersca 2010-07-26 17:09:22 -0700 Committed r64093: <http://trac.webkit.org/changeset/64093> 62631 2010-07-26 17:05:53 -0700 2010-07-26 17:07:40 -0700 Patch bug-43019-20100726170552.patch text/plain 14997 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTBmNjIxMDk0M2QzNDg5YjhkNTc1OGI1MTY2MmJlMjAwNGVhNjM4Yi4uMjkzM2VhYzU2MDQwNTNj N2FiZjdiNTk3YTk3YjQ1ODNhYWRmODViMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1NSBAQAorMjAxMC0wNy0yNiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBsdWctaW4gdmlld3Mgc2hvdWxkIGJlIGFibGUg dG8gcmV0dXJuIEpTT2JqZWN0cyBkaXJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMwMTkKKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BT ISkKKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTSFRNTEFwcGxldEVsZW1lbnRDdXN0b20uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SlNIVE1MQXBwbGV0RWxlbWVudDo6cHV0RGVsZWdhdGUpOgor ICAgICAgICAoV2ViQ29yZTo6SlNIVE1MQXBwbGV0RWxlbWVudDo6Z2V0Q2FsbERhdGEpOgorICAg ICAgICAqIGJpbmRpbmdzL2pzL0pTSFRNTEVtYmVkRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpKU0hUTUxFbWJlZEVsZW1lbnQ6OnB1dERlbGVnYXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkpTSFRNTEVtYmVkRWxlbWVudDo6Z2V0Q2FsbERhdGEpOgorICAgICAgICAqIGJpbmRp bmdzL2pzL0pTSFRNTE9iamVjdEVsZW1lbnRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SlNIVE1MT2JqZWN0RWxlbWVudDo6cHV0RGVsZWdhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SlNI VE1MT2JqZWN0RWxlbWVudDo6Z2V0Q2FsbERhdGEpOgorICAgICAgICBydW50aW1lT2JqZWN0Q3Vz dG9tUHV0IGFuZCBydW50aW1lT2JqZWN0R2V0Q2FsbERhdGEgbm93IHRha2UgYSBKU0hUTUxFbGVt ZW50IGluc3RlYWQgb2YgYSBIVE1MRWxlbWVudC4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pT UGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwbHVnaW5TY3Jp cHRPYmplY3QpOgorICAgICAgICBGaXJzdCwgYXNrIHRoZSBQbHVnaW5WaWV3QmFzZSBmb3IgYSBK U09iamVjdCBhbmQgZmFsbCBiYWNrIHRvIGdldHRpbmcgdGhlIEpTT2JqZWN0IGZyb20gdGhlIGlu c3RhbmNlLgorCisgICAgICAgIChXZWJDb3JlOjpydW50aW1lT2JqZWN0UHJvcGVydHlHZXR0ZXIp OgorICAgICAgICAoV2ViQ29yZTo6cnVudGltZU9iamVjdEN1c3RvbUdldE93blByb3BlcnR5U2xv dCk6CisgICAgICAgIChXZWJDb3JlOjpydW50aW1lT2JqZWN0Q3VzdG9tR2V0T3duUHJvcGVydHlE ZXNjcmlwdG9yKToKKyAgICAgICAgQ2FsbCBwbHVnaW5TY3JpcHRPYmplY3QuCisgICAgICAgIAor ICAgICAgICAoV2ViQ29yZTo6cnVudGltZU9iamVjdEN1c3RvbVB1dCk6CisgICAgICAgIENoYW5n ZSB0byB0YWtlIGEgSlNIVE1MRWxlbWVudC4gQ2FsbCBwbHVnaW5TY3JpcHRPYmplY3QuCisgICAg ICAgIAorICAgICAgICAoV2ViQ29yZTo6cnVudGltZU9iamVjdEdldENhbGxEYXRhKToKKyAgICAg ICAgQ2hhbmdlIHRvIHRha2UgYSBKU0hUTUxFbGVtZW50LgorCisgICAgICAgICogYnJpZGdlL2pz Yy9CcmlkZ2VKU0MuY3BwOgorICAgICAgICAqIGJyaWRnZS9qc2MvQnJpZGdlSlNDLmg6CisgICAg ICAgIChKU0M6OkJpbmRpbmdzOjpJbnN0YW5jZTo6Y3JlYXRlUnVudGltZU9iamVjdCk6CisgICAg ICAgIENoYW5nZSB0aGlzIHRvIHJldHVybiBhIEpTT2JqZWN0LgorICAgICAgICAKKyAgICAgICAg KiBodG1sL0hUTUxQbHVnSW5FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVn SW5FbGVtZW50OjpnZXRJbnN0YW5jZSk6CisgICAgICAgIENhbGwgcGx1Z2luV2lkZ2V0LgorCisg ICAgICAgIChXZWJDb3JlOjpIVE1MUGx1Z0luRWxlbWVudDo6cGx1Z2luV2lkZ2V0KToKKyAgICAg ICAgUmV0dXJuIHRoZSBwbHVnLWluIHdpZGdldCBmb3IgdGhpcyBlbGVtZW50LgorCisgICAgICAg ICogaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5oOgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmll d0Jhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXdCYXNlOjpzY3JpcHRPYmplY3Qp OgorICAgICAgICBBZGQgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBvZiBzY3JpcHRPYmplY3QuCisK IDIwMTAtMDctMjYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0hUTUxBcHBsZXRFbGVtZW50Q3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNIVE1MQXBwbGV0RWxlbWVudEN1c3RvbS5jcHAKaW5kZXggNDBkMjBjZjliZDZkOGY1 OTNhMmNlNDFlOWJiMmUyZWMxM2I1ZTYyOS4uMmJmZjAxYTk2ZDE1MzQ0ZWE3ZGVhYThlZGQyMzE2 YzVmZThjYWFjMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxBcHBsZXRF bGVtZW50Q3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTEFwcGxldEVs ZW1lbnRDdXN0b20uY3BwCkBAIC00NSwxMiArNDUsMTIgQEAgYm9vbCBKU0hUTUxBcHBsZXRFbGVt ZW50OjpnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JEZWxlZ2F0ZShFeGVjU3RhdGUqIGV4ZWMsIGNv bnMKIAogYm9vbCBKU0hUTUxBcHBsZXRFbGVtZW50OjpwdXREZWxlZ2F0ZShFeGVjU3RhdGUqIGV4 ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgUHV0UHJv cGVydHlTbG90JiBzbG90KQogewotICAgIHJldHVybiBydW50aW1lT2JqZWN0Q3VzdG9tUHV0KGV4 ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUsIGltcGwoKSwgc2xvdCk7CisgICAgcmV0dXJuIHJ1bnRp bWVPYmplY3RDdXN0b21QdXQoZXhlYywgcHJvcGVydHlOYW1lLCB2YWx1ZSwgdGhpcywgc2xvdCk7 CiB9CiAKIENhbGxUeXBlIEpTSFRNTEFwcGxldEVsZW1lbnQ6OmdldENhbGxEYXRhKENhbGxEYXRh JiBjYWxsRGF0YSkKIHsKLSAgICByZXR1cm4gcnVudGltZU9iamVjdEdldENhbGxEYXRhKGltcGwo KSwgY2FsbERhdGEpOworICAgIHJldHVybiBydW50aW1lT2JqZWN0R2V0Q2FsbERhdGEodGhpcywg Y2FsbERhdGEpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTSFRNTEVtYmVkRWxlbWVudEN1c3RvbS5jcHAgYi9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTSFRNTEVtYmVkRWxlbWVudEN1c3RvbS5jcHAKaW5kZXggYjlmOGMxMmViNjY5 YzdhMmQ4NDRkYmRlOGI4NmM0NDJmMTk5ZWI4NS4uNzJlNjk1YjY1NTA5OTE4ZGFlNzY1MzU2Y2M0 NDczMzYzZTU0MmYxMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxFbWJl ZEVsZW1lbnRDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MRW1iZWRF bGVtZW50Q3VzdG9tLmNwcApAQCAtNDUsMTIgKzQ1LDEyIEBAIGJvb2wgSlNIVE1MRW1iZWRFbGVt ZW50OjpnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JEZWxlZ2F0ZShFeGVjU3RhdGUqIGV4ZWMsIGNv bnN0CiAKIGJvb2wgSlNIVE1MRW1iZWRFbGVtZW50OjpwdXREZWxlZ2F0ZShFeGVjU3RhdGUqIGV4 ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgUHV0UHJv cGVydHlTbG90JiBzbG90KQogewotICAgIHJldHVybiBydW50aW1lT2JqZWN0Q3VzdG9tUHV0KGV4 ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUsIGltcGwoKSwgc2xvdCk7CisgICAgcmV0dXJuIHJ1bnRp bWVPYmplY3RDdXN0b21QdXQoZXhlYywgcHJvcGVydHlOYW1lLCB2YWx1ZSwgdGhpcywgc2xvdCk7 CiB9CiAKIENhbGxUeXBlIEpTSFRNTEVtYmVkRWxlbWVudDo6Z2V0Q2FsbERhdGEoQ2FsbERhdGEm IGNhbGxEYXRhKQogewotICAgIHJldHVybiBydW50aW1lT2JqZWN0R2V0Q2FsbERhdGEoaW1wbCgp LCBjYWxsRGF0YSk7CisgICAgcmV0dXJuIHJ1bnRpbWVPYmplY3RHZXRDYWxsRGF0YSh0aGlzLCBj YWxsRGF0YSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNv cmUvYmluZGluZ3MvanMvSlNIVE1MT2JqZWN0RWxlbWVudEN1c3RvbS5jcHAgYi9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTSFRNTE9iamVjdEVsZW1lbnRDdXN0b20uY3BwCmluZGV4IDY4YzllNTlmNjY5 YzUzMjg4MmQyYjUxNzcwNWM4MmM1MDA5NDJjNTguLmM4N2I5MzJiYjdiZGY0YWQ1Y2UyODZjNWZi YzJhNGMyYTMwNTRhN2EgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MT2Jq ZWN0RWxlbWVudEN1c3RvbS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxPYmpl Y3RFbGVtZW50Q3VzdG9tLmNwcApAQCAtNDUsMTIgKzQ1LDEyIEBAIGJvb2wgSlNIVE1MT2JqZWN0 RWxlbWVudDo6Z2V0T3duUHJvcGVydHlEZXNjcmlwdG9yRGVsZWdhdGUoRXhlY1N0YXRlKiBleGVj LCBjb25zCiAKIGJvb2wgSlNIVE1MT2JqZWN0RWxlbWVudDo6cHV0RGVsZWdhdGUoRXhlY1N0YXRl KiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIFB1 dFByb3BlcnR5U2xvdCYgc2xvdCkKIHsKLSAgICByZXR1cm4gcnVudGltZU9iamVjdEN1c3RvbVB1 dChleGVjLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBpbXBsKCksIHNsb3QpOworICAgIHJldHVybiBy dW50aW1lT2JqZWN0Q3VzdG9tUHV0KGV4ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHRoaXMsIHNs b3QpOwogfQogCiBDYWxsVHlwZSBKU0hUTUxPYmplY3RFbGVtZW50OjpnZXRDYWxsRGF0YShDYWxs RGF0YSYgY2FsbERhdGEpCiB7Ci0gICAgcmV0dXJuIHJ1bnRpbWVPYmplY3RHZXRDYWxsRGF0YShp bXBsKCksIGNhbGxEYXRhKTsKKyAgICByZXR1cm4gcnVudGltZU9iamVjdEdldENhbGxEYXRhKHRo aXMsIGNhbGxEYXRhKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU1BsdWdpbkVsZW1lbnRGdW5jdGlvbnMuY3BwIGIvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU1BsdWdpbkVsZW1lbnRGdW5jdGlvbnMuY3BwCmluZGV4IDdjYzJlNjVk YjE4ODQyOTM4YTE0ZDllMzUyM2MzNTMxODRjNjY3YWMuLjZiZGM0NDAzODUwNjhlY2JhN2FmNTQ1 M2E1ODU2NzA3ZTE2Y2ZkNTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNQbHVn aW5FbGVtZW50RnVuY3Rpb25zLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUGx1Z2lu RWxlbWVudEZ1bmN0aW9ucy5jcHAKQEAgLTI0LDcgKzI0LDcgQEAKICNpbmNsdWRlICJIVE1MTmFt ZXMuaCIKICNpbmNsdWRlICJIVE1MUGx1Z0luRWxlbWVudC5oIgogI2luY2x1ZGUgIkpTSFRNTEVs ZW1lbnQuaCIKLSNpbmNsdWRlICJydW50aW1lX29iamVjdC5oIgorI2luY2x1ZGUgIlBsdWdpblZp ZXdCYXNlLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKQEAgLTQ5LDMwICs0OSw1MCBAQCBJ bnN0YW5jZSogcGx1Z2luSW5zdGFuY2UoTm9kZSogbm9kZSkKICAgICByZXR1cm4gaW5zdGFuY2U7 CiB9CiAKLXN0YXRpYyBSdW50aW1lT2JqZWN0KiBnZXRSdW50aW1lT2JqZWN0KEV4ZWNTdGF0ZSog ZXhlYywgTm9kZSogbm9kZSkKK3N0YXRpYyBKU09iamVjdCogcGx1Z2luU2NyaXB0T2JqZWN0KEV4 ZWNTdGF0ZSogZXhlYywgSlNIVE1MRWxlbWVudCoganNIVE1MRWxlbWVudCkKIHsKLSAgICBJbnN0 YW5jZSogaW5zdGFuY2UgPSBwbHVnaW5JbnN0YW5jZShub2RlKTsKLSAgICBpZiAoIWluc3RhbmNl KQorICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0ganNIVE1MRWxlbWVudC0+aW1wbCgpOworICAg IGlmICghKGVsZW1lbnQtPmhhc1RhZ05hbWUob2JqZWN0VGFnKSB8fCBlbGVtZW50LT5oYXNUYWdO YW1lKGVtYmVkVGFnKSB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKGFwcGxldFRhZykpKQogICAgICAg ICByZXR1cm4gMDsKKworICAgIEhUTUxQbHVnSW5FbGVtZW50KiBwbHVnaW5FbGVtZW50ID0gc3Rh dGljX2Nhc3Q8SFRNTFBsdWdJbkVsZW1lbnQqPihlbGVtZW50KTsKKworICAgIC8vIEZpcnN0LCBz ZWUgaWYgd2UgY2FuIGFzayB0aGUgcGx1Zy1pbiB2aWV3IGZvciBpdHMgc2NyaXB0IG9iamVjdC4K KyAgICBpZiAoV2lkZ2V0KiBwbHVnaW5XaWRnZXQgPSBwbHVnaW5FbGVtZW50LT5wbHVnaW5XaWRn ZXQoKSkgeworICAgICAgICBpZiAocGx1Z2luV2lkZ2V0LT5pc1BsdWdpblZpZXdCYXNlKCkpIHsK KyAgICAgICAgICAgIFBsdWdpblZpZXdCYXNlKiBwbHVnaW5WaWV3QmFzZSA9IHN0YXRpY19jYXN0 PFBsdWdpblZpZXdCYXNlKj4ocGx1Z2luV2lkZ2V0KTsKKyAgICAgICAgICAgIGlmIChKU09iamVj dCogc2NyaXB0T2JqZWN0ID0gcGx1Z2luVmlld0Jhc2UtPnNjcmlwdE9iamVjdChleGVjLCBqc0hU TUxFbGVtZW50LT5nbG9iYWxPYmplY3QoKSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHNjcmlw dE9iamVjdDsKKyAgICAgICAgfQorICAgIH0KKworICAgIC8vIE90aGVyd2lzZSwgZmFsbCBiYWNr IHRvIGdldHRpbmcgdGhlIG9iamVjdCBmcm9tIHRoZSBpbnN0YW5jZS4KKworICAgIC8vIFRoZSBw bHVnaW4gZWxlbWVudCBob2xkcyBhbiBvd25pbmcgcmVmZXJlbmNlLCBzbyB3ZSBkb24ndCBoYXZl IHRvLgorICAgIEluc3RhbmNlKiBpbnN0YW5jZSA9IHBsdWdpbkVsZW1lbnQtPmdldEluc3RhbmNl KCkuZ2V0KCk7CisgICAgaWYgKCFpbnN0YW5jZSB8fCAhaW5zdGFuY2UtPnJvb3RPYmplY3QoKSkK KyAgICAgICAgcmV0dXJuIDA7CisKICAgICByZXR1cm4gaW5zdGFuY2UtPmNyZWF0ZVJ1bnRpbWVP YmplY3QoZXhlYyk7CiB9Ci0KKyAgICAKIEpTVmFsdWUgcnVudGltZU9iamVjdFByb3BlcnR5R2V0 dGVyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnRpZmllciYg cHJvcGVydHlOYW1lKQogewotICAgIEpTSFRNTEVsZW1lbnQqIHRoaXNPYmogPSBzdGF0aWNfY2Fz dDxKU0hUTUxFbGVtZW50Kj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKLSAgICBIVE1MRWxlbWVudCog ZWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxFbGVtZW50Kj4odGhpc09iai0+aW1wbCgpKTsKLSAg ICBSdW50aW1lT2JqZWN0KiBydW50aW1lT2JqZWN0ID0gZ2V0UnVudGltZU9iamVjdChleGVjLCBl bGVtZW50KTsKLSAgICBpZiAoIXJ1bnRpbWVPYmplY3QpCisgICAgSlNIVE1MRWxlbWVudCogZWxl bWVudCA9IHN0YXRpY19jYXN0PEpTSFRNTEVsZW1lbnQqPihhc09iamVjdChzbG90QmFzZSkpOwor ICAgIEpTT2JqZWN0KiBzY3JpcHRPYmplY3QgPSBwbHVnaW5TY3JpcHRPYmplY3QoZXhlYywgZWxl bWVudCk7CisgICAgaWYgKCFzY3JpcHRPYmplY3QpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5l ZCgpOwotICAgIHJldHVybiBydW50aW1lT2JqZWN0LT5nZXQoZXhlYywgcHJvcGVydHlOYW1lKTsK KyAgICAKKyAgICByZXR1cm4gc2NyaXB0T2JqZWN0LT5nZXQoZXhlYywgcHJvcGVydHlOYW1lKTsK IH0KIAogYm9vbCBydW50aW1lT2JqZWN0Q3VzdG9tR2V0T3duUHJvcGVydHlTbG90KEV4ZWNTdGF0 ZSogZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmIHNs b3QsIEpTSFRNTEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgUnVudGltZU9iamVjdCogcnVudGlt ZU9iamVjdCA9IGdldFJ1bnRpbWVPYmplY3QoZXhlYywgZWxlbWVudC0+aW1wbCgpKTsKLSAgICBp ZiAoIXJ1bnRpbWVPYmplY3QpCisgICAgSlNPYmplY3QqIHNjcmlwdE9iamVjdCA9IHBsdWdpblNj cmlwdE9iamVjdChleGVjLCBlbGVtZW50KTsKKyAgICBpZiAoIXNjcmlwdE9iamVjdCkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghcnVudGltZU9iamVjdC0+aGFzUHJvcGVydHkoZXhl YywgcHJvcGVydHlOYW1lKSkKKworICAgIGlmICghc2NyaXB0T2JqZWN0LT5oYXNQcm9wZXJ0eShl eGVjLCBwcm9wZXJ0eU5hbWUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgc2xvdC5zZXRD dXN0b20oZWxlbWVudCwgcnVudGltZU9iamVjdFByb3BlcnR5R2V0dGVyKTsKICAgICByZXR1cm4g dHJ1ZTsKQEAgLTgwLDEwICsxMDAsMTAgQEAgYm9vbCBydW50aW1lT2JqZWN0Q3VzdG9tR2V0T3du UHJvcGVydHlTbG90KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHIKIAogYm9v bCBydW50aW1lT2JqZWN0Q3VzdG9tR2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKEV4ZWNTdGF0ZSog ZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eURlc2NyaXB0b3Im IGRlc2NyaXB0b3IsIEpTSFRNTEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgUnVudGltZU9iamVj dCogcnVudGltZU9iamVjdCA9IGdldFJ1bnRpbWVPYmplY3QoZXhlYywgZWxlbWVudC0+aW1wbCgp KTsKLSAgICBpZiAoIXJ1bnRpbWVPYmplY3QpCisgICAgSlNPYmplY3QqIHNjcmlwdE9iamVjdCA9 IHBsdWdpblNjcmlwdE9iamVjdChleGVjLCBlbGVtZW50KTsKKyAgICBpZiAoIXNjcmlwdE9iamVj dCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghcnVudGltZU9iamVjdC0+aGFzUHJv cGVydHkoZXhlYywgcHJvcGVydHlOYW1lKSkKKyAgICBpZiAoIXNjcmlwdE9iamVjdC0+aGFzUHJv cGVydHkoZXhlYywgcHJvcGVydHlOYW1lKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIFBy b3BlcnR5U2xvdCBzbG90OwogICAgIHNsb3Quc2V0Q3VzdG9tKGVsZW1lbnQsIHJ1bnRpbWVPYmpl Y3RQcm9wZXJ0eUdldHRlcik7CkBAIC05NCwxNCArMTE0LDE0IEBAIGJvb2wgcnVudGltZU9iamVj dEN1c3RvbUdldE93blByb3BlcnR5RGVzY3JpcHRvcihFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElk ZW50aWZpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgcnVudGltZU9iamVjdEN1c3RvbVB1 dChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgSlNWYWx1 ZSB2YWx1ZSwgSFRNTEVsZW1lbnQqIGVsZW1lbnQsIFB1dFByb3BlcnR5U2xvdCYgc2xvdCkKK2Jv b2wgcnVudGltZU9iamVjdEN1c3RvbVB1dChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZp ZXImIHByb3BlcnR5TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgSlNIVE1MRWxlbWVudCogZWxlbWVudCwg UHV0UHJvcGVydHlTbG90JiBzbG90KQogewotICAgIFJ1bnRpbWVPYmplY3QqIHJ1bnRpbWVPYmpl Y3QgPSBnZXRSdW50aW1lT2JqZWN0KGV4ZWMsIGVsZW1lbnQpOwotICAgIGlmICghcnVudGltZU9i amVjdCkKKyAgICBKU09iamVjdCogc2NyaXB0T2JqZWN0ID0gcGx1Z2luU2NyaXB0T2JqZWN0KGV4 ZWMsIGVsZW1lbnQpOworICAgIGlmICghc2NyaXB0T2JqZWN0KQogICAgICAgICByZXR1cm4gMDsK LSAgICBpZiAoIXJ1bnRpbWVPYmplY3QtPmhhc1Byb3BlcnR5KGV4ZWMsIHByb3BlcnR5TmFtZSkp CisgICAgaWYgKCFzY3JpcHRPYmplY3QtPmhhc1Byb3BlcnR5KGV4ZWMsIHByb3BlcnR5TmFtZSkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBydW50aW1lT2JqZWN0LT5wdXQoZXhlYywgcHJv cGVydHlOYW1lLCB2YWx1ZSwgc2xvdCk7CisgICAgc2NyaXB0T2JqZWN0LT5wdXQoZXhlYywgcHJv cGVydHlOYW1lLCB2YWx1ZSwgc2xvdCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTExNCw5 ICsxMzQsOSBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjYWxsUGx1Z2lu KEV4ZWNTdGF0ZSogZXhlYykKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlc3VsdCk7CiB9 CiAKLUNhbGxUeXBlIHJ1bnRpbWVPYmplY3RHZXRDYWxsRGF0YShIVE1MRWxlbWVudCogZWxlbWVu dCwgQ2FsbERhdGEmIGNhbGxEYXRhKQorQ2FsbFR5cGUgcnVudGltZU9iamVjdEdldENhbGxEYXRh KEpTSFRNTEVsZW1lbnQqIGVsZW1lbnQsIENhbGxEYXRhJiBjYWxsRGF0YSkKIHsKLSAgICBJbnN0 YW5jZSogaW5zdGFuY2UgPSBwbHVnaW5JbnN0YW5jZShlbGVtZW50KTsKKyAgICBJbnN0YW5jZSog aW5zdGFuY2UgPSBwbHVnaW5JbnN0YW5jZShlbGVtZW50LT5pbXBsKCkpOwogICAgIGlmICghaW5z dGFuY2UgfHwgIWluc3RhbmNlLT5zdXBwb3J0c0ludm9rZURlZmF1bHRNZXRob2QoKSkKICAgICAg ICAgcmV0dXJuIENhbGxUeXBlTm9uZTsKICAgICBjYWxsRGF0YS5uYXRpdmUuZnVuY3Rpb24gPSBj YWxsUGx1Z2luOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1BsdWdpbkVsZW1l bnRGdW5jdGlvbnMuaCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNQbHVnaW5FbGVtZW50RnVuY3Rp b25zLmgKaW5kZXggNzM2YWNlOWM2YTc3NDdkNTVjYWNlMWZiOTQ5ZDc1Y2FlZDFlNzNkOS4uYWNk NDk2NWYzMWI3ZGIzZDRiOGM3NjYxYjk5ZWM4NTk5NTIwN2FkNSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU1BsdWdpbkVsZW1lbnRGdW5jdGlvbnMuaAorKysgYi9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTUGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5oCkBAIC00MCw4ICs0MCw4IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICBKU0M6OkpTVmFsdWUgcnVudGltZU9iamVjdFByb3BlcnR5 R2V0dGVyKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCBjb25zdCBKU0M6OklkZW50aWZp ZXImKTsKICAgICBib29sIHJ1bnRpbWVPYmplY3RDdXN0b21HZXRPd25Qcm9wZXJ0eVNsb3QoSlND OjpFeGVjU3RhdGUqLCBjb25zdCBKU0M6OklkZW50aWZpZXImLCBKU0M6OlByb3BlcnR5U2xvdCYs IEpTSFRNTEVsZW1lbnQqKTsKICAgICBib29sIHJ1bnRpbWVPYmplY3RDdXN0b21HZXRPd25Qcm9w ZXJ0eURlc2NyaXB0b3IoSlNDOjpFeGVjU3RhdGUqLCBjb25zdCBKU0M6OklkZW50aWZpZXImLCBK U0M6OlByb3BlcnR5RGVzY3JpcHRvciYsIEpTSFRNTEVsZW1lbnQqKTsKLSAgICBib29sIHJ1bnRp bWVPYmplY3RDdXN0b21QdXQoSlNDOjpFeGVjU3RhdGUqLCBjb25zdCBKU0M6OklkZW50aWZpZXIm LCBKU0M6OkpTVmFsdWUsIEhUTUxFbGVtZW50KiwgSlNDOjpQdXRQcm9wZXJ0eVNsb3QmKTsKLSAg ICBKU0M6OkNhbGxUeXBlIHJ1bnRpbWVPYmplY3RHZXRDYWxsRGF0YShIVE1MRWxlbWVudCosIEpT Qzo6Q2FsbERhdGEmKTsKKyAgICBib29sIHJ1bnRpbWVPYmplY3RDdXN0b21QdXQoSlNDOjpFeGVj U3RhdGUqLCBjb25zdCBKU0M6OklkZW50aWZpZXImLCBKU0M6OkpTVmFsdWUsIEpTSFRNTEVsZW1l bnQqLCBKU0M6OlB1dFByb3BlcnR5U2xvdCYpOworICAgIEpTQzo6Q2FsbFR5cGUgcnVudGltZU9i amVjdEdldENhbGxEYXRhKEpTSFRNTEVsZW1lbnQqLCBKU0M6OkNhbGxEYXRhJik7CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvanNjL0JyaWRn ZUpTQy5jcHAgYi9XZWJDb3JlL2JyaWRnZS9qc2MvQnJpZGdlSlNDLmNwcAppbmRleCBkNDRjZGI1 NjI5MzExMmE0NDI2NGM0ZTUwOGNhMTkzYzVlMzQ0NDdiLi45YjNhZjI1NjdlZjVkZjM0M2U3YmUw M2RlMWI1ZTZjMTljMWE1NGI4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9qc2MvQnJpZGdl SlNDLmNwcAorKysgYi9XZWJDb3JlL2JyaWRnZS9qc2MvQnJpZGdlSlNDLmNwcApAQCAtODMsNyAr ODMsNyBAQCB2b2lkIEluc3RhbmNlOjplbmQoKQogICAgIHZpcnR1YWxFbmQoKTsKIH0KIAotUnVu dGltZU9iamVjdCogSW5zdGFuY2U6OmNyZWF0ZVJ1bnRpbWVPYmplY3QoRXhlY1N0YXRlKiBleGVj KQorSlNPYmplY3QqIEluc3RhbmNlOjpjcmVhdGVSdW50aW1lT2JqZWN0KEV4ZWNTdGF0ZSogZXhl YykKIHsKICAgICBBU1NFUlQobV9yb290T2JqZWN0KTsKICAgICBBU1NFUlQobV9yb290T2JqZWN0 LT5pc1ZhbGlkKCkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvanNjL0JyaWRnZUpTQy5o IGIvV2ViQ29yZS9icmlkZ2UvanNjL0JyaWRnZUpTQy5oCmluZGV4IGVlN2RlYjZmMTZiYWI3YTAx MGYyNGExMjcxZDQ4MThlNWU2ZmY3MTMuLjQ0Y2U0ZDEyMWVlZWFiMDViMzNkNmY4ODMwZjhkMzY1 ZGFlMDcwMWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL2pzYy9CcmlkZ2VKU0MuaAorKysg Yi9XZWJDb3JlL2JyaWRnZS9qc2MvQnJpZGdlSlNDLmgKQEAgLTg0LDcgKzg0LDcgQEAgcHVibGlj OgogICAgIHZvaWQgZW5kKCk7CiAKICAgICB2aXJ0dWFsIENsYXNzKiBnZXRDbGFzcygpIGNvbnN0 ID0gMDsKLSAgICBSdW50aW1lT2JqZWN0KiBjcmVhdGVSdW50aW1lT2JqZWN0KEV4ZWNTdGF0ZSop OworICAgIEpTT2JqZWN0KiBjcmVhdGVSdW50aW1lT2JqZWN0KEV4ZWNTdGF0ZSopOwogICAgIHZv aWQgd2lsbEludmFsaWRhdGVSdW50aW1lT2JqZWN0KCk7CiAgICAgdm9pZCB3aWxsRGVzdHJveVJ1 bnRpbWVPYmplY3QoKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVt ZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHAKaW5kZXggNDE5MzU0 NmUwYzRkNDBhZDNmYmEwNGU0M2EzOGY0OTgxNjNiZmM5ZS4uNmIxMTk2MWYwNjNhNzQ2NmZhN2Fj MzAzMzIwOGQ3OGVjZmZmYzJjOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5F bGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkVsZW1lbnQuY3BwCkBAIC05 MiwxMyArOTIsMjEgQEAgUGFzc1NjcmlwdEluc3RhbmNlIEhUTUxQbHVnSW5FbGVtZW50OjpnZXRJ bnN0YW5jZSgpIGNvbnN0CiAgICAgaWYgKG1faW5zdGFuY2UpCiAgICAgICAgIHJldHVybiBtX2lu c3RhbmNlOwogCi0gICAgUmVuZGVyV2lkZ2V0KiByZW5kZXJXaWRnZXQgPSByZW5kZXJXaWRnZXRG b3JKU0JpbmRpbmdzKCk7Ci0gICAgaWYgKHJlbmRlcldpZGdldCAmJiByZW5kZXJXaWRnZXQtPndp ZGdldCgpKQotICAgICAgICBtX2luc3RhbmNlID0gZnJhbWUtPnNjcmlwdCgpLT5jcmVhdGVTY3Jp cHRJbnN0YW5jZUZvcldpZGdldChyZW5kZXJXaWRnZXQtPndpZGdldCgpKTsKKyAgICBpZiAoV2lk Z2V0KiB3aWRnZXQgPSBwbHVnaW5XaWRnZXQoKSkKKyAgICAgICAgbV9pbnN0YW5jZSA9IGZyYW1l LT5zY3JpcHQoKS0+Y3JlYXRlU2NyaXB0SW5zdGFuY2VGb3JXaWRnZXQod2lkZ2V0KTsKIAogICAg IHJldHVybiBtX2luc3RhbmNlOwogfQogCitXaWRnZXQqIEhUTUxQbHVnSW5FbGVtZW50OjpwbHVn aW5XaWRnZXQoKSBjb25zdAoreworICAgIFJlbmRlcldpZGdldCogcmVuZGVyV2lkZ2V0ID0gcmVu ZGVyV2lkZ2V0Rm9ySlNCaW5kaW5ncygpOworICAgIGlmICghcmVuZGVyV2lkZ2V0KQorICAgICAg ICByZXR1cm4gMDsKKworICAgIHJldHVybiByZW5kZXJXaWRnZXQtPndpZGdldCgpOworfQorCiBi b29sIEhUTUxQbHVnSW5FbGVtZW50OjptYXBUb0VudHJ5KGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0 dHJOYW1lLCBNYXBwZWRBdHRyaWJ1dGVFbnRyeSYgcmVzdWx0KSBjb25zdAogewogICAgIGlmIChh dHRyTmFtZSA9PSB3aWR0aEF0dHIgfHwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MUGx1 Z0luRWxlbWVudC5oIGIvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVtZW50LmgKaW5kZXggOGI5 MDJkOWYxMTNlMzBkODU0M2ZmYzEwNDZkYzE0OTk2Y2NhZmZkMy4uYWZhNzRmYzQ1ODIwYTMxOTRm MzdkNzFlODlmZTNiNGMzYmY0MzkwNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxQbHVn SW5FbGVtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVtZW50LmgKQEAgLTMz LDYgKzMzLDcgQEAgc3RydWN0IE5QT2JqZWN0OwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFz cyBSZW5kZXJXaWRnZXQ7CitjbGFzcyBXaWRnZXQ7CiAKIGNsYXNzIEhUTUxQbHVnSW5FbGVtZW50 IDogcHVibGljIEhUTUxGcmFtZU93bmVyRWxlbWVudCB7CiBwdWJsaWM6CkBAIC00MCw2ICs0MSw4 IEBAIHB1YmxpYzoKIAogICAgIFBhc3NTY3JpcHRJbnN0YW5jZSBnZXRJbnN0YW5jZSgpIGNvbnN0 OwogCisgICAgV2lkZ2V0KiBwbHVnaW5XaWRnZXQoKSBjb25zdDsKKwogI2lmIEVOQUJMRShORVRT Q0FQRV9QTFVHSU5fQVBJKQogICAgIE5QT2JqZWN0KiBnZXROUE9iamVjdCgpOwogI2VuZGlmCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaCBiL1dlYkNvcmUvcGx1 Z2lucy9QbHVnaW5WaWV3QmFzZS5oCmluZGV4IDlkM2Y0NjMzNjY2ZDA3ZmRhMjQ5ZmY1ODc0YjFl ZjEyNDJjYmEzY2IuLjM0YjgwOGY3ZjM1Y2I4ZWZmYWQ5YTZmNjg4MDU1MWJlODNmZWFjMTIgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3QmFzZS5oCisrKyBiL1dlYkNvcmUv cGx1Z2lucy9QbHVnaW5WaWV3QmFzZS5oCkBAIC0yOCw2ICsyOCwxMiBAQAogI2luY2x1ZGUgIldp ZGdldC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXIuaCIKIAorbmFtZXNwYWNlIEpTQyB7Cisg ICAgY2xhc3MgRXhlY1N0YXRlOworICAgIGNsYXNzIEpTR2xvYmFsT2JqZWN0OworICAgIGNsYXNz IEpTT2JqZWN0OworfQorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIC8vIFBsdWdpblZpZXdCYXNl IGlzIGEgd2lkZ2V0IHRoYXQgYWxsIHBsdWctaW4gdmlld3MgaW5oZXJpdCBmcm9tLCBib3RoIGlu IFdlYmtpdCBhbmQgV2ViS2l0Mi4KQEAgLTM4LDYgKzQ0LDggQEAgcHVibGljOgogICAgIHZpcnR1 YWwgUGxhdGZvcm1MYXllciogcGxhdGZvcm1MYXllcigpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICNl bmRpZgogCisgICAgSlNDOjpKU09iamVjdCogc2NyaXB0T2JqZWN0KEpTQzo6RXhlY1N0YXRlKiwg SlNDOjpKU0dsb2JhbE9iamVjdCopIHsgcmV0dXJuIDA7IH0KKwogcHJvdGVjdGVkOgogICAgIFBs dWdpblZpZXdCYXNlKFBsYXRmb3JtV2lkZ2V0IHdpZGdldCkgOiBXaWRnZXQod2lkZ2V0KSB7IH0K ICAgICAK