87120 2012-05-22 05:30:48 -0700 Web Inspector: annotate InjectedScriptSource.js for closure compiler 2012-05-22 06:06:33 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys aandrey alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 630283 0 yurys 2012-05-22 05:30:48 -0700 As Andrey Adaikin pointed out there is call of undefined function this._isPrimitiveValue in InjectedScript.wrapObject. Errors like this can be easily caught with the compiler. 630288 1 143284 yurys 2012-05-22 05:40:24 -0700 Created attachment 143284 Patch 630293 2 143284 pfeldman 2012-05-22 05:46:18 -0700 Comment on attachment 143284 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143284&action=review > Source/WebCore/inspector/InjectedScriptExterns.js:40 > +InjectedScriptHost.prototype.storageId = function(object) {} { } > Source/WebCore/inspector/compile-injected-script.sh:32 > +java -jar ~/closure/compiler.jar\ could you merge it with the main compiler script instead? 630302 3 yurys 2012-05-22 05:56:52 -0700 (In reply to comment #2) > (From update of attachment 143284 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=143284&action=review > > > Source/WebCore/inspector/InjectedScriptExterns.js:40 > > +InjectedScriptHost.prototype.storageId = function(object) {} > > { } > Done. > > Source/WebCore/inspector/compile-injected-script.sh:32 > > +java -jar ~/closure/compiler.jar\ > > could you merge it with the main compiler script instead? Done. 630309 4 yurys 2012-05-22 06:06:33 -0700 Committed r117961: <http://trac.webkit.org/changeset/117961> 143284 2012-05-22 05:40:24 -0700 2012-05-22 05:46:17 -0700 Patch bug-87120-20120522164022.patch text/plain 11997 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQxOGVhNWU5ZGUzNWZj MzViN2RmOGRjNTkzM2NiMTdkODBkZTQ3Yi4uODBmNGRiZTNiNjc3NWQyYmZlNWNmN2RjNGFhZTMx MjFiODQxOWRiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDEyLTA1LTIyICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFubm90YXRlIEluamVjdGVkU2NyaXB0U291cmNlLmpzIGZvciBjbG9zdXJlIGNvbXBpbGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzEyMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFubm90YXRl ZCBJbmplY3RlZFNjcmlwdFNvdXJjZS5qcyBmb3IgY2xvc3VyZSBjb21waWxlci4gUmVwbGFjZWQg Y2FsbCBvZiB1bmRlZmluZWQKKyAgICAgICAgX2lzUHJpbWl0aXZlVmFsdWUgZnVuY3Rpb24gd2l0 aCBpc1ByaW1pdGl2ZVZhbHVlLgorCisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0 RXh0ZXJucy5qczogQWRkZWQuIEV4dGVybmFsIEFQSXMgdXNlZCBpbiBJbmplY3RlZFNjcmlwdFNv dXJjZS5qcworICAgICAgICAoY29uc29sZS5sb2cpOgorICAgICAgICAoSW5qZWN0ZWRTY3JpcHRI b3N0LnByb3RvdHlwZS5zdG9yYWdlSWQpOgorICAgICAgICAoSW5qZWN0ZWRTY3JpcHRIb3N0LnBy b3RvdHlwZS5mdW5jdGlvbkRldGFpbHMpOgorICAgICAgICAoSW5qZWN0ZWRTY3JpcHRIb3N0LnBy b3RvdHlwZS5pc0hUTUxBbGxDb2xsZWN0aW9uKToKKyAgICAgICAgKEluamVjdGVkU2NyaXB0SG9z dC5wcm90b3R5cGUuaW50ZXJuYWxDb25zdHJ1Y3Rvck5hbWUpOgorICAgICAgICAoSW5qZWN0ZWRT Y3JpcHRIb3N0LnByb3RvdHlwZS5jb3B5VGV4dCk6CisgICAgICAgIChJbmplY3RlZFNjcmlwdEhv c3QucHJvdG90eXBlLmNsZWFyQ29uc29sZU1lc3NhZ2VzKToKKyAgICAgICAgKEluamVjdGVkU2Ny aXB0SG9zdC5wcm90b3R5cGUuaW5zcGVjdGVkT2JqZWN0KToKKyAgICAgICAgKEluamVjdGVkU2Ny aXB0SG9zdC5wcm90b3R5cGUuZGF0YWJhc2VJZCk6CisgICAgICAgIChJbmplY3RlZFNjcmlwdEhv c3QucHJvdG90eXBlLmluc3BlY3QpOgorICAgICAgICAoSW5qZWN0ZWRTY3JpcHRIb3N0LnByb3Rv dHlwZS50eXBlKToKKyAgICAgICAgKEluamVjdGVkU2NyaXB0SG9zdC5wcm90b3R5cGUuZ2V0RXZl bnRMaXN0ZW5lcnMpOgorICAgICAgICAoSmF2YVNjcmlwdENhbGxGcmFtZS5wcm90b3R5cGUuc2Nv cGVUeXBlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanM6Cisg ICAgICAgICguKToKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1pbmplY3RlZC1zY3JpcHQu c2g6IEFkZGVkLgorCisyMDEyLTA1LTIyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21p dW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNob3cgbW9yZSBidXR0b24gbm9kZSBz aG91bGQgaGF2ZSBoZWlnaHQgbXVsdGlwbGUgb2Ygcm93IGhlaWdodAogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcxMDQKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0RXh0ZXJucy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdEV4dGVybnMuanMKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTc4 ZDdiMTMwZTY1ODIwN2ZjZjU1NzZiYjk1YmUwYjNiYzAzMzgzNwotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdEV4dGVybnMuanMKQEAgLTAs MCArMSwxMDIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1l dDoKKyAqCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l cgorICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBv ZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBi ZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRo aXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisg KgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMg QU5EIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBX QVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVE IFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJU SUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZ UklHSFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VS RU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBE QVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KKyAqLworCisvLyBXZWJLaXQgV2ViIEZhY2luZyBBUEkKK3ZhciBjb25zb2xlID0ge30KKy8q KiBAcGFyYW0gey4uLip9IHZhcmFyZyAqLworY29uc29sZS5sb2cgPSBmdW5jdGlvbih2YXJhcmcp IHt9CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKi8KK2Z1bmN0aW9uIEluamVjdGVkU2NyaXB0 SG9zdCgpIHt9CitJbmplY3RlZFNjcmlwdEhvc3QucHJvdG90eXBlLnN0b3JhZ2VJZCA9IGZ1bmN0 aW9uKG9iamVjdCkge30KKy8qKgorICogQHBhcmFtIHtGdW5jdGlvbn0gZnVuYworICovCitJbmpl Y3RlZFNjcmlwdEhvc3QucHJvdG90eXBlLmZ1bmN0aW9uRGV0YWlscyA9IGZ1bmN0aW9uKGZ1bmMp IHt9CisvKioKKyAqIEBwYXJhbSB7Kn0gb2JqZWN0CisgKi8KK0luamVjdGVkU2NyaXB0SG9zdC5w cm90b3R5cGUuaXNIVE1MQWxsQ29sbGVjdGlvbiA9IGZ1bmN0aW9uKG9iamVjdCkge30KKy8qKgor ICogQHBhcmFtIHsqfSBvYmplY3QKKyAqLworSW5qZWN0ZWRTY3JpcHRIb3N0LnByb3RvdHlwZS5p bnRlcm5hbENvbnN0cnVjdG9yTmFtZSA9IGZ1bmN0aW9uKG9iamVjdCkge30KKy8qKgorICogQHBh cmFtIHsqfSBvYmplY3QKKyAqLworSW5qZWN0ZWRTY3JpcHRIb3N0LnByb3RvdHlwZS5jb3B5VGV4 dCA9IGZ1bmN0aW9uKG9iamVjdCkge30KK0luamVjdGVkU2NyaXB0SG9zdC5wcm90b3R5cGUuY2xl YXJDb25zb2xlTWVzc2FnZXMgPSBmdW5jdGlvbigpIHt9CisvKioKKyAqIEBwYXJhbSB7bnVtYmVy fSBpbmRleAorICovCitJbmplY3RlZFNjcmlwdEhvc3QucHJvdG90eXBlLmluc3BlY3RlZE9iamVj dCA9IGZ1bmN0aW9uKGluZGV4KSB7fQorLyoqCisgKiBAcGFyYW0geyp9IG9iamVjdAorICovCitJ bmplY3RlZFNjcmlwdEhvc3QucHJvdG90eXBlLmRhdGFiYXNlSWQgPSBmdW5jdGlvbihvYmplY3Qp IHt9CisvKioKKyAqIEBwYXJhbSB7Kn0gb2JqZWN0CisgKiBAcGFyYW0ge09iamVjdH0gaGludHMK KyAqLworSW5qZWN0ZWRTY3JpcHRIb3N0LnByb3RvdHlwZS5pbnNwZWN0ID0gZnVuY3Rpb24ob2Jq ZWN0LCBoaW50cykge30KKy8qKgorICogQHBhcmFtIHsqfSBvYmplY3QKKyAqLworSW5qZWN0ZWRT Y3JpcHRIb3N0LnByb3RvdHlwZS50eXBlID0gZnVuY3Rpb24ob2JqZWN0KSB7fQorLyoqCisgKiBA cGFyYW0geyp9IG9iamVjdAorICovCitJbmplY3RlZFNjcmlwdEhvc3QucHJvdG90eXBlLmdldEV2 ZW50TGlzdGVuZXJzID0gZnVuY3Rpb24ob2JqZWN0KSB7fQorCisKKy8qKgorICogQGNvbnN0cnVj dG9yCisgKi8KK2Z1bmN0aW9uIEphdmFTY3JpcHRDYWxsRnJhbWUoKQoreworICAgIC8qKiBAdHlw ZSB7bnVtYmVyfSAqLworICAgIHRoaXMuc291cmNlSUQ7CisgICAgLyoqIEB0eXBlIHtudW1iZXJ9 ICovCisgICAgdGhpcy5saW5lOworICAgIC8qKiBAdHlwZSB7bnVtYmVyfSAqLworICAgIHRoaXMu Y29sdW1uOworICAgIC8qKiBAdHlwZSB7Kn0gKi8KKyAgICB0aGlzLnRoaXNPYmplY3Q7Cit9CisK Ky8qKgorICogQHBhcmFtIHtudW1iZXJ9IGluZGV4CisgKi8KK0phdmFTY3JpcHRDYWxsRnJhbWUu cHJvdG90eXBlLnNjb3BlVHlwZSA9IGZ1bmN0aW9uKGluZGV4KSB7fQorCisKK3ZhciBJbnNwZWN0 b3JCYWNrZW5kID0ge307CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRT Y3JpcHRTb3VyY2UuanMKaW5kZXggY2YzNGQ5YzE3M2U4NzQxMWM2MjhiZTI2YjdiZGQyNTBlYjY0 M2JjOS4uYjAzYjg5MzhhZTkxNDM0NWQ0OTUwODY0YjNiZWI2M2RlMGRmYmJmOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtMjYs MjIgKzI2LDE0IEBACiAgKiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8qKgorICogQHBhcmFtIHtJbmplY3Rl ZFNjcmlwdEhvc3R9IEluamVjdGVkU2NyaXB0SG9zdAorICovCiAoZnVuY3Rpb24gKEluamVjdGVk U2NyaXB0SG9zdCwgaW5zcGVjdGVkV2luZG93LCBpbmplY3RlZFNjcmlwdElkKSB7CiAKLWZ1bmN0 aW9uIGJpbmQodGhpc09iamVjdCwgbWVtYmVyRnVuY3Rpb24pCi17Ci0gICAgdmFyIGZ1bmMgPSBt ZW1iZXJGdW5jdGlvbjsKLSAgICB2YXIgYXJncyA9IEFycmF5LnByb3RvdHlwZS5zbGljZS5jYWxs KGFyZ3VtZW50cywgMik7Ci0gICAgZnVuY3Rpb24gYm91bmQoKQotICAgIHsKLSAgICAgICAgcmV0 dXJuIGZ1bmMuYXBwbHkodGhpc09iamVjdCwgYXJncy5jb25jYXQoQXJyYXkucHJvdG90eXBlLnNs aWNlLmNhbGwoYXJndW1lbnRzLCAwKSkpOwotICAgIH0KLSAgICBib3VuZC50b1N0cmluZyA9IGZ1 bmN0aW9uKCkgewotICAgICAgICByZXR1cm4gImJvdW5kOiAiICsgZnVuYzsKLSAgICB9OwotICAg IHJldHVybiBib3VuZDsKLX0KLQorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqLwogdmFyIEluamVj dGVkU2NyaXB0ID0gZnVuY3Rpb24oKQogewogICAgIHRoaXMuX2xhc3RCb3VuZE9iamVjdElkID0g MTsKQEAgLTcxLDcgKzYzLDcgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogCiAgICAg ICAgIHZhciByZXN1bHQgPSB7fTsKICAgICAgICAgcmVzdWx0LnR5cGUgPSB0eXBlb2Ygb2JqZWN0 OwotICAgICAgICBpZiAodGhpcy5faXNQcmltaXRpdmVWYWx1ZShvYmplY3QpKQorICAgICAgICBp ZiAodGhpcy5pc1ByaW1pdGl2ZVZhbHVlKG9iamVjdCkpCiAgICAgICAgICAgICByZXN1bHQudmFs dWUgPSBvYmplY3Q7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHJlc3VsdC5kZXNjcmlwdGlv biA9IHRoaXMuX3RvU3RyaW5nKG9iamVjdCk7CkBAIC0yMjQsNyArMjE2LDcgQEAgSW5qZWN0ZWRT Y3JpcHQucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIGRlc2NyaXB0b3JzID0gW107 CiAgICAgICAgIHZhciBuYW1lUHJvY2Vzc2VkID0ge307Ci0gICAgICAgIG5hbWVQcm9jZXNzZWQu X19wcm90b19fID0gbnVsbDsKKyAgICAgICAgbmFtZVByb2Nlc3NlZFsiX19wcm90b19fIl0gPSBu dWxsOwogICAgICAgICBmb3IgKHZhciBvID0gb2JqZWN0OyB0aGlzLl9pc0RlZmluZWQobyk7IG8g PSBvLl9fcHJvdG9fXykgewogICAgICAgICAgICAgdmFyIG5hbWVzID0gT2JqZWN0LmdldE93blBy b3BlcnR5TmFtZXMobyk7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG5hbWVzLmxl bmd0aDsgKytpKSB7CkBAIC0yNzgsNyArMjcwLDcgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdmFyIHJlc29sdmVkQXJncyA9IFtdOwogICAgICAgICAgICAgYXJn cyA9IGV2YWwoYXJncyk7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFyZ3MubGVu Z3RoOyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgb2JqZWN0SWQgPSBhcmdzW2ldLm9iamVj dElkOworICAgICAgICAgICAgICAgIG9iamVjdElkID0gYXJnc1tpXS5vYmplY3RJZDsKICAgICAg ICAgICAgICAgICBpZiAob2JqZWN0SWQpIHsKICAgICAgICAgICAgICAgICAgICAgdmFyIHBhcnNl ZEFyZ0lkID0gdGhpcy5fcGFyc2VPYmplY3RJZChvYmplY3RJZCk7CiAgICAgICAgICAgICAgICAg ICAgIGlmICghcGFyc2VkQXJnSWQgfHwgcGFyc2VkQXJnSWQuaW5qZWN0ZWRTY3JpcHRJZCAhPT0g aW5qZWN0ZWRTY3JpcHRJZCkKQEAgLTM3Miw3ICszNjQsNyBAQCBJbmplY3RlZFNjcmlwdC5wcm90 b3R5cGUgPSB7CiAgICAgX2NhbGxGcmFtZUZvcklkOiBmdW5jdGlvbih0b3BDYWxsRnJhbWUsIGNh bGxGcmFtZUlkKQogICAgIHsKICAgICAgICAgdmFyIHBhcnNlZENhbGxGcmFtZUlkID0gZXZhbCgi KCIgKyBjYWxsRnJhbWVJZCArICIpIik7Ci0gICAgICAgIHZhciBvcmRpbmFsID0gcGFyc2VkQ2Fs bEZyYW1lSWQub3JkaW5hbDsKKyAgICAgICAgdmFyIG9yZGluYWwgPSBwYXJzZWRDYWxsRnJhbWVJ ZFsib3JkaW5hbCJdOwogICAgICAgICB2YXIgY2FsbEZyYW1lID0gdG9wQ2FsbEZyYW1lOwogICAg ICAgICB3aGlsZSAoLS1vcmRpbmFsID49IDAgJiYgY2FsbEZyYW1lKQogICAgICAgICAgICAgY2Fs bEZyYW1lID0gY2FsbEZyYW1lLmNhbGxlcjsKQEAgLTQ4Miw2ICs0NzQsMTIgQEAgSW5qZWN0ZWRT Y3JpcHQucHJvdG90eXBlID0gewogCiB2YXIgaW5qZWN0ZWRTY3JpcHQgPSBuZXcgSW5qZWN0ZWRT Y3JpcHQoKTsKIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBwYXJhbSB7Kn0gb2JqZWN0Cisg KiBAcGFyYW0ge3N0cmluZz19IG9iamVjdEdyb3VwTmFtZQorICogQHBhcmFtIHtib29sZWFuPX0g Zm9yY2VWYWx1ZVR5cGUKKyAqLwogSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0ID0gZnVuY3Rp b24ob2JqZWN0LCBvYmplY3RHcm91cE5hbWUsIGZvcmNlVmFsdWVUeXBlKQogewogICAgIHRoaXMu dHlwZSA9IHR5cGVvZiBvYmplY3Q7CkBAIC01MDgsNiArNTA2LDEwIEBAIEluamVjdGVkU2NyaXB0 LlJlbW90ZU9iamVjdCA9IGZ1bmN0aW9uKG9iamVjdCwgb2JqZWN0R3JvdXBOYW1lLCBmb3JjZVZh bHVlVHlwZSkKICAgICB0aGlzLmRlc2NyaXB0aW9uID0gaW5qZWN0ZWRTY3JpcHQuX2Rlc2NyaWJl KG9iamVjdCk7CiB9CiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge251bWJlcn0g b3JkaW5hbAorICovCiBJbmplY3RlZFNjcmlwdC5DYWxsRnJhbWVQcm94eSA9IGZ1bmN0aW9uKG9y ZGluYWwsIGNhbGxGcmFtZSkKIHsKICAgICB0aGlzLmNhbGxGcmFtZUlkID0gIntcIm9yZGluYWxc IjoiICsgb3JkaW5hbCArICIsXCJpbmplY3RlZFNjcmlwdElkXCI6IiArIGluamVjdGVkU2NyaXB0 SWQgKyAifSI7CkBAIC01NDgsNiArNTUwLDkgQEAgSW5qZWN0ZWRTY3JpcHQuQ2FsbEZyYW1lUHJv eHkucHJvdG90eXBlID0gewogICAgIH0KIH0KIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqLwog ZnVuY3Rpb24gQ29tbWFuZExpbmVBUEkoY29tbWFuZExpbmVBUElJbXBsLCBjYWxsRnJhbWUpCiB7 CiAgICAgZnVuY3Rpb24gaW5TY29wZVZhcmlhYmxlcyhtZW1iZXIpCkBAIC01NjgsNyArNTczLDcg QEAgZnVuY3Rpb24gQ29tbWFuZExpbmVBUEkoY29tbWFuZExpbmVBUElJbXBsLCBjYWxsRnJhbWUp CiAgICAgICAgIGlmIChtZW1iZXIgaW4gaW5zcGVjdGVkV2luZG93IHx8IGluU2NvcGVWYXJpYWJs ZXMobWVtYmVyKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIHRoaXNbbWVtYmVy XSA9IGJpbmQoY29tbWFuZExpbmVBUElJbXBsLCBjb21tYW5kTGluZUFQSUltcGxbbWVtYmVyXSk7 CisgICAgICAgIHRoaXNbbWVtYmVyXSA9IGNvbW1hbmRMaW5lQVBJSW1wbFttZW1iZXJdLmJpbmQo Y29tbWFuZExpbmVBUElJbXBsKTsKICAgICB9CiAKICAgICBmb3IgKHZhciBpID0gMDsgaSA8IDU7 ICsraSkgewpAQCAtNTc2LDcgKzU4MSw3IEBAIGZ1bmN0aW9uIENvbW1hbmRMaW5lQVBJKGNvbW1h bmRMaW5lQVBJSW1wbCwgY2FsbEZyYW1lKQogICAgICAgICBpZiAobWVtYmVyIGluIGluc3BlY3Rl ZFdpbmRvdyB8fCBpblNjb3BlVmFyaWFibGVzKG1lbWJlcikpCiAgICAgICAgICAgICBjb250aW51 ZTsKIAotICAgICAgICB0aGlzLl9fZGVmaW5lR2V0dGVyX18oIiQiICsgaSwgYmluZChjb21tYW5k TGluZUFQSUltcGwsIGNvbW1hbmRMaW5lQVBJSW1wbC5faW5zcGVjdGVkT2JqZWN0LCBpKSk7Cisg ICAgICAgIHRoaXMuX19kZWZpbmVHZXR0ZXJfXygiJCIgKyBpLCBjb21tYW5kTGluZUFQSUltcGwu X2luc3BlY3RlZE9iamVjdC5iaW5kKGNvbW1hbmRMaW5lQVBJSW1wbCwgaSkpOwogICAgIH0KIH0K IApAQCAtNTg1LDYgKzU5MCw5IEBAIENvbW1hbmRMaW5lQVBJLm1lbWJlcnNfID0gWwogICAgICJt b25pdG9yRXZlbnRzIiwgInVubW9uaXRvckV2ZW50cyIsICJpbnNwZWN0IiwgImNvcHkiLCAiY2xl YXIiLCAiZ2V0RXZlbnRMaXN0ZW5lcnMiCiBdOwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICov CiBmdW5jdGlvbiBDb21tYW5kTGluZUFQSUltcGwoKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtaW5qZWN0ZWQtc2NyaXB0LnNoIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtaW5qZWN0ZWQtc2NyaXB0LnNoCm5ldyBmaWxlIG1vZGUg MTAwNzU1CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJk ZjZiOGI3ZTJlZmQ0NGU3Y2UxNWZhZWQxODVjOGEyMmVkMDQ4MmIKLS0tIC9kZXYvbnVsbAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1pbmplY3RlZC1zY3JpcHQuc2gKQEAg LTAsMCArMSwzOSBAQAorIyEvYmluL3NoCisjIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQor IyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAgICogUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy CisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdv b2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisjIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNl ZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisjIHRoaXMgc29m dHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisjCisjIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05U UklCVVRPUlMKKyMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9X TkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLAorIyBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyMKKyMgQ29tcGlsZXMg V2ViS2l0IFdlYiBJbnNwZWN0b3IgaW5qZWN0ZWQgc2NyaXB0LgorCitqYXZhIC1qYXIgfi9jbG9z dXJlL2NvbXBpbGVyLmphclwKKyAgICAtLXN1bW1hcnlfZGV0YWlsX2xldmVsIDNcCisgICAgLS1j b21waWxhdGlvbl9sZXZlbCBTSU1QTEVfT1BUSU1JWkFUSU9OU1wKKyAgICAtLXdhcm5pbmdfbGV2 ZWwgVkVSQk9TRVwKKyAgICAtLWxhbmd1YWdlX2luIEVDTUFTQ1JJUFQ1XAorICAgIC0tYWNjZXB0 X2NvbnN0X2tleXdvcmRcCisgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHRTb3VyY2UuanNcCisgICAgLS1leHRlcm5zIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbmplY3RlZFNjcmlwdEV4dGVybnMuanMK