16395 2007-12-10 23:09:00 -0800 Inspector needs to use cached resources 2010-10-26 08:08:08 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED http://gcep.stanford.edu/ P3 Minor --- 1 gsherloc caseq apavlov caseq loislo pfeldman timothy yurys oldest_to_newest 63899 0 gsherloc 2007-12-10 23:09:00 -0800 Go to: http://gcep.stanford.edu/ Inspect the page. Note the image generated by: http://cgi.stanford.edu/group/gcep/cgi-bin/random_image.cgi?path=images/home/rotating The version showing on the page will be different than the image show in the web inspector - thus, the web inspector must re-interrogate that url instead of using the already rendered image. 64889 1 timothy 2007-12-20 16:33:20 -0800 Yep, we need to sue the cached version and not re-fetch the image. 296763 2 apavlov 2010-10-20 06:30:09 -0700 *** Bug 47982 has been marked as a duplicate of this bug. *** 296783 3 71291 caseq 2010-10-20 07:14:44 -0700 Created attachment 71291 patch - Added base64Encoded parameter to resourceContent() in Inspector.idl - Cache resource content in resource.getContent() - Report whether content is encoded along with content in callback - Handle resource.getContent() properly if content is not yet available - Use data: url for images if resource content is available 297291 4 71405 caseq 2010-10-21 01:48:55 -0700 Created attachment 71405 patch - Fixed an attempt to retrieve content before it's available - Dropped an accidental change to Settings.js 297327 5 71405 yurys 2010-10-21 03:07:31 -0700 Comment on attachment 71405 patch View in context: https://bugs.webkit.org/attachment.cgi?id=71405&action=review > WebCore/inspector/front-end/Resource.js:621 > + if (typeof this._contentEncoded !== "undefined") May be just use a separate flag _contetRequested? > WebCore/inspector/front-end/Resource.js:635 > + if (this.frameID) { style: please remove the brackets 297338 6 71405 pfeldman 2010-10-21 03:29:20 -0700 Comment on attachment 71405 patch View in context: https://bugs.webkit.org/attachment.cgi?id=71405&action=review > WebCore/inspector/front-end/Resource.js:615 > + return "data:" + this.mimeType + (this._contentEncoded ? ";base64," : ",") + this._content; Could you please make sure it does not regress performance prior to landing? Opening slashdot / techcrunch and looking at the speed the icons show up with would be a good test. 299395 7 71867 caseq 2010-10-26 05:50:49 -0700 Created attachment 71867 patch to land - rebased - picked nits - put usage of data url in resource tree thumbnails under flag (enabled by default) 299396 8 caseq 2010-10-26 05:56:19 -0700 (In reply to comment #6) > (From update of attachment 71405 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=71405&action=review > > > WebCore/inspector/front-end/Resource.js:615 > > + return "data:" + this.mimeType + (this._contentEncoded ? ";base64," : ",") + this._content; > > Could you please make sure it does not regress performance prior to landing? Opening slashdot / techcrunch and looking at the speed the icons show up with would be a good test. There was no visual slow-down on techcrunch (with ~120 images, the average latency was ca. 500ms, 900ms worst; remote debugging mode slower by factor of ~1.3). As discussed, putting usage of data urls in resource tree thumbnails under a flag (useDataURLForResourceImageIcons). 299465 9 caseq 2010-10-26 08:08:08 -0700 Manually committed r70519: http://trac.webkit.org/changeset/70519 71291 2010-10-20 07:14:44 -0700 2010-10-21 01:48:55 -0700 patch img-resource-content.diff text/plain 12925 caseq ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTkyNWU4NC4uMWU1MjhlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAxMC0xMC0yMCAgQW5kcmV5IEtvc3lh a292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEluc3BlY3RvciBuZWVkcyB0byB1c2UgY2FjaGVkIHJlc291cmNl cyB0byBkaXNwbGF5IGltYWdlIHJlc291cmNlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Mzk1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yLmlkbDogQWRkIGJhc2U2NEVuY29kZSBwYXJhbWV0ZXIgdG8gZ2V0Q29udGVudAorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNlQ29udGVudCk6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHRl bnNpb25TZXJ2ZXIucHJvdG90eXBlLl9vbkdldFJlc291cmNlQ29udGVudCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu SW1hZ2VWaWV3LnByb3RvdHlwZS5jb250ZW50VGFiU2VsZWN0ZWQub25SZXNvdXJjZUNvbnRlbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkltYWdlVmlldy5wcm90b3R5cGUuY29udGVudFRhYlNl bGVjdGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fcmVm cmVzaE5hbWVDZWxsLik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9k ZS5wcm90b3R5cGUuX3JlZnJlc2hOYW1lQ2VsbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLnNldCBmaW5pc2hlZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldENvbnRlbnQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5nZXQgY29udGVudFVSTCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLl9yZXF1ZXN0Q29udGVudC5vblJl c291cmNlQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBl Ll9yZXF1ZXN0Q29udGVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxl bWVudC5wcm90b3R5cGUuY3JlYXRlSWNvbkVsZW1lbnQuKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUuY3JlYXRlSWNvbkVsZW1lbnQp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanM6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNvdXJjZVZpZXcucHJvdG90eXBlLnNldHVwU291cmNlRnJhbWVJZk5lZWRlZCk6CisKIDIwMTAt MTAtMTkgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmlkbCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKaW5kZXggODVj MzBhOC4uNWEyMDFmNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlk bAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCkBAIC0xMTMsNyArMTEzLDcg QEAgbW9kdWxlIGNvcmUgewogICAgICAgICBbaGFuZGxlcj1Db250cm9sbGVyXSB2b2lkIHN0b3BU aW1lbGluZVByb2ZpbGVyKCk7CiAKICAgICAgICAgW2hhbmRsZXI9UmVzb3VyY2VdIHZvaWQgY2Fj aGVkUmVzb3VyY2VzKG91dCBBcnJheSByZXNvdXJjZXMpOwotICAgICAgICBbaGFuZGxlcj1SZXNv dXJjZV0gdm9pZCByZXNvdXJjZUNvbnRlbnQoaW4gdW5zaWduZWQgbG9uZyBmcmFtZUlELCBpbiBT dHJpbmcgdXJsLCBvdXQgU3RyaW5nIGNvbnRlbnQpOworICAgICAgICBbaGFuZGxlcj1SZXNvdXJj ZV0gdm9pZCByZXNvdXJjZUNvbnRlbnQoaW4gdW5zaWduZWQgbG9uZyBmcmFtZUlELCBpbiBTdHJp bmcgdXJsLCBpbiBib29sZWFuIGJhc2U2NEVuY29kZSwgb3V0IFN0cmluZyBjb250ZW50KTsKICAg ICAgICAgW25vdGlmeV0gdm9pZCBpZGVudGlmaWVyRm9ySW5pdGlhbFJlcXVlc3Qob3V0IGxvbmcg aWRlbnRpZmllciwgb3V0IFN0cmluZyB1cmwsIG91dCB1bnNpZ25lZCBsb25nIGZyYW1lSUQsIG91 dCBib29sZWFuIGlzTWFpblJlc291cmNlKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCB3aWxsU2Vu ZFJlcXVlc3Qob3V0IGxvbmcgaWRlbnRpZmllciwgb3V0IGRvdWJsZSB0aW1lLCBvdXQgT2JqZWN0 IHJlcXVlc3QsIG91dCBPYmplY3QgcmVkaXJlY3RSZXNwb25zZSk7CiAgICAgICAgIFtub3RpZnld IHZvaWQgbWFya1Jlc291cmNlQXNDYWNoZWQob3V0IGxvbmcgaWRlbnRpZmllcik7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcCBiL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCmluZGV4IGY0OWUxZDcuLjEy MzExZWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdl bnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3Bw CkBAIC00MTAsMTMgKzQxMCwxNSBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmNhY2hl ZFJlc291cmNlcyhSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiByZXNvdXJjZXMpCiAgICAgICAgICgq cmVzb3VyY2VzKS0+cHVzaE9iamVjdChidWlsZE9iamVjdEZvckZyYW1lUmVzb3VyY2VzKGZyYW1l KSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KHVu c2lnbmVkIGxvbmcgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIFN0cmluZyogY29udGVudCkK K3ZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxv bmcgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgYmFzZTY0RW5jb2RlLCBTdHJpbmcq IGNvbnRlbnQpCiB7Ci0gICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBmcmFtZVJlc291cmNlcyA9 IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1fcGFn ZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnRyYXZlcnNlTmV4 dChtX3BhZ2UtPm1haW5GcmFtZSgpKSkgewogICAgICAgICBpZiAocmVpbnRlcnByZXRfY2FzdDx1 aW50cHRyX3Q+KGZyYW1lKSAhPSBmcmFtZUlEKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNlQ29udGVudChmcmFtZSwgS1VSTChQ YXJzZWRVUkxTdHJpbmcsIHVybCksIGNvbnRlbnQpOworICAgICAgICBpZiAoYmFzZTY0RW5jb2Rl KQorICAgICAgICAgICAgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50QmFz ZTY0KGZyYW1lLCBLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSwgY29udGVudCk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNlQ29udGVu dChmcmFtZSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIGNvbnRlbnQpOwogICAgICAgICBi cmVhazsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JS ZXNvdXJjZUFnZW50LmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmgKaW5kZXggZjBiZWFkOC4uNjk4ZmNmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clJlc291cmNlQWdlbnQuaApAQCAtOTgsNyArOTgsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBDYWxs ZWQgZnJvbSBmcm9udGVuZCAKICAgICB2b2lkIGNhY2hlZFJlc291cmNlcyhSZWZQdHI8SW5zcGVj dG9yQXJyYXk+Kik7Ci0gICAgdm9pZCByZXNvdXJjZUNvbnRlbnQodW5zaWduZWQgbG9uZyBmcmFt ZUlELCBjb25zdCBTdHJpbmcmIHVybCwgU3RyaW5nKiBjb250ZW50KTsKKyAgICB2b2lkIHJlc291 cmNlQ29udGVudCh1bnNpZ25lZCBsb25nIGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBib29s IGJhc2U2NEVuY29kZSwgU3RyaW5nKiBjb250ZW50KTsKIAogcHJpdmF0ZToKICAgICBJbnNwZWN0 b3JSZXNvdXJjZUFnZW50KFBhZ2UqIHBhZ2UsIEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCk7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVy LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwppbmRl eCA5YWI0YzBjLi41MmRlMGQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRXh0ZW5zaW9uU2VydmVyLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F eHRlbnNpb25TZXJ2ZXIuanMKQEAgLTI3Miw3ICsyNzIsNyBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5z aW9uU2VydmVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGlkczsKICAgICAgICAgdmFyIHJl c3BvbnNlID0gW107CiAKLSAgICAgICAgZnVuY3Rpb24gb25Db250ZW50QXZhaWxhYmxlKGlkLCBl bmNvZGVkLCBjb250ZW50KQorICAgICAgICBmdW5jdGlvbiBvbkNvbnRlbnRBdmFpbGFibGUoaWQs IGNvbnRlbnQsIGVuY29kZWQpCiAgICAgICAgIHsKICAgICAgICAgICAgIHZhciByZXNvdXJjZUNv bnRlbnQgPSB7CiAgICAgICAgICAgICAgICAgaWQ6IGlkLApAQCAtMjk2LDEwICsyOTYsOCBAQCBX ZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZh ciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZXNbaWRdOwogICAgICAgICAgICAgaWYg KCFyZXNvdXJjZSkKICAgICAgICAgICAgICAgICByZXNwb25zZS5wdXNoKHRoaXMuX3N0YXR1cy5F X05PVEZPVU5EKGlkKSk7Ci0gICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICB2YXIg ZW5jb2RlID0gIVdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLmlzVGV4dFR5cGUocmVzb3VyY2Uu dHlwZSk7Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmdldEVuY29kZWRSZXNvdXJjZUNv bnRlbnQoaWQsIGVuY29kZSwgb25Db250ZW50QXZhaWxhYmxlLmJpbmQodGhpcywgaWQsIGVuY29k ZSkpOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHJl c291cmNlLmdldENvbnRlbnQob25Db250ZW50QXZhaWxhYmxlLmJpbmQodGhpcywgaWQpKTsKICAg ICAgICAgfQogICAgICAgICBpZiAocmVzcG9uc2UubGVuZ3RoID09PSBpZHMubGVuZ3RoKQogICAg ICAgICAgICAgdGhpcy5fZGlzcGF0Y2hDYWxsYmFjayhtZXNzYWdlLnJlcXVlc3RJZCwgcG9ydCwg cmVzcG9uc2UpOwpAQCAtNDQ2LDggKzQ0NCwzIEBAIFdlYkluc3BlY3Rvci5hZGRFeHRlbnNpb25z ID0gZnVuY3Rpb24oZXh0ZW5zaW9ucykKIH0KIAogV2ViSW5zcGVjdG9yLmV4dGVuc2lvblNlcnZl ciA9IG5ldyBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyKCk7Ci0KLVdlYkluc3BlY3Rvci5n ZXRFbmNvZGVkUmVzb3VyY2VDb250ZW50ID0gZnVuY3Rpb24oaWRlbnRpZmllciwgZW5jb2RlLCBj YWxsYmFjaykKLXsKLSAgICBJbnNwZWN0b3JCYWNrZW5kLmdldFJlc291cmNlQ29udGVudChpZGVu dGlmaWVyLCBlbmNvZGUsIGNhbGxiYWNrKTsKLX0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SW1hZ2VWaWV3LmpzCmluZGV4IDA2Y2E0YTQuLjdjZmYwNTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0ltYWdlVmlldy5qcwpAQCAtNDksMTAgKzQ5LDE0IEBAIFdlYkluc3BlY3Rvci5J bWFnZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuaW1hZ2VQcmV2aWV3RWxlbWVu dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOwogICAgICAgICB0aGlzLmltYWdlUHJl dmlld0VsZW1lbnQuYWRkU3R5bGVDbGFzcygicmVzb3VyY2UtaW1hZ2UtdmlldyIpOwotICAgICAg ICB0aGlzLmltYWdlUHJldmlld0VsZW1lbnQuc2V0QXR0cmlidXRlKCJzcmMiLCB0aGlzLnJlc291 cmNlLnVybCk7Ci0KICAgICAgICAgdGhpcy5fY29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuaW1h Z2VQcmV2aWV3RWxlbWVudCk7CiAKKyAgICAgICAgZnVuY3Rpb24gb25SZXNvdXJjZUNvbnRlbnQo ZWxlbWVudCwgY29udGVudCkKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5pbWFnZVByZXZp ZXdFbGVtZW50LnNldEF0dHJpYnV0ZSgic3JjIiwgdGhpcy5yZXNvdXJjZS5jb250ZW50VVJMKTsK KyAgICAgICAgfQorICAgICAgICB0aGlzLnJlc291cmNlLmdldENvbnRlbnQob25SZXNvdXJjZUNv bnRlbnQuYmluZCh0aGlzKSk7CisKICAgICAgICAgdGhpcy5fY29udGFpbmVyID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5jbGFzc05hbWUg PSAiaW5mbyI7CiAgICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f Y29udGFpbmVyKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpz CmluZGV4IDhlZWQ0MjUuLmY5YTk5NjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcwpAQCAtMTQ5Niw3ICsxNDk2LDEyIEBAIFdlYkluc3BlY3Rvci5OZXR3 b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX3Jlc291cmNl LmNhdGVnb3J5ID09PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLmltYWdlcykgewog ICAgICAgICAgICAgdmFyIHByZXZpZXdJbWFnZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImlt ZyIpOwogICAgICAgICAgICAgcHJldmlld0ltYWdlLmNsYXNzTmFtZSA9ICJpbWFnZS1uZXR3b3Jr LWljb24tcHJldmlldyI7Ci0gICAgICAgICAgICBwcmV2aWV3SW1hZ2Uuc3JjID0gdGhpcy5fcmVz b3VyY2UudXJsOworICAgICAgICAgICAKKyAgICAgICAgICAgIGZ1bmN0aW9uIG9uUmVzb3VyY2VD b250ZW50KCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBwcmV2aWV3SW1hZ2Uuc3Jj ID0gdGhpcy5fcmVzb3VyY2UuY29udGVudFVSTDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IHRoaXMuX3Jlc291cmNlLmdldENvbnRlbnQob25SZXNvdXJjZUNvbnRlbnQuYmluZCh0aGlzKSk7 CiAKICAgICAgICAgICAgIHZhciBpY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwogICAgICAgICAgICAgaWNvbkVsZW1lbnQuY2xhc3NOYW1lID0gImljb24iOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IGZlMmY3ZDIuLjA3Y2U0NjYg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKQEAgLTM0LDYgKzM0LDcg QEAgV2ViSW5zcGVjdG9yLlJlc291cmNlID0gZnVuY3Rpb24oaWRlbnRpZmllciwgdXJsKQogICAg IHRoaXMuX2VuZFRpbWUgPSAtMTsKICAgICB0aGlzLl9yZXF1ZXN0TWV0aG9kID0gIiI7CiAgICAg dGhpcy5fY2F0ZWdvcnkgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLm90aGVyOwor ICAgIHRoaXMuX3BlbmRpbmdDb250ZW50Q2FsbGJhY2tzID0gW107CiB9CiAKIC8vIEtlZXAgdGhl c2UgaW4gc3luYyB3aXRoIFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlOjpUeXBlCkBAIC0yNDcs NiArMjQ4LDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAg aWYgKHgpIHsKICAgICAgICAgICAgIHRoaXMuX2NoZWNrV2FybmluZ3MoKTsKICAgICAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJmaW5pc2hlZCIpOworICAgICAgICAgICAg aWYgKHRoaXMuX3BlbmRpbmdDb250ZW50Q2FsbGJhY2tzLmxlbmd0aCkKKyAgICAgICAgICAgICAg ICB0aGlzLl9yZXF1ZXN0Q29udGVudCgpOwogICAgICAgICB9CiAgICAgfSwKIApAQCAtNTkxLDEz ICs1OTQsNDkgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmFkZE1lc3NhZ2UobXNnKTsKICAgICB9LAogCi0gICAg Z2V0Q29udGVudHM6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIGdldENvbnRlbnQ6IGZ1bmN0aW9u KGNhbGxiYWNrKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2NvbnRlbnQpIHsKKyAgICAgICAg ICAgIGNhbGxiYWNrKHRoaXMuX2NvbnRlbnQsIHRoaXMuX2NvbnRlbnRFbmNvZGVkKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICB0aGlzLl9wZW5kaW5nQ29udGVudENh bGxiYWNrcy5wdXNoKGNhbGxiYWNrKTsKKyAgICAgICAgdGhpcy5fcmVxdWVzdENvbnRlbnQoKTsK KyAgICB9LAorCisgICAgZ2V0IGNvbnRlbnRVUkwoKQorICAgIHsKKyAgICAgICAgY29uc3QgbWF4 RGF0YVVybFNpemUgPSAxMDI0ICogMTAyNDsKKyAgICAgICAgLy8gSWYgcmVzb3VyY2UgY29udGVu dCBpcyBub3QgYXZhaWxhYmxlIG9yIHdvbid0IGZpdCBhIGRhdGEgVVJMLCBmYWxsIGJhY2sgdG8g dXNpbmcgb3JpZ2luYWwgVVJMLgorICAgICAgICBpZiAoIXRoaXMuX2NvbnRlbnQgfHwgdGhpcy5f Y29udGVudC5sZW5ndGggPiBtYXhEYXRhVXJsU2l6ZSkKKyAgICAgICAgICAgIHJldHVybiB0aGlz LnVybDsKKworICAgICAgICByZXR1cm4gImRhdGE6IiArIHRoaXMubWltZVR5cGUgKyAodGhpcy5f Y29udGVudEVuY29kZWQgPyAiO2Jhc2U2NCwiIDogIiwiKSArIHRoaXMuX2NvbnRlbnQ7CisgICAg fSwKKworICAgIF9yZXF1ZXN0Q29udGVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgLy8g Q29udGVudCBtdXN0IGJlIGFscmVhZHkgcmVxdWVzdGVkLCBiYWlsIG91dC4KKyAgICAgICAgaWYg KHR5cGVvZiB0aGlzLl9jb250ZW50RW5jb2RlZCAhPT0gInVuZGVmaW5lZCIpCisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIHRoaXMuX2NvbnRlbnRFbmNvZGVkID0gIVdlYkluc3BlY3Rvci5S ZXNvdXJjZS5UeXBlLmlzVGV4dFR5cGUodGhpcy50eXBlKTsKKworICAgICAgICBmdW5jdGlvbiBv blJlc291cmNlQ29udGVudChkYXRhKQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLl9jb250 ZW50ID0gZGF0YTsKKyAgICAgICAgICAgIHZhciBjYWxsYmFja3MgPSB0aGlzLl9wZW5kaW5nQ29u dGVudENhbGxiYWNrcy5zbGljZSgpOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBj YWxsYmFja3MubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgY2FsbGJhY2tzW2ldKHRoaXMu X2NvbnRlbnQsIHRoaXMuX2NvbnRlbnRFbmNvZGVkKTsKKyAgICAgICAgICAgIHRoaXMuX3BlbmRp bmdDb250ZW50Q2FsbGJhY2tzLmxlbmd0aCA9IDA7CisgICAgICAgIH0KKwogICAgICAgICAvLyBG SVhNRTogZXZlbnR1YWxseSwgY2FjaGVkIHJlc291cmNlcyB3aWxsIGhhdmUgbm8gaWRlbnRpZmll cnMuCi0gICAgICAgIGlmICh0aGlzLmZyYW1lSUQpCi0gICAgICAgICAgICBJbnNwZWN0b3JCYWNr ZW5kLnJlc291cmNlQ29udGVudCh0aGlzLmZyYW1lSUQsIHRoaXMudXJsLCBjYWxsYmFjayk7Ci0g ICAgICAgIGVsc2UKLSAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuZ2V0UmVzb3VyY2VDb250 ZW50KHRoaXMuaWRlbnRpZmllciwgZmFsc2UsIGNhbGxiYWNrKTsKKyAgICAgICAgaWYgKHRoaXMu ZnJhbWVJRCkgeworICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5yZXNvdXJjZUNvbnRlbnQo dGhpcy5mcmFtZUlELCB0aGlzLnVybCwgdGhpcy5fY29udGVudEVuY29kZWQsIG9uUmVzb3VyY2VD b250ZW50LmJpbmQodGhpcykpOworICAgICAgICB9CisgICAgICAgIGVsc2UgeworICAgICAgICAg ICAgSW5zcGVjdG9yQmFja2VuZC5nZXRSZXNvdXJjZUNvbnRlbnQodGhpcy5pZGVudGlmaWVyLCB0 aGlzLl9jb250ZW50RW5jb2RlZCwgb25SZXNvdXJjZUNvbnRlbnQuYmluZCh0aGlzKSk7CisgICAg ICAgIH0KICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZXNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qcwppbmRleCBhZTY3YmVmLi5jZWE4MWU2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0xNzIzLDggKzE3MjMsMTIgQEAgV2Vi SW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAg ICAgaWYgKHRoaXMucmVzb3VyY2UuY2F0ZWdvcnkgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZUNh dGVnb3JpZXMuaW1hZ2VzKSB7CiAgICAgICAgICAgICB2YXIgcHJldmlld0ltYWdlID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiaW1nIik7CiAgICAgICAgICAgICBwcmV2aWV3SW1hZ2UuY2xhc3NO YW1lID0gImltYWdlLXJlc291cmNlLWljb24tcHJldmlldyI7Ci0gICAgICAgICAgICBwcmV2aWV3 SW1hZ2Uuc3JjID0gdGhpcy5yZXNvdXJjZS51cmw7CiAKKyAgICAgICAgICAgIGZ1bmN0aW9uIG9u UmVzb3VyY2VDb250ZW50KCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBwcmV2aWV3 SW1hZ2Uuc3JjID0gdGhpcy5yZXNvdXJjZS5jb250ZW50VVJMOworICAgICAgICAgICAgfQorICAg ICAgICAgICAgdGhpcy5yZXNvdXJjZS5nZXRDb250ZW50KG9uUmVzb3VyY2VDb250ZW50LmJpbmQo dGhpcykpOwogICAgICAgICAgICAgdGhpcy5pY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOwogICAgICAgICAgICAgdGhpcy5pY29uRWxlbWVudC5jbGFzc05hbWUgPSAi aWNvbiI7CiAgICAgICAgICAgICB0aGlzLmljb25FbGVtZW50LmFwcGVuZENoaWxkKHByZXZpZXdJ bWFnZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3Mu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggYzZkYTE0 ZC4uN2EzMWVkZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRp bmdzLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAt NDUsNyArNDUsNyBAQCB2YXIgUHJlZmVyZW5jZXMgPSB7CiAgICAgb25saW5lRGV0ZWN0aW9uRW5h YmxlZDogdHJ1ZSwKICAgICBuYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkOiBmYWxzZSwKICAg ICByZXNvdXJjZUV4cG9ydEVuYWJsZWQ6IGZhbHNlLAotICAgIG5ldHdvcmtQYW5lbEVuYWJsZWQ6 IGZhbHNlCisgICAgbmV0d29ya1BhbmVsRW5hYmxlZDogdHJ1ZQogfQogCiBXZWJJbnNwZWN0b3Iu U2V0dGluZ3MgPSBmdW5jdGlvbihzZXNzaW9uU2NvcGUpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VWaWV3LmpzCmluZGV4IDgwOTI1MDUuLjhmMDI0YmMgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCkBAIC04Myw3ICs4Myw3IEBAIFdlYkluc3Bl Y3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5hdHRhY2goKTsKIAog ICAgICAgICBkZWxldGUgdGhpcy5fZnJhbWVOZWVkc1NldHVwOwotICAgICAgICB0aGlzLnJlc291 cmNlLmdldENvbnRlbnRzKHRoaXMuX2NvbnRlbnRMb2FkZWQuYmluZCh0aGlzKSk7CisgICAgICAg IHRoaXMucmVzb3VyY2UuZ2V0Q29udGVudCh0aGlzLl9jb250ZW50TG9hZGVkLmJpbmQodGhpcykp OwogICAgIH0sCiAKICAgICBoYXNDb250ZW50VGFiOiBmdW5jdGlvbigpCg== 71405 2010-10-21 01:48:55 -0700 2010-10-26 05:50:49 -0700 patch img-resource-content.diff text/plain 12429 caseq ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODNmNjNjYy4uN2UwZWRmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMC0xMC0yMCAgQW5kcmV5IEtvc3lh a292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEluc3BlY3RvciBuZWVkcyB0byB1c2UgY2FjaGVkIHJlc291cmNl cyB0byBkaXNwbGF5IGltYWdlIHJlc291cmNlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Mzk1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yLmlkbDogQWRkIGJhc2U2NEVuY29kZSBwYXJhbWV0ZXIgdG8gZ2V0Q29udGVudAorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNlQ29udGVudCk6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHRl bnNpb25TZXJ2ZXIucHJvdG90eXBlLl9vbkdldFJlc291cmNlQ29udGVudCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu SW1hZ2VWaWV3LnByb3RvdHlwZS5jb250ZW50VGFiU2VsZWN0ZWQub25SZXNvdXJjZUNvbnRlbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkltYWdlVmlldy5wcm90b3R5cGUuY29udGVudFRhYlNl bGVjdGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fcmVm cmVzaE5hbWVDZWxsLik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9k ZS5wcm90b3R5cGUuX3JlZnJlc2hOYW1lQ2VsbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLnNldCBmaW5pc2hlZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldENvbnRlbnQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5nZXQgY29udGVudFVSTCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLl9yZXF1ZXN0Q29udGVudC5vblJl c291cmNlQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBl Ll9yZXF1ZXN0Q29udGVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxl bWVudC5wcm90b3R5cGUuY3JlYXRlSWNvbkVsZW1lbnQuKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUuY3JlYXRlSWNvbkVsZW1lbnQp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5zZXR1cFNvdXJjZUZyYW1lSWZOZWVk ZWQpOgorCiAyMDEwLTEwLTIwICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWls LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzAwNDAuCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmlkbAppbmRleCA4NWMzMGE4Li41YTIwMWY3IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ci5pZGwKQEAgLTExMyw3ICsxMTMsNyBAQCBtb2R1bGUgY29yZSB7CiAgICAgICAgIFtoYW5kbGVy PUNvbnRyb2xsZXJdIHZvaWQgc3RvcFRpbWVsaW5lUHJvZmlsZXIoKTsKIAogICAgICAgICBbaGFu ZGxlcj1SZXNvdXJjZV0gdm9pZCBjYWNoZWRSZXNvdXJjZXMob3V0IEFycmF5IHJlc291cmNlcyk7 Ci0gICAgICAgIFtoYW5kbGVyPVJlc291cmNlXSB2b2lkIHJlc291cmNlQ29udGVudChpbiB1bnNp Z25lZCBsb25nIGZyYW1lSUQsIGluIFN0cmluZyB1cmwsIG91dCBTdHJpbmcgY29udGVudCk7Cisg ICAgICAgIFtoYW5kbGVyPVJlc291cmNlXSB2b2lkIHJlc291cmNlQ29udGVudChpbiB1bnNpZ25l ZCBsb25nIGZyYW1lSUQsIGluIFN0cmluZyB1cmwsIGluIGJvb2xlYW4gYmFzZTY0RW5jb2RlLCBv dXQgU3RyaW5nIGNvbnRlbnQpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIGlkZW50aWZpZXJGb3JJ bml0aWFsUmVxdWVzdChvdXQgbG9uZyBpZGVudGlmaWVyLCBvdXQgU3RyaW5nIHVybCwgb3V0IHVu c2lnbmVkIGxvbmcgZnJhbWVJRCwgb3V0IGJvb2xlYW4gaXNNYWluUmVzb3VyY2UpOwogICAgICAg ICBbbm90aWZ5XSB2b2lkIHdpbGxTZW5kUmVxdWVzdChvdXQgbG9uZyBpZGVudGlmaWVyLCBvdXQg ZG91YmxlIHRpbWUsIG91dCBPYmplY3QgcmVxdWVzdCwgb3V0IE9iamVjdCByZWRpcmVjdFJlc3Bv bnNlKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCBtYXJrUmVzb3VyY2VBc0NhY2hlZChvdXQgbG9u ZyBpZGVudGlmaWVyKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJl c291cmNlQWdlbnQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dC5jcHAKaW5kZXggZjQ5ZTFkNy4uMTIzMTFlZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTQxMCwxMyArNDEwLDE1IEBAIHZvaWQgSW5zcGVj dG9yUmVzb3VyY2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VzKFJlZlB0cjxJbnNwZWN0b3JBcnJheT4q IHJlc291cmNlcykKICAgICAgICAgKCpyZXNvdXJjZXMpLT5wdXNoT2JqZWN0KGJ1aWxkT2JqZWN0 Rm9yRnJhbWVSZXNvdXJjZXMoZnJhbWUpKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFn ZW50OjpyZXNvdXJjZUNvbnRlbnQodW5zaWduZWQgbG9uZyBmcmFtZUlELCBjb25zdCBTdHJpbmcm IHVybCwgU3RyaW5nKiBjb250ZW50KQordm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXNv dXJjZUNvbnRlbnQodW5zaWduZWQgbG9uZyBmcmFtZUlELCBjb25zdCBTdHJpbmcmIHVybCwgYm9v bCBiYXNlNjRFbmNvZGUsIFN0cmluZyogY29udGVudCkKIHsKLSAgICBSZWZQdHI8SW5zcGVjdG9y QXJyYXk+IGZyYW1lUmVzb3VyY2VzID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOwogICAgIGZv ciAoRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJh bWUtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KG1fcGFnZS0+bWFpbkZyYW1lKCkpKSB7CiAgICAgICAg IGlmIChyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oZnJhbWUpICE9IGZyYW1lSUQpCiAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3Vy Y2VDb250ZW50KGZyYW1lLCBLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSwgY29udGVudCk7Cisg ICAgICAgIGlmIChiYXNlNjRFbmNvZGUpCisgICAgICAgICAgICBJbnNwZWN0b3JSZXNvdXJjZUFn ZW50OjpyZXNvdXJjZUNvbnRlbnRCYXNlNjQoZnJhbWUsIEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1 cmwpLCBjb250ZW50KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KGZyYW1lLCBLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJs KSwgY29udGVudCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJlc291cmNlQWdlbnQuaAppbmRleCBmMGJlYWQ4Li42OThmY2ZiIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCkBAIC05OCw3ICs5OCw3IEBA IHB1YmxpYzoKIAogICAgIC8vIENhbGxlZCBmcm9tIGZyb250ZW5kIAogICAgIHZvaWQgY2FjaGVk UmVzb3VyY2VzKFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qKTsKLSAgICB2b2lkIHJlc291cmNlQ29u dGVudCh1bnNpZ25lZCBsb25nIGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBTdHJpbmcqIGNv bnRlbnQpOworICAgIHZvaWQgcmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxvbmcgZnJhbWVJRCwg Y29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgYmFzZTY0RW5jb2RlLCBTdHJpbmcqIGNvbnRlbnQpOwog CiBwcml2YXRlOgogICAgIEluc3BlY3RvclJlc291cmNlQWdlbnQoUGFnZSogcGFnZSwgSW5zcGVj dG9yRnJvbnRlbmQqIGZyb250ZW5kKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RXh0ZW5zaW9uU2VydmVyLmpzCmluZGV4IDlhYjRjMGMuLjUyZGUwZDggMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKKysrIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwpAQCAtMjcyLDcgKzI3Miw3 IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlID0gewogICAgICAgICB2 YXIgaWRzOwogICAgICAgICB2YXIgcmVzcG9uc2UgPSBbXTsKIAotICAgICAgICBmdW5jdGlvbiBv bkNvbnRlbnRBdmFpbGFibGUoaWQsIGVuY29kZWQsIGNvbnRlbnQpCisgICAgICAgIGZ1bmN0aW9u IG9uQ29udGVudEF2YWlsYWJsZShpZCwgY29udGVudCwgZW5jb2RlZCkKICAgICAgICAgewogICAg ICAgICAgICAgdmFyIHJlc291cmNlQ29udGVudCA9IHsKICAgICAgICAgICAgICAgICBpZDogaWQs CkBAIC0yOTYsMTAgKzI5Niw4IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90 eXBlID0gewogICAgICAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNl c1tpZF07CiAgICAgICAgICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICAgICAgICAgIHJlc3Bv bnNlLnB1c2godGhpcy5fc3RhdHVzLkVfTk9URk9VTkQoaWQpKTsKLSAgICAgICAgICAgIGVsc2Ug ewotICAgICAgICAgICAgICAgIHZhciBlbmNvZGUgPSAhV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5 cGUuaXNUZXh0VHlwZShyZXNvdXJjZS50eXBlKTsKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuZ2V0RW5jb2RlZFJlc291cmNlQ29udGVudChpZCwgZW5jb2RlLCBvbkNvbnRlbnRBdmFpbGFi bGUuYmluZCh0aGlzLCBpZCwgZW5jb2RlKSk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBl bHNlCisgICAgICAgICAgICAgICAgcmVzb3VyY2UuZ2V0Q29udGVudChvbkNvbnRlbnRBdmFpbGFi bGUuYmluZCh0aGlzLCBpZCkpOwogICAgICAgICB9CiAgICAgICAgIGlmIChyZXNwb25zZS5sZW5n dGggPT09IGlkcy5sZW5ndGgpCiAgICAgICAgICAgICB0aGlzLl9kaXNwYXRjaENhbGxiYWNrKG1l c3NhZ2UucmVxdWVzdElkLCBwb3J0LCByZXNwb25zZSk7CkBAIC00NDYsOCArNDQ0LDMgQEAgV2Vi SW5zcGVjdG9yLmFkZEV4dGVuc2lvbnMgPSBmdW5jdGlvbihleHRlbnNpb25zKQogfQogCiBXZWJJ bnNwZWN0b3IuZXh0ZW5zaW9uU2VydmVyID0gbmV3IFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2 ZXIoKTsKLQotV2ViSW5zcGVjdG9yLmdldEVuY29kZWRSZXNvdXJjZUNvbnRlbnQgPSBmdW5jdGlv bihpZGVudGlmaWVyLCBlbmNvZGUsIGNhbGxiYWNrKQotewotICAgIEluc3BlY3RvckJhY2tlbmQu Z2V0UmVzb3VyY2VDb250ZW50KGlkZW50aWZpZXIsIGVuY29kZSwgY2FsbGJhY2spOwotfQpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ltYWdlVmlldy5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanMKaW5kZXggMDZjYTRhNC4uN2NmZjA1 NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ltYWdlVmlldy5qcwor KysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW1hZ2VWaWV3LmpzCkBAIC00OSwxMCAr NDksMTQgQEAgV2ViSW5zcGVjdG9yLkltYWdlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAg dGhpcy5pbWFnZVByZXZpZXdFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7 CiAgICAgICAgIHRoaXMuaW1hZ2VQcmV2aWV3RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJyZXNvdXJj ZS1pbWFnZS12aWV3Iik7Ci0gICAgICAgIHRoaXMuaW1hZ2VQcmV2aWV3RWxlbWVudC5zZXRBdHRy aWJ1dGUoInNyYyIsIHRoaXMucmVzb3VyY2UudXJsKTsKLQogICAgICAgICB0aGlzLl9jb250YWlu ZXIuYXBwZW5kQ2hpbGQodGhpcy5pbWFnZVByZXZpZXdFbGVtZW50KTsKIAorICAgICAgICBmdW5j dGlvbiBvblJlc291cmNlQ29udGVudChlbGVtZW50LCBjb250ZW50KQorICAgICAgICB7CisgICAg ICAgICAgICB0aGlzLmltYWdlUHJldmlld0VsZW1lbnQuc2V0QXR0cmlidXRlKCJzcmMiLCB0aGlz LnJlc291cmNlLmNvbnRlbnRVUkwpOworICAgICAgICB9CisgICAgICAgIHRoaXMucmVzb3VyY2Uu Z2V0Q29udGVudChvblJlc291cmNlQ29udGVudC5iaW5kKHRoaXMpKTsKKwogICAgICAgICB0aGlz Ll9jb250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgdGhp cy5fY29udGFpbmVyLmNsYXNzTmFtZSA9ICJpbmZvIjsKICAgICAgICAgdGhpcy5jb250ZW50RWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLl9jb250YWluZXIpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXggOGVlZDQyNS4uY2VhNWZmMSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC0xNDk2LDcgKzE0OTYs MTIgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogICAg ICAgICBpZiAodGhpcy5fcmVzb3VyY2UuY2F0ZWdvcnkgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJj ZUNhdGVnb3JpZXMuaW1hZ2VzKSB7CiAgICAgICAgICAgICB2YXIgcHJldmlld0ltYWdlID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7CiAgICAgICAgICAgICBwcmV2aWV3SW1hZ2UuY2xh c3NOYW1lID0gImltYWdlLW5ldHdvcmstaWNvbi1wcmV2aWV3IjsKLSAgICAgICAgICAgIHByZXZp ZXdJbWFnZS5zcmMgPSB0aGlzLl9yZXNvdXJjZS51cmw7CisKKyAgICAgICAgICAgIGZ1bmN0aW9u IG9uUmVzb3VyY2VDb250ZW50KCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBwcmV2 aWV3SW1hZ2Uuc3JjID0gdGhpcy5fcmVzb3VyY2UuY29udGVudFVSTDsKKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLmdldENvbnRlbnQob25SZXNvdXJjZUNvbnRlbnQu YmluZCh0aGlzKSk7CiAKICAgICAgICAgICAgIHZhciBpY29uRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICAgICAgaWNvbkVsZW1lbnQuY2xhc3NOYW1lID0g Imljb24iOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IGZlMmY3 ZDIuLmI4ZTM3ZGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKQEAg LTM0LDYgKzM0LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlID0gZnVuY3Rpb24oaWRlbnRpZmll ciwgdXJsKQogICAgIHRoaXMuX2VuZFRpbWUgPSAtMTsKICAgICB0aGlzLl9yZXF1ZXN0TWV0aG9k ID0gIiI7CiAgICAgdGhpcy5fY2F0ZWdvcnkgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29y aWVzLm90aGVyOworICAgIHRoaXMuX3BlbmRpbmdDb250ZW50Q2FsbGJhY2tzID0gW107CiB9CiAK IC8vIEtlZXAgdGhlc2UgaW4gc3luYyB3aXRoIFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlOjpU eXBlCkBAIC0yNDcsNiArMjQ4LDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9 IHsKICAgICAgICAgaWYgKHgpIHsKICAgICAgICAgICAgIHRoaXMuX2NoZWNrV2FybmluZ3MoKTsK ICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJmaW5pc2hlZCIpOwor ICAgICAgICAgICAgaWYgKHRoaXMuX3BlbmRpbmdDb250ZW50Q2FsbGJhY2tzLmxlbmd0aCkKKyAg ICAgICAgICAgICAgICB0aGlzLl9yZXF1ZXN0Q29udGVudCgpOwogICAgICAgICB9CiAgICAgfSwK IApAQCAtNTkxLDEzICs1OTQsNTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmFkZE1lc3NhZ2UobXNnKTsKICAg ICB9LAogCi0gICAgZ2V0Q29udGVudHM6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIGdldENvbnRl bnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2NvbnRlbnQp IHsKKyAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX2NvbnRlbnQsIHRoaXMuX2NvbnRlbnRFbmNv ZGVkKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICB0aGlzLl9wZW5k aW5nQ29udGVudENhbGxiYWNrcy5wdXNoKGNhbGxiYWNrKTsKKyAgICAgICAgaWYgKHRoaXMuZmlu aXNoZWQpCisgICAgICAgICAgICB0aGlzLl9yZXF1ZXN0Q29udGVudCgpOworICAgIH0sCisKKyAg ICBnZXQgY29udGVudFVSTCgpCisgICAgeworICAgICAgICBjb25zdCBtYXhEYXRhVXJsU2l6ZSA9 IDEwMjQgKiAxMDI0OworICAgICAgICAvLyBJZiByZXNvdXJjZSBjb250ZW50IGlzIG5vdCBhdmFp bGFibGUgb3Igd29uJ3QgZml0IGEgZGF0YSBVUkwsIGZhbGwgYmFjayB0byB1c2luZyBvcmlnaW5h bCBVUkwuCisgICAgICAgIGlmICghdGhpcy5fY29udGVudCB8fCB0aGlzLl9jb250ZW50Lmxlbmd0 aCA+IG1heERhdGFVcmxTaXplKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMudXJsOworCisgICAg ICAgIHJldHVybiAiZGF0YToiICsgdGhpcy5taW1lVHlwZSArICh0aGlzLl9jb250ZW50RW5jb2Rl ZCA/ICI7YmFzZTY0LCIgOiAiLCIpICsgdGhpcy5fY29udGVudDsKKyAgICB9LAorCisgICAgX3Jl cXVlc3RDb250ZW50OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICAvLyBDb250ZW50IG11c3Qg YmUgYWxyZWFkeSByZXF1ZXN0ZWQsIGJhaWwgb3V0LgorICAgICAgICBpZiAodHlwZW9mIHRoaXMu X2NvbnRlbnRFbmNvZGVkICE9PSAidW5kZWZpbmVkIikKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgdGhpcy5fY29udGVudEVuY29kZWQgPSAhV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUu aXNUZXh0VHlwZSh0aGlzLnR5cGUpOworCisgICAgICAgIGZ1bmN0aW9uIG9uUmVzb3VyY2VDb250 ZW50KGRhdGEpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRlbnQgPSBkYXRhOwor ICAgICAgICAgICAgdmFyIGNhbGxiYWNrcyA9IHRoaXMuX3BlbmRpbmdDb250ZW50Q2FsbGJhY2tz LnNsaWNlKCk7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNhbGxiYWNrcy5sZW5n dGg7ICsraSkKKyAgICAgICAgICAgICAgICBjYWxsYmFja3NbaV0odGhpcy5fY29udGVudCwgdGhp cy5fY29udGVudEVuY29kZWQpOworICAgICAgICAgICAgdGhpcy5fcGVuZGluZ0NvbnRlbnRDYWxs YmFja3MubGVuZ3RoID0gMDsKKyAgICAgICAgfQorCiAgICAgICAgIC8vIEZJWE1FOiBldmVudHVh bGx5LCBjYWNoZWQgcmVzb3VyY2VzIHdpbGwgaGF2ZSBubyBpZGVudGlmaWVycy4KLSAgICAgICAg aWYgKHRoaXMuZnJhbWVJRCkKLSAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVzb3VyY2VD b250ZW50KHRoaXMuZnJhbWVJRCwgdGhpcy51cmwsIGNhbGxiYWNrKTsKLSAgICAgICAgZWxzZQot ICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5nZXRSZXNvdXJjZUNvbnRlbnQodGhpcy5pZGVu dGlmaWVyLCBmYWxzZSwgY2FsbGJhY2spOworICAgICAgICBpZiAodGhpcy5mcmFtZUlEKSB7Cisg ICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlc291cmNlQ29udGVudCh0aGlzLmZyYW1lSUQs IHRoaXMudXJsLCB0aGlzLl9jb250ZW50RW5jb2RlZCwgb25SZXNvdXJjZUNvbnRlbnQuYmluZCh0 aGlzKSk7CisgICAgICAgIH0KKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBJbnNwZWN0b3JC YWNrZW5kLmdldFJlc291cmNlQ29udGVudCh0aGlzLmlkZW50aWZpZXIsIHRoaXMuX2NvbnRlbnRF bmNvZGVkLCBvblJlc291cmNlQ29udGVudC5iaW5kKHRoaXMpKTsKKyAgICAgICAgfQogICAgIH0K IH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1Bh bmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmlu ZGV4IGFlNjdiZWYuLmNlYTgxZTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanMKQEAgLTE3MjMsOCArMTcyMywxMiBAQCBXZWJJbnNwZWN0b3IuUmVz b3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5y ZXNvdXJjZS5jYXRlZ29yeSA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy5pbWFn ZXMpIHsKICAgICAgICAgICAgIHZhciBwcmV2aWV3SW1hZ2UgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJpbWciKTsKICAgICAgICAgICAgIHByZXZpZXdJbWFnZS5jbGFzc05hbWUgPSAiaW1hZ2Ut cmVzb3VyY2UtaWNvbi1wcmV2aWV3IjsKLSAgICAgICAgICAgIHByZXZpZXdJbWFnZS5zcmMgPSB0 aGlzLnJlc291cmNlLnVybDsKIAorICAgICAgICAgICAgZnVuY3Rpb24gb25SZXNvdXJjZUNvbnRl bnQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHByZXZpZXdJbWFnZS5zcmMgPSB0 aGlzLnJlc291cmNlLmNvbnRlbnRVUkw7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB0aGlz LnJlc291cmNlLmdldENvbnRlbnQob25SZXNvdXJjZUNvbnRlbnQuYmluZCh0aGlzKSk7CiAgICAg ICAgICAgICB0aGlzLmljb25FbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgICAgICAgICB0aGlzLmljb25FbGVtZW50LmNsYXNzTmFtZSA9ICJpY29uIjsKICAgICAg ICAgICAgIHRoaXMuaWNvbkVsZW1lbnQuYXBwZW5kQ2hpbGQocHJldmlld0ltYWdlKTsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKaW5kZXggODA5MjUwNS4uOGYwMjRi YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKQEAgLTgzLDcg KzgzLDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLmF0dGFjaCgpOwogCiAgICAgICAgIGRlbGV0ZSB0aGlzLl9mcmFtZU5lZWRzU2V0dXA7Ci0g ICAgICAgIHRoaXMucmVzb3VyY2UuZ2V0Q29udGVudHModGhpcy5fY29udGVudExvYWRlZC5iaW5k KHRoaXMpKTsKKyAgICAgICAgdGhpcy5yZXNvdXJjZS5nZXRDb250ZW50KHRoaXMuX2NvbnRlbnRM b2FkZWQuYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIGhhc0NvbnRlbnRUYWI6IGZ1bmN0aW9u KCkK 71867 2010-10-26 05:50:49 -0700 2010-10-26 05:50:49 -0700 patch to land img-from-cache text/plain 14044 caseq ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzQ4MzY0MS4uYTZiYjkxZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAxMC0xMC0yMCAgQW5kcmV5IEtvc3lh a292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2Vt aWtoYXRza3kuCisKKyAgICAgICAgSW5zcGVjdG9yIG5lZWRzIHRvIHVzZSBjYWNoZWQgcmVzb3Vy Y2VzIHRvIGRpc3BsYXkgaW1hZ2UgcmVzb3VyY2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzOTUKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3IuaWRsOiBBZGQgYmFzZTY0RW5jb2RlIHBhcmFtZXRlciB0byBnZXRDb250ZW50CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4 dGVuc2lvblNlcnZlci5wcm90b3R5cGUuX29uR2V0UmVzb3VyY2VDb250ZW50KToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ltYWdlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5JbWFnZVZpZXcucHJvdG90eXBlLmNvbnRlbnRUYWJTZWxlY3RlZC5vblJlc291cmNlQ29udGVu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSW1hZ2VWaWV3LnByb3RvdHlwZS5jb250ZW50VGFi U2VsZWN0ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBlLl9y ZWZyZXNoTmFtZUNlbGwuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWRO b2RlLnByb3RvdHlwZS5fcmVmcmVzaE5hbWVDZWxsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0IGZpbmlzaGVkKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0Q29udGVudCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCBjb250ZW50VVJMKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuX3JlcXVlc3RDb250ZW50Lm9u UmVzb3VyY2VDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5 cGUuX3JlcXVlc3RDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVF bGVtZW50LnByb3RvdHlwZS5jcmVhdGVJY29uRWxlbWVudC4pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZS5jcmVhdGVJY29uRWxlbWVu dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczogQWRkZWQgdXNl RGF0YVVSTEZvclJlc291cmNlSW1hZ2VJY29ucworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3Rv dHlwZS5zZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQpOgorCiAyMDEwLTEwLTI2ICBYYW4gTG9wZXog IDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5z b24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsIGIvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAppbmRleCAxMDdmMTU2Li4xMDk2NWRhIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5pZGwKQEAgLTExMyw3ICsxMTMsNyBAQCBtb2R1bGUgY29yZSB7CiAgICAg ICAgIFtoYW5kbGVyPUNvbnRyb2xsZXJdIHZvaWQgc3RvcFRpbWVsaW5lUHJvZmlsZXIoKTsKIAog ICAgICAgICBbaGFuZGxlcj1SZXNvdXJjZV0gdm9pZCBjYWNoZWRSZXNvdXJjZXMob3V0IE9iamVj dCByZXNvdXJjZXMpOwotICAgICAgICBbaGFuZGxlcj1SZXNvdXJjZV0gdm9pZCByZXNvdXJjZUNv bnRlbnQoaW4gdW5zaWduZWQgbG9uZyBmcmFtZUlkLCBpbiBTdHJpbmcgdXJsLCBvdXQgU3RyaW5n IGNvbnRlbnQpOworICAgICAgICBbaGFuZGxlcj1SZXNvdXJjZV0gdm9pZCByZXNvdXJjZUNvbnRl bnQoaW4gdW5zaWduZWQgbG9uZyBmcmFtZUlkLCBpbiBTdHJpbmcgdXJsLCBpbiBib29sZWFuIGJh c2U2NEVuY29kZSwgb3V0IFN0cmluZyBjb250ZW50KTsKICAgICAgICAgW25vdGlmeV0gdm9pZCBp ZGVudGlmaWVyRm9ySW5pdGlhbFJlcXVlc3Qob3V0IGxvbmcgaWRlbnRpZmllciwgb3V0IFN0cmlu ZyB1cmwsIG91dCBPYmplY3QgbG9hZGVyLCBvdXQgYm9vbGVhbiBpc01haW5SZXNvdXJjZSk7CiAg ICAgICAgIFtub3RpZnldIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KG91dCBsb25nIGlkZW50aWZpZXIs IG91dCBkb3VibGUgdGltZSwgb3V0IE9iamVjdCByZXF1ZXN0LCBvdXQgT2JqZWN0IHJlZGlyZWN0 UmVzcG9uc2UpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIG1hcmtSZXNvdXJjZUFzQ2FjaGVkKG91 dCBsb25nIGlkZW50aWZpZXIpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJj ZUFnZW50LmNwcAppbmRleCBlZTc0NTdiLi5jNzExOTc0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcApAQCAtNDMyLDEzICs0MzIsMTUgQEAgdm9pZCBJ bnNwZWN0b3JSZXNvdXJjZUFnZW50OjpjYWNoZWRSZXNvdXJjZXMoUmVmUHRyPEluc3BlY3Rvck9i amVjdD4qIG9iamVjdCkKICAgICAqb2JqZWN0ID0gYnVpbGRPYmplY3RGb3JGcmFtZVRyZWUobV9w YWdlLT5tYWluRnJhbWUoKSwgdHJ1ZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dDo6cmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxvbmcgZnJhbWVJZCwgY29uc3QgU3RyaW5nJiB1 cmwsIFN0cmluZyogY29udGVudCkKK3ZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3Vy Y2VDb250ZW50KHVuc2lnbmVkIGxvbmcgZnJhbWVJZCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wg YmFzZTY0RW5jb2RlLCBTdHJpbmcqIGNvbnRlbnQpCiB7Ci0gICAgUmVmUHRyPEluc3BlY3RvckFy cmF5PiBmcmFtZVJlc291cmNlcyA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKICAgICBmb3Ig KEZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1l LT50cmVlKCktPnRyYXZlcnNlTmV4dChtX3BhZ2UtPm1haW5GcmFtZSgpKSkgewogICAgICAgICBp ZiAocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGZyYW1lKSAhPSBmcmFtZUlkKQogICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNl Q29udGVudChmcmFtZSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIGNvbnRlbnQpOworICAg ICAgICBpZiAoYmFzZTY0RW5jb2RlKQorICAgICAgICAgICAgSW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dDo6cmVzb3VyY2VDb250ZW50QmFzZTY0KGZyYW1lLCBLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJs KSwgY29udGVudCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIEluc3BlY3RvclJlc291cmNl QWdlbnQ6OnJlc291cmNlQ29udGVudChmcmFtZSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCks IGNvbnRlbnQpOwogICAgICAgICBicmVhazsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmggYi9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKaW5kZXggZmU1MmEzYS4uOGE1NGM4OSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaApAQCAtOTgsNyArOTgsNyBAQCBw dWJsaWM6CiAKICAgICAvLyBDYWxsZWQgZnJvbSBmcm9udGVuZCAKICAgICB2b2lkIGNhY2hlZFJl c291cmNlcyhSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiopOwotICAgIHZvaWQgcmVzb3VyY2VDb250 ZW50KHVuc2lnbmVkIGxvbmcgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIFN0cmluZyogY29u dGVudCk7CisgICAgdm9pZCByZXNvdXJjZUNvbnRlbnQodW5zaWduZWQgbG9uZyBmcmFtZUlELCBj b25zdCBTdHJpbmcmIHVybCwgYm9vbCBiYXNlNjRFbmNvZGUsIFN0cmluZyogY29udGVudCk7CiAK IHByaXZhdGU6CiAgICAgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudChQYWdlKiBwYWdlLCBJbnNwZWN0 b3JGcm9udGVuZCogZnJvbnRlbmQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F eHRlbnNpb25TZXJ2ZXIuanMKaW5kZXggNGZkNjljZi4uOTM1ZTc5ZiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCkBAIC0yNzcsNyArMjc3LDcg QEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZh ciBpZHM7CiAgICAgICAgIHZhciByZXNwb25zZSA9IFtdOwogCi0gICAgICAgIGZ1bmN0aW9uIG9u Q29udGVudEF2YWlsYWJsZShpZCwgZW5jb2RlZCwgY29udGVudCkKKyAgICAgICAgZnVuY3Rpb24g b25Db250ZW50QXZhaWxhYmxlKGlkLCBjb250ZW50LCBlbmNvZGVkKQogICAgICAgICB7CiAgICAg ICAgICAgICB2YXIgcmVzb3VyY2VDb250ZW50ID0gewogICAgICAgICAgICAgICAgIGlkOiBpZCwK QEAgLTMwMSwxMCArMzAxLDggQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2Vz W2lkXTsKICAgICAgICAgICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgICAgICAgICAgcmVzcG9u c2UucHVzaCh0aGlzLl9zdGF0dXMuRV9OT1RGT1VORChpZCkpOwotICAgICAgICAgICAgZWxzZSB7 Ci0gICAgICAgICAgICAgICAgdmFyIGVuY29kZSA9ICFXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlw ZS5pc1RleHRUeXBlKHJlc291cmNlLnR5cGUpOwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5nZXRFbmNvZGVkUmVzb3VyY2VDb250ZW50KGlkLCBlbmNvZGUsIG9uQ29udGVudEF2YWlsYWJs ZS5iaW5kKHRoaXMsIGlkLCBlbmNvZGUpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICByZXNvdXJjZS5nZXRDb250ZW50KG9uQ29udGVudEF2YWlsYWJs ZS5iaW5kKHRoaXMsIGlkKSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHJlc3BvbnNlLmxlbmd0 aCA9PT0gaWRzLmxlbmd0aCkKICAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoQ2FsbGJhY2sobWVz c2FnZS5yZXF1ZXN0SWQsIHBvcnQsIHJlc3BvbnNlKTsKQEAgLTQ1MSw4ICs0NDksMyBAQCBXZWJJ bnNwZWN0b3IuYWRkRXh0ZW5zaW9ucyA9IGZ1bmN0aW9uKGV4dGVuc2lvbnMpCiB9CiAKIFdlYklu c3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZl cigpOwotCi1XZWJJbnNwZWN0b3IuZ2V0RW5jb2RlZFJlc291cmNlQ29udGVudCA9IGZ1bmN0aW9u KGlkZW50aWZpZXIsIGVuY29kZSwgY2FsbGJhY2spCi17Ci0gICAgSW5zcGVjdG9yQmFja2VuZC5n ZXRSZXNvdXJjZUNvbnRlbnQoaWRlbnRpZmllciwgZW5jb2RlLCBjYWxsYmFjayk7Ci19CmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW1hZ2VWaWV3LmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ltYWdlVmlldy5qcwppbmRleCAwNmNhNGE0Li43Y2ZmMDU2 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW1hZ2VWaWV3LmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanMKQEAgLTQ5LDEwICs0 OSwxNCBAQCBXZWJJbnNwZWN0b3IuSW1hZ2VWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0 aGlzLmltYWdlUHJldmlld0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKTsK ICAgICAgICAgdGhpcy5pbWFnZVByZXZpZXdFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNl LWltYWdlLXZpZXciKTsKLSAgICAgICAgdGhpcy5pbWFnZVByZXZpZXdFbGVtZW50LnNldEF0dHJp YnV0ZSgic3JjIiwgdGhpcy5yZXNvdXJjZS51cmwpOwotCiAgICAgICAgIHRoaXMuX2NvbnRhaW5l ci5hcHBlbmRDaGlsZCh0aGlzLmltYWdlUHJldmlld0VsZW1lbnQpOwogCisgICAgICAgIGZ1bmN0 aW9uIG9uUmVzb3VyY2VDb250ZW50KGVsZW1lbnQsIGNvbnRlbnQpCisgICAgICAgIHsKKyAgICAg ICAgICAgIHRoaXMuaW1hZ2VQcmV2aWV3RWxlbWVudC5zZXRBdHRyaWJ1dGUoInNyYyIsIHRoaXMu cmVzb3VyY2UuY29udGVudFVSTCk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5yZXNvdXJjZS5n ZXRDb250ZW50KG9uUmVzb3VyY2VDb250ZW50LmJpbmQodGhpcykpOworCiAgICAgICAgIHRoaXMu X2NvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICB0aGlz Ll9jb250YWluZXIuY2xhc3NOYW1lID0gImluZm8iOwogICAgICAgICB0aGlzLmNvbnRlbnRFbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMuX2NvbnRhaW5lcik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCA3Y2JhZDViLi45OTMwYTRjIDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTE0NTEsNyArMTQ1MSwx NSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGlmICh0aGlzLl9yZXNvdXJjZS5jYXRlZ29yeSA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNl Q2F0ZWdvcmllcy5pbWFnZXMpIHsKICAgICAgICAgICAgIHZhciBwcmV2aWV3SW1hZ2UgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKTsKICAgICAgICAgICAgIHByZXZpZXdJbWFnZS5jbGFz c05hbWUgPSAiaW1hZ2UtbmV0d29yay1pY29uLXByZXZpZXciOwotICAgICAgICAgICAgcHJldmll d0ltYWdlLnNyYyA9IHRoaXMuX3Jlc291cmNlLnVybDsKKworICAgICAgICAgICAgZnVuY3Rpb24g b25SZXNvdXJjZUNvbnRlbnQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHByZXZp ZXdJbWFnZS5zcmMgPSB0aGlzLl9yZXNvdXJjZS5jb250ZW50VVJMOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKFByZWZlcmVuY2VzLnVzZURhdGFVUkxGb3JSZXNvdXJjZUltYWdlSWNv bnMpCisgICAgICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2UuZ2V0Q29udGVudChvblJlc291cmNl Q29udGVudC5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBw cmV2aWV3SW1hZ2Uuc3JjID0gdGhpcy5fcmVzb3VyY2UudXJsOwogCiAgICAgICAgICAgICB2YXIg aWNvbkVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgICAg IGljb25FbGVtZW50LmNsYXNzTmFtZSA9ICJpY29uIjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZS5qcwppbmRleCA3MTZiNWQ3Li5mOGFjYzY4IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzCkBAIC0zNCw2ICszNCw3IEBAIFdlYkluc3BlY3Rvci5SZXNv dXJjZSA9IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHVybCkKICAgICB0aGlzLl9lbmRUaW1lID0gLTE7 CiAgICAgdGhpcy5fcmVxdWVzdE1ldGhvZCA9ICIiOwogICAgIHRoaXMuX2NhdGVnb3J5ID0gV2Vi SW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy5vdGhlcjsKKyAgICB0aGlzLl9wZW5kaW5nQ29u dGVudENhbGxiYWNrcyA9IFtdOwogfQogCiAvLyBLZWVwIHRoZXNlIGluIHN5bmMgd2l0aCBXZWJD b3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6VHlwZQpAQCAtMjU0LDYgKzI1NSw4IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh4KSB7CiAgICAgICAgICAg ICB0aGlzLl9jaGVja1dhcm5pbmdzKCk7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycygiZmluaXNoZWQiKTsKKyAgICAgICAgICAgIGlmICh0aGlzLl9wZW5kaW5nQ29u dGVudENhbGxiYWNrcy5sZW5ndGgpCisgICAgICAgICAgICAgICAgdGhpcy5fcmVxdWVzdENvbnRl bnQoKTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTYwNyw5ICs2MTAsNDMgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jb25z b2xlLmFkZE1lc3NhZ2UobXNnKTsKICAgICB9LAogCi0gICAgZ2V0Q29udGVudHM6IGZ1bmN0aW9u KGNhbGxiYWNrKQorICAgIGdldENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAg ICAgICAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5nZXRDb250ZW50cyh0aGlzLCBjYWxs YmFjayk7CisgICAgICAgIGlmICh0aGlzLl9jb250ZW50KSB7CisgICAgICAgICAgICBjYWxsYmFj ayh0aGlzLl9jb250ZW50LCB0aGlzLl9jb250ZW50RW5jb2RlZCk7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fcGVuZGluZ0NvbnRlbnRDYWxsYmFja3MucHVz aChjYWxsYmFjayk7CisgICAgICAgIGlmICh0aGlzLmZpbmlzaGVkKQorICAgICAgICAgICAgdGhp cy5fcmVxdWVzdENvbnRlbnQoKTsKKyAgICB9LAorCisgICAgZ2V0IGNvbnRlbnRVUkwoKQorICAg IHsKKyAgICAgICAgY29uc3QgbWF4RGF0YVVybFNpemUgPSAxMDI0ICogMTAyNDsKKyAgICAgICAg Ly8gSWYgcmVzb3VyY2UgY29udGVudCBpcyBub3QgYXZhaWxhYmxlIG9yIHdvbid0IGZpdCBhIGRh dGEgVVJMLCBmYWxsIGJhY2sgdG8gdXNpbmcgb3JpZ2luYWwgVVJMLgorICAgICAgICBpZiAoIXRo aXMuX2NvbnRlbnQgfHwgdGhpcy5fY29udGVudC5sZW5ndGggPiBtYXhEYXRhVXJsU2l6ZSkKKyAg ICAgICAgICAgIHJldHVybiB0aGlzLnVybDsKKworICAgICAgICByZXR1cm4gImRhdGE6IiArIHRo aXMubWltZVR5cGUgKyAodGhpcy5fY29udGVudEVuY29kZWQgPyAiO2Jhc2U2NCwiIDogIiwiKSAr IHRoaXMuX2NvbnRlbnQ7CisgICAgfSwKKworICAgIF9yZXF1ZXN0Q29udGVudDogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2NvbnRlbnRSZXF1ZXN0ZWQpCisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIHRoaXMuX2NvbnRlbnRSZXF1ZXN0ZWQgPSB0cnVlOworICAgICAg ICB0aGlzLl9jb250ZW50RW5jb2RlZCA9ICFXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5pc1Rl eHRUeXBlKHRoaXMudHlwZSk7CisKKyAgICAgICAgZnVuY3Rpb24gb25SZXNvdXJjZUNvbnRlbnQo ZGF0YSkKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5fY29udGVudCA9IGRhdGE7CisgICAg ICAgICAgICB2YXIgY2FsbGJhY2tzID0gdGhpcy5fcGVuZGluZ0NvbnRlbnRDYWxsYmFja3Muc2xp Y2UoKTsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2FsbGJhY2tzLmxlbmd0aDsg KytpKQorICAgICAgICAgICAgICAgIGNhbGxiYWNrc1tpXSh0aGlzLl9jb250ZW50LCB0aGlzLl9j b250ZW50RW5jb2RlZCk7CisgICAgICAgICAgICB0aGlzLl9wZW5kaW5nQ29udGVudENhbGxiYWNr cy5sZW5ndGggPSAwOworICAgICAgICB9CisgICAgICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZU1h bmFnZXIuZ2V0Q29udGVudCh0aGlzLCB0aGlzLl9jb250ZW50RW5jb2RlZCwgb25SZXNvdXJjZUNv bnRlbnQuYmluZCh0aGlzKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlTWFuYWdlci5qcwppbmRleCA1Y2E1NTMyLi4zM2MyNTVhIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIuanMKQEAgLTQwMSw3 ICs0MDEsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLmV4aXN0aW5nUmVzb3VyY2VW aWV3Rm9yUmVzb3VyY2UgPSBmdW5jdGlvbihyZXNvdXJjZQogICAgIHJldHVybiByZXNvdXJjZS5f cmVzb3VyY2VzVmlldzsKIH0KIAotV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5nZXRDb250 ZW50cyA9IGZ1bmN0aW9uKHJlc291cmNlLCBjYWxsYmFjaykKK1dlYkluc3BlY3Rvci5SZXNvdXJj ZU1hbmFnZXIuZ2V0Q29udGVudCA9IGZ1bmN0aW9uKHJlc291cmNlLCBiYXNlNjRFbmNvZGUsIGNh bGxiYWNrKQogewogICAgIGlmICgib3ZlcnJpZGVuQ29udGVudCIgaW4gcmVzb3VyY2UpIHsKICAg ICAgICAgY2FsbGJhY2socmVzb3VyY2Uub3ZlcnJpZGVuQ29udGVudCk7CkBAIC00MTAsOSArNDEw LDkgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5nZXRDb250ZW50cyA9IGZ1bmN0aW9u KHJlc291cmNlLCBjYWxsYmFjaykKIAogICAgIC8vIEZJWE1FOiBldmVudHVhbGx5LCBjYWNoZWQg cmVzb3VyY2VzIHdpbGwgaGF2ZSBubyBpZGVudGlmaWVycy4KICAgICBpZiAocmVzb3VyY2UubG9h ZGVyKQotICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlc291cmNlQ29udGVudChyZXNvdXJjZS5s b2FkZXIuZnJhbWVJZCwgcmVzb3VyY2UudXJsLCBjYWxsYmFjayk7CisgICAgICAgIEluc3BlY3Rv ckJhY2tlbmQucmVzb3VyY2VDb250ZW50KHJlc291cmNlLmxvYWRlci5mcmFtZUlkLCByZXNvdXJj ZS51cmwsIGJhc2U2NEVuY29kZSwgY2FsbGJhY2spOwogICAgIGVsc2UKLSAgICAgICAgSW5zcGVj dG9yQmFja2VuZC5nZXRSZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UuaWRlbnRpZmllciwgZmFsc2Us IGNhbGxiYWNrKTsKKyAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5nZXRSZXNvdXJjZUNvbnRlbnQo cmVzb3VyY2UuaWRlbnRpZmllciwgYmFzZTY0RW5jb2RlLCBjYWxsYmFjayk7CiB9CiAKIFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbCA9IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCAyY2IzOTliLi4yN2VlZjI1IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0x NjYzLDcgKzE2NjMsMTUgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMucmVzb3VyY2UuY2F0ZWdvcnkgPT09IFdl Ykluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMuaW1hZ2VzKSB7CiAgICAgICAgICAgICB2YXIg cHJldmlld0ltYWdlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7CiAgICAgICAgICAg ICBwcmV2aWV3SW1hZ2UuY2xhc3NOYW1lID0gImltYWdlLXJlc291cmNlLWljb24tcHJldmlldyI7 Ci0gICAgICAgICAgICBwcmV2aWV3SW1hZ2Uuc3JjID0gdGhpcy5yZXNvdXJjZS51cmw7CisKKyAg ICAgICAgICAgIGZ1bmN0aW9uIG9uUmVzb3VyY2VDb250ZW50KCkKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBwcmV2aWV3SW1hZ2Uuc3JjID0gdGhpcy5yZXNvdXJjZS5jb250ZW50VVJM OworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKFByZWZlcmVuY2VzLnVzZURhdGFVUkxG b3JSZXNvdXJjZUltYWdlSWNvbnMpCisgICAgICAgICAgICAgICAgdGhpcy5yZXNvdXJjZS5nZXRD b250ZW50KG9uUmVzb3VyY2VDb250ZW50LmJpbmQodGhpcykpOworICAgICAgICAgICAgZWxzZQor ICAgICAgICAgICAgICAgIHByZXZpZXdJbWFnZS5zcmMgPSB0aGlzLnJlc291cmNlLnVybDsKIAog ICAgICAgICAgICAgdGhpcy5pY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOwogICAgICAgICAgICAgdGhpcy5pY29uRWxlbWVudC5jbGFzc05hbWUgPSAiaWNvbiI7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggYzZkYTE0ZC4uYzIyY2Y3 MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAtNDUsNyArNDUs OCBAQCB2YXIgUHJlZmVyZW5jZXMgPSB7CiAgICAgb25saW5lRGV0ZWN0aW9uRW5hYmxlZDogdHJ1 ZSwKICAgICBuYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkOiBmYWxzZSwKICAgICByZXNvdXJj ZUV4cG9ydEVuYWJsZWQ6IGZhbHNlLAotICAgIG5ldHdvcmtQYW5lbEVuYWJsZWQ6IGZhbHNlCisg ICAgbmV0d29ya1BhbmVsRW5hYmxlZDogZmFsc2UsCisgICAgdXNlRGF0YVVSTEZvclJlc291cmNl SW1hZ2VJY29uczogdHJ1ZQogfQogCiBXZWJJbnNwZWN0b3IuU2V0dGluZ3MgPSBmdW5jdGlvbihz ZXNzaW9uU2NvcGUpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291 cmNlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCmlu ZGV4IDgwOTI1MDUuLjhmMDI0YmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3Vy Y2VWaWV3LmpzCkBAIC04Myw3ICs4Myw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3Rv dHlwZSA9IHsKICAgICAgICAgdGhpcy5hdHRhY2goKTsKIAogICAgICAgICBkZWxldGUgdGhpcy5f ZnJhbWVOZWVkc1NldHVwOwotICAgICAgICB0aGlzLnJlc291cmNlLmdldENvbnRlbnRzKHRoaXMu X2NvbnRlbnRMb2FkZWQuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMucmVzb3VyY2UuZ2V0Q29u dGVudCh0aGlzLl9jb250ZW50TG9hZGVkLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBoYXND b250ZW50VGFiOiBmdW5jdGlvbigpCg==