64356 2011-07-12 06:49:32 -0700 Web Inspector: InspectorResourceAgent should generate unique identifier and save cachedResource for resources from memory cache. 2011-07-14 09:59:30 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 435619 0 vsevik 2011-07-12 06:49:32 -0700 InspectorResourceAgent should generate unique identifier and save cachedResource for resources from memory cache. 436612 1 100703 vsevik 2011-07-13 12:52:41 -0700 Created attachment 100703 Patch 436948 2 100703 pfeldman 2011-07-13 23:26:54 -0700 Comment on attachment 100703 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100703&action=review > Source/WebCore/inspector/front-end/NetworkPanel.js:760 > + originalResource.networkDataRemoved = true; I don't like the fact that resource is marked as "data removed" independently on the front-end. It should be either explicit "data collected" event or we should simply return error upon backend requests in such cases. We are missing unique identifiers across processes to implement this though. 436959 3 100703 yurys 2011-07-13 23:51:26 -0700 Comment on attachment 100703 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100703&action=review > Source/WebCore/inspector/InspectorInstrumentation.h:-121 > - static void didLoadResourceFromMemoryCache(Page*, DocumentLoader*, const CachedResource*); Can we make ResourceData keep const CachedResource* instead? Inspector code shouldn't modify cached resources. 436973 4 100703 yurys 2011-07-14 00:25:17 -0700 Comment on attachment 100703 Patch Ok, I see now that the problem is in CachedResource::makePurgable call which we should be able to avoid in inspector code but it deserve its own change. 437146 5 100703 webkit.review.bot 2011-07-14 09:59:25 -0700 Comment on attachment 100703 Patch Clearing flags on attachment: 100703 Committed r91006: <http://trac.webkit.org/changeset/91006> 437147 6 webkit.review.bot 2011-07-14 09:59:30 -0700 All reviewed patches have been landed. Closing bug. 100703 2011-07-13 12:52:41 -0700 2011-07-14 09:59:25 -0700 Patch bug-64356-20110713235239.patch text/plain 13726 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTA5MTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwMjAyYzE1ZTAzNThhNmU5 YzVhZjkzNzBmYTgxMTMyNzQ4OWI2M2ZlLi43NDk2YWNhNjRkYTJkN2Y5YjUxNDRlMjA4NjcwMjA0 Y2IwMmY3ODFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDctMTMgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCBzaG91bGQgZ2VuZXJhdGUgdW5pcXVlIGlkZW50aWZp ZXIgYW5kIHNhdmUgY2FjaGVkUmVzb3VyY2UgZm9yIHJlc291cmNlcyBmcm9tIG1lbW9yeSBjYWNo ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MzU2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3Ry dW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZUltcGwpOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5 Q2FjaGUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50Lmg6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUucmVxdWVzdENvbnRlbnQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUucmVzb3VyY2VMb2FkZWRGcm9tTWVt b3J5Q2FjaGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3Rv dHlwZS5fYXBwZW5kUmVkaXJlY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3Rv dHlwZS5fZnJhbWVOYXZpZ2F0ZWQpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3VyY2VGcm9tTWVtb3J5 Q2FjaGUpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDExLTA3LTEzICBK b2huIEtub3R0ZW5iZWx0ICA8amtub3R0ZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlZmVy ZW5jZSBHZW9sb2NhdGlvbiBvYmplY3QgZnJvbSBHZW9Ob3RpZmllciBhbmQgR2VvbG9jYXRpb246 OnNldElzQWxsb3dlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRl eCA2ODZhYTRkNTRjYzBhMzIyZDgwMDBkZjNmMzYyZjYyNmM0OWI1OWVjLi40MGVlNTg3MGQ1MWRh ZjMwMzA4NzAwYWZhYjhhODM3OTRhODljNjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uCkBAIC01NzMsNiArNTczLDcgQEAKICAgICAgICAgICAgICAgICAibmFtZSI6 ICJyZXNvdXJjZUxvYWRlZEZyb21NZW1vcnlDYWNoZSIsCiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIkZpcmVkIHdoZW4gSFRUUCByZXF1ZXN0IGhhcyBiZWVuIHNlcnZlZCBmcm9tIG1l bW9yeSBjYWNoZS4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWworICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRl c2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiZnJhbWVJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJG cmFtZSBpZGVudGlmaWVyLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsb2Fk ZXJJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJMb2FkZXIgaWRlbnRpZmll ci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRVUkwiLCAidHlw ZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRoZSBkb2N1bWVudCB0aGlzIHJl c291cmNlIGlzIGxvYWRlZCBmb3IuIiB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAppbmRleCBkNGIzNjYwYTFiMjkzOGU3 ZWY2NTU0OTAzM2Q5MTQ3YTAyMTViMzI4Li42MjY0YzQxMzhlZmE2N2YzOTQ0YWNmZWQxMTI2MGI2 NzhkMzkzZGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmNwcApAQCAtNDIyLDcgKzQyMiw3IEBAIHZvaWQgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjptYXJrUmVzb3VyY2VBc0NhY2hlZEltcGwoSW5zdHJ1bWVudGluZ0Fn ZW50cyogaW5zCiAgICAgICAgIHJlc291cmNlQWdlbnQtPm1hcmtSZXNvdXJjZUFzQ2FjaGVkKGlk ZW50aWZpZXIpOwogfQogCi12b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkTG9hZFJl c291cmNlRnJvbU1lbW9yeUNhY2hlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50 aW5nQWdlbnRzLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBDYWNoZWRSZXNvdXJjZSog Y2FjaGVkUmVzb3VyY2UpCit2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkTG9hZFJl c291cmNlRnJvbU1lbW9yeUNhY2hlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50 aW5nQWdlbnRzLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBDYWNoZWRSZXNvdXJjZSogY2FjaGVk UmVzb3VyY2UpCiB7CiAgICAgSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50ID0gaW5zdHJ1 bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yQWdlbnQoKTsKICAgICBpZiAoIWluc3BlY3RvckFnZW50 IHx8ICFpbnNwZWN0b3JBZ2VudC0+ZW5hYmxlZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmluZGV4IGUzZTMyNzRjOGUxNjg3 YzI3YzBjYzU0ZmQ2Mjk0MGIzZGRjNDIyMDcuLjVlNjA2Y2NjZTBmM2Y1YzgzYTcxZTNiOTFkYTI4 YjkzZjVkMjRkMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmgKQEAgLTExOCw3ICsxMTgsNyBAQCBwdWJsaWM6CiAgICAgc3Rh dGljIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KEZyYW1lKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBEb2N1bWVudExvYWRlciosIFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlZGlyZWN0UmVzcG9uc2UpOwogICAgIHN0YXRpYyB2b2lkIGNvbnRpbnVlQWZ0ZXJQaW5n TG9hZGVyKEZyYW1lKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlcios IFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICBzdGF0aWMg dm9pZCBtYXJrUmVzb3VyY2VBc0NhY2hlZChQYWdlKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy KTsKLSAgICBzdGF0aWMgdm9pZCBkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoUGFnZSos IERvY3VtZW50TG9hZGVyKiwgY29uc3QgQ2FjaGVkUmVzb3VyY2UqKTsKKyAgICBzdGF0aWMgdm9p ZCBkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoUGFnZSosIERvY3VtZW50TG9hZGVyKiwg Q2FjaGVkUmVzb3VyY2UqKTsKICAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29v a2llIHdpbGxSZWNlaXZlUmVzb3VyY2VEYXRhKEZyYW1lKiwgdW5zaWduZWQgbG9uZyBpZGVudGlm aWVyKTsKICAgICBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlUmVzb3VyY2VEYXRhKGNvbnN0IEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYpOwogICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb25Db29raWUgd2lsbFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKEZyYW1lKiwgdW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CkBAIC0yNDUsNyAr MjQ1LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCB3aWxsU2VuZFJlcXVlc3RJbXBsKElu c3RydW1lbnRpbmdBZ2VudHMqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9h ZGVyKiwgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RS ZXNwb25zZSk7CiAgICAgc3RhdGljIHZvaWQgY29udGludWVBZnRlclBpbmdMb2FkZXJJbXBsKElu c3RydW1lbnRpbmdBZ2VudHMqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9h ZGVyKiwgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHN0 YXRpYyB2b2lkIG1hcmtSZXNvdXJjZUFzQ2FjaGVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKLSAgICBzdGF0aWMgdm9pZCBkaWRMb2FkUmVzb3Vy Y2VGcm9tTWVtb3J5Q2FjaGVJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBEb2N1bWVudExvYWRl ciosIGNvbnN0IENhY2hlZFJlc291cmNlKik7CisgICAgc3RhdGljIHZvaWQgZGlkTG9hZFJlc291 cmNlRnJvbU1lbW9yeUNhY2hlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwgRG9jdW1lbnRMb2Fk ZXIqLCBDYWNoZWRSZXNvdXJjZSopOwogICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b25Db29raWUgd2lsbFJlY2VpdmVSZXNvdXJjZURhdGFJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMq LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpOwogICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVS ZXNvdXJjZURhdGFJbXBsKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYpOwog ICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbFJlY2VpdmVSZXNv dXJjZVJlc3BvbnNlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwgdW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CkBAIC02OTYsNyArNjk2LDcgQEAgaW5s aW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjptYXJrUmVzb3VyY2VBc0NhY2hlZChQ YWdlKiBwYWdlLCB1bnNpZ25lZAogI2VuZGlmCiB9CiAKLWlubGluZSB2b2lkIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKFBhZ2UqIHBhZ2Us IERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkK K2lubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkTG9hZFJlc291cmNlRnJv bU1lbW9yeUNhY2hlKFBhZ2UqIHBhZ2UsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIENhY2hlZFJl c291cmNlKiByZXNvdXJjZSkKIHsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChJbnN0 cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50 c0ZvclBhZ2UocGFnZSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggYWZmYzI1ZjBiNjQwODU3MDg3OTQyZjUyYzUyYTFl Y2E4ZDU4YzBhMi4uNGQ1MGRjNzZhMjdjMzMxYWQzMGI2NGUxODUxYTRhOTkyNzBiZDZlYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmNwcApAQCAtNTEsNiArNTEsNyBAQAogI2luY2x1ZGUgIkluc3RydW1lbnRpbmdBZ2VudHMuaCIK ICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSAiTmV0d29ya1Jlc291cmNlc0RhdGEuaCIKKyNp bmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUHJvZ3Jlc3NUcmFja2VyLmgiCiAjaW5jbHVkZSAi UmVzb3VyY2VFcnJvci5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgpAQCAtMjkxLDkg KzI5MiwxNSBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZEZhaWxMb2FkaW5nKHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMbwogICAgIG1fZnJvbnRlbmQtPmxvYWRp bmdGYWlsZWQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUoKSwgZXJy b3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSwgZXJyb3IuaXNDYW5jZWxsYXRpb24oKSk7CiB9CiAK LXZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNh Y2hlKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IENhY2hlZFJlc291cmNlKiByZXNvdXJj ZSkKK3ZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9y eUNhY2hlKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkK IHsKLSAgICBtX2Zyb250ZW5kLT5yZXNvdXJjZUxvYWRlZEZyb21NZW1vcnlDYWNoZShtX3BhZ2VB Z2VudC0+ZnJhbWVJZChsb2FkZXItPmZyYW1lKCkpLCBtX3BhZ2VBZ2VudC0+bG9hZGVySWQobG9h ZGVyKSwgbG9hZGVyLT51cmwoKS5zdHJpbmcoKSwgY3VycmVudFRpbWUoKSwgYnVpbGRPYmplY3RG b3JDYWNoZWRSZXNvdXJjZSgqcmVzb3VyY2UpKTsKKyAgICBTdHJpbmcgbG9hZGVySWQgPSBtX3Bh Z2VBZ2VudC0+bG9hZGVySWQobG9hZGVyKTsKKyAgICBTdHJpbmcgZnJhbWVJZCA9IG1fcGFnZUFn ZW50LT5mcmFtZUlkKGxvYWRlci0+ZnJhbWUoKSk7CisgICAgdW5zaWduZWQgbG9uZyBpZGVudGlm aWVyID0gbG9hZGVyLT5mcmFtZSgpLT5wYWdlKCktPnByb2dyZXNzKCktPmNyZWF0ZVVuaXF1ZUlk ZW50aWZpZXIoKTsKKyAgICBtX3Jlc291cmNlc0RhdGEtPnJlc291cmNlQ3JlYXRlZChpZGVudGlm aWVyLCBsb2FkZXJJZCk7CisgICAgbV9yZXNvdXJjZXNEYXRhLT5hZGRDYWNoZWRSZXNvdXJjZShp ZGVudGlmaWVyLCByZXNvdXJjZSk7CisKKyAgICBtX2Zyb250ZW5kLT5yZXNvdXJjZUxvYWRlZEZy b21NZW1vcnlDYWNoZShzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpLCBmcmFtZUlkLCBsb2Fk ZXJJZCwgbG9hZGVyLT51cmwoKS5zdHJpbmcoKSwgY3VycmVudFRpbWUoKSwgYnVpbGRPYmplY3RG b3JDYWNoZWRSZXNvdXJjZSgqcmVzb3VyY2UpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJj ZUFnZW50OjpzZXRJbml0aWFsU2NyaXB0Q29udGVudCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IGNvbnN0IFN0cmluZyYgc291cmNlU3RyaW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKaW5kZXggOTAzMmI0NzljMGQyMzdiMTFjYzA3 MWFmMWIzODQyMTE1ZjRlNjM1Yy4uZDY3Mzk5MzY1NGIxNGZlNDdhMTFhOGYxYmE3MTA5Y2FjNjY1 YmViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291 cmNlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudC5oCkBAIC05NCw3ICs5NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZFJlY2VpdmVE YXRhKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgY2hhciogZGF0YSwgaW50IGRhdGFM ZW5ndGgsIGludCBlbmNvZGVkRGF0YUxlbmd0aCk7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkaW5n KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqLCBkb3VibGUgZmluaXNo VGltZSk7CiAgICAgdm9pZCBkaWRGYWlsTG9hZGluZyh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IERvY3VtZW50TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VFcnJvciYpOwotICAgIHZvaWQgZGlkTG9h ZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKERvY3VtZW50TG9hZGVyKiwgY29uc3QgQ2FjaGVkUmVz b3VyY2UqKTsKKyAgICB2b2lkIGRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShEb2N1bWVu dExvYWRlciosIENhY2hlZFJlc291cmNlKik7CiAgICAgdm9pZCBtYWluRnJhbWVOYXZpZ2F0ZWQo RG9jdW1lbnRMb2FkZXIqKTsKICAgICB2b2lkIHNldEluaXRpYWxTY3JpcHRDb250ZW50KHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcpOwogICAgIHZv aWQgc2V0SW5pdGlhbFhIUkNvbnRlbnQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBT dHJpbmcmIHNvdXJjZVN0cmluZyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwppbmRleCAwMjk2MTlmYTA4MmQyNzk1MzIzMGI0 YzJhYjY0MDU0MTE0ZDg0YjZlLi4wMjljMzk3ZmE4NDAwZWU2YmVlNTkwM2E2NWU0YzUwYTE1Y2M0 NDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya01hbmFnZXIuanMKQEAgLTUzLDcgKzUzLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5h Z2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgICAgICAvLyBGSVhNRTogaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxMzYzIFdlIHNob3VsZCBzZXBhcmF0ZSBO ZXR3b3JrUmVzb3VyY2UgKE5ldHdvcmtQYW5lbCByZXNvdXJjZSkgCiAgICAgICAgIC8vIGZyb20g UmVzb3VyY2VSZXZpc2lvbiAoUmVzb3VyY2VzUGFuZWwvU2NyaXB0c1BhbmVsIHJlc291cmNlKSBh bmQgcmVxdWVzdCBjb250ZW50IGFjY29yZGluZ2x5LgotICAgICAgICBpZiAocmVzb3VyY2UuaGFz TmV0d29ya0RhdGEpCisgICAgICAgIGlmIChyZXNvdXJjZS5pZGVudGlmaWVyICYmICFyZXNvdXJj ZS5uZXR3b3JrRGF0YVJlbW92ZWQpCiAgICAgICAgICAgICBOZXR3b3JrQWdlbnQuZ2V0UmVzb3Vy Y2VDb250ZW50KHJlc291cmNlLmlkZW50aWZpZXIsIGNhbGxiYWNrV3JhcHBlcik7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIFBhZ2VBZ2VudC5nZXRSZXNvdXJjZUNvbnRlbnQocmVzb3VyY2Uu ZnJhbWVJZCwgcmVzb3VyY2UudXJsLCBjYWxsYmFja1dyYXBwZXIpOwpAQCAtNzIsNyArNzIsNiBA QCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIgPSBmdW5jdGlvbihtYW5hZ2VyKQogICAg IHRoaXMuX21hbmFnZXIgPSBtYW5hZ2VyOwogICAgIHRoaXMuX2luZmxpZ2h0UmVzb3VyY2VzQnlJ ZCA9IHt9OwogICAgIHRoaXMuX2luZmxpZ2h0UmVzb3VyY2VzQnlVUkwgPSB7fTsKLSAgICB0aGlz Ll9sYXN0SWRlbnRpZmllckZvckNhY2hlZFJlc291cmNlID0gMDsKICAgICBJbnNwZWN0b3JCYWNr ZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlcigiTmV0d29yayIsIHRoaXMpOwogfQogCkBAIC0y MDQsOSArMjAzLDkgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy5fZmluaXNoUmVzb3VyY2UocmVzb3VyY2UsIHRpbWUpOwogICAgIH0s CiAKLSAgICByZXNvdXJjZUxvYWRlZEZyb21NZW1vcnlDYWNoZTogZnVuY3Rpb24oZnJhbWVJZCwg bG9hZGVySWQsIGRvY3VtZW50VVJMLCB0aW1lLCBjYWNoZWRSZXNvdXJjZSkKKyAgICByZXNvdXJj ZUxvYWRlZEZyb21NZW1vcnlDYWNoZTogZnVuY3Rpb24oaWRlbnRpZmllciwgZnJhbWVJZCwgbG9h ZGVySWQsIGRvY3VtZW50VVJMLCB0aW1lLCBjYWNoZWRSZXNvdXJjZSkKICAgICB7Ci0gICAgICAg IHZhciByZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKCJjYWNoZWQ6IiArICsrdGhpcy5f bGFzdElkZW50aWZpZXJGb3JDYWNoZWRSZXNvdXJjZSwgZnJhbWVJZCwgbG9hZGVySWQsIGNhY2hl ZFJlc291cmNlLnVybCwgZG9jdW1lbnRVUkwpOworICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlz Ll9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCBmcmFtZUlkLCBsb2FkZXJJZCwgY2FjaGVkUmVz b3VyY2UudXJsLCBkb2N1bWVudFVSTCk7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0 aENhY2hlZFJlc291cmNlKHJlc291cmNlLCBjYWNoZWRSZXNvdXJjZSk7CiAgICAgICAgIHJlc291 cmNlLmNhY2hlZCA9IHRydWU7CiAgICAgICAgIHJlc291cmNlLnJlcXVlc3RNZXRob2QgPSAiR0VU IjsKQEAgLTI3Niw3ICsyNzUsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJv dG90eXBlID0gewogICAgICAgICB2YXIgcHJldmlvdXNSZWRpcmVjdHMgPSBvcmlnaW5hbFJlc291 cmNlLnJlZGlyZWN0cyB8fCBbXTsKICAgICAgICAgb3JpZ2luYWxSZXNvdXJjZS5pZGVudGlmaWVy ID0gInJlZGlyZWN0ZWQ6IiArIGlkZW50aWZpZXIgKyAiLiIgKyBwcmV2aW91c1JlZGlyZWN0cy5s ZW5ndGg7CiAgICAgICAgIGRlbGV0ZSBvcmlnaW5hbFJlc291cmNlLnJlZGlyZWN0czsKLSAgICAg ICAgb3JpZ2luYWxSZXNvdXJjZS5oYXNOZXR3b3JrRGF0YSA9IGZhbHNlOworICAgICAgICBvcmln aW5hbFJlc291cmNlLm5ldHdvcmtEYXRhUmVtb3ZlZCA9IHRydWU7CiAgICAgICAgIHRoaXMuX2Zp bmlzaFJlc291cmNlKG9yaWdpbmFsUmVzb3VyY2UsIHRpbWUpOwogICAgICAgICB2YXIgbmV3UmVz b3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCBvcmlnaW5hbFJlc291cmNl LmZyYW1lSWQsIG9yaWdpbmFsUmVzb3VyY2UubG9hZGVySWQsCiAgICAgICAgICAgICAgcmVkaXJl Y3RVUkwsIG9yaWdpbmFsUmVzb3VyY2UuZG9jdW1lbnRVUkwsIG9yaWdpbmFsUmVzb3VyY2Uuc3Rh Y2tUcmFjZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya1BhbmVsLmpzCmluZGV4IDYxOGRlYmMxYzAxYjRhOWFkMjAzZTYzYTk4NmI1ZWIxYzg5YzY5 MWEuLjA0NDU3NDcwOGE0MTkyNDY3NzQ1NzVlNDMyOTNkZWVmYjlhYWVlNzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC03 NTcsNyArNzU3LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fcmVzb3VyY2VzLmxlbmd0aDsg KytpKSB7CiAgICAgICAgICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5fcmVzb3VyY2VzW2ld OwogICAgICAgICAgICAgICAgIGlmIChyZXNvdXJjZS5sb2FkZXJJZCAhPT0gbG9hZGVySWQpCi0g ICAgICAgICAgICAgICAgICAgIHJlc291cmNlLmhhc05ldHdvcmtEYXRhID0gZmFsc2U7CisgICAg ICAgICAgICAgICAgICAgIG9yaWdpbmFsUmVzb3VyY2UubmV0d29ya0RhdGFSZW1vdmVkID0gdHJ1 ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggOTYwY2FmZWZmOTNjODYyZTk3M2JhNjMz MjYxMGE4ODMxYjI2MmY0NC4uYmIxYTU0NmY2MjM5YmE4M2NiNTY0MWExOTIxNTIwMzgyOWZkOTVh MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0yODU2LDcgKzI4NTYs NyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpyZXF1ZXN0RnJvbURlbGVnYXRlKFJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCwgdW5zaWduZWQgbG9uZyYgaQogICAgIHJlcXVlc3QgPSBuZXdSZXF1ZXN0Owog fQogCi12b2lkIEZyYW1lTG9hZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShjb25z dCBDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UpCit2b2lkIEZyYW1lTG9hZGVyOjpsb2FkZWRSZXNv dXJjZUZyb21NZW1vcnlDYWNoZShDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UpCiB7CiAgICAgUGFn ZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKICAgICBpZiAoIXBhZ2UpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5oCmluZGV4IGZkZGFhMDgzNmMyZGZlMmUzMDk5ZWU1ZTU1ZmVmNTY1ZTE3 NzEwMWMuLmEyMzZmYmMxMWU3NGNhYWMwNTdjNTZiNTQyZTFiNWJmNWIzOTg1M2UgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC0xNzcsNyArMTc3LDcgQEAgcHVibGljOgogICAg IHZvaWQgZGlkRmlyc3RMYXlvdXQoKTsKICAgICB2b2lkIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dCgpOwogCi0gICAgdm9pZCBsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShjb25z dCBDYWNoZWRSZXNvdXJjZSopOworICAgIHZvaWQgbG9hZGVkUmVzb3VyY2VGcm9tTWVtb3J5Q2Fj aGUoQ2FjaGVkUmVzb3VyY2UqKTsKICAgICB2b2lkIHRlbGxDbGllbnRBYm91dFBhc3RNZW1vcnlD YWNoZUxvYWRzKCk7CiAKICAgICB2b2lkIGNoZWNrTG9hZENvbXBsZXRlKCk7Cg==