130044 2014-03-10 15:21:32 -0700 Web Inspector: Frontend loaded resources from cache are not hidden as expected 2015-11-26 21:33:02 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned bburg beidson commit-queue graouts japhet joepeck timothy webkit-bug-importer oldest_to_newest 989072 0 joepeck 2014-03-10 15:21:32 -0700 * STEPS TO REPRODUCE 1. Load page with source map resources. 2. Inspect page 3. Reload page from inspector (so that source map resources load from cache) => Source map loads show up as page loaded resources instead of getting hidden 989074 1 joepeck 2014-03-10 15:22:39 -0700 The issue is that when there is a cached resource load of a frontend loaded resource, WebCore send their resource load notifier delegates with a fresh ResourceRequest, losing out on the flags from the original resource request. For example: lldb> bt * frame #0: WebCore`WebCore::InspectorResourceAgent::willSendRequest ... frame #5: WebCore`WebCore::FrameLoader::loadedResourceFromMemoryCache frame #6: WebCore`WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache frame #7: WebCore`WebCore::CachedResourceLoader::requestResource frame #8: WebCore`WebCore::CachedResourceLoader::requestRawResource frame #9: WebCore`WebCore::DocumentThreadableLoader::loadRequest ... frame #15: WebCore`WebCore::XMLHttpRequest::send frame #16: WebCore`WebCore::XMLHttpRequest::send frame #17: WebCore`WebCore::XMLHttpRequest::sendForInspector The XHR send for inspector sets "hiddenFromInspector" on the resource request. Later in requestResource we determine we can reuse the cached resource from the cache, and go through the notifer process with a new request that only copies the URL from the original request. 989086 2 226345 joepeck 2014-03-10 15:44:45 -0700 Created attachment 226345 [PATCH] Proposed Fix Proposed fix. Brady, can we pass this option (hiddenFromInspector) into loadedResourceFromMemoryCache in a cleaner way then this? As far as I can tell, these functions are all only used once in this path, there are no other callers. 989128 3 226345 timothy 2014-03-10 17:25:57 -0700 Comment on attachment 226345 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=226345&action=review > Source/WebCore/loader/FrameLoader.cpp:3002 > newRequest = ResourceRequest(resource->url()); It might just be best if the caller did this. That would remove the dance you have to do. 989174 4 226345 joepeck 2014-03-10 19:22:23 -0700 Comment on attachment 226345 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=226345&action=review >> Source/WebCore/loader/FrameLoader.cpp:3002 >> newRequest = ResourceRequest(resource->url()); > > It might just be best if the caller did this. That would remove the dance you have to do. I like that idea, seeing that this is only called in one place. 989201 5 226378 joepeck 2014-03-10 20:37:42 -0700 Created attachment 226378 [PATCH] For Landing 989214 6 226378 commit-queue 2014-03-10 21:16:17 -0700 Comment on attachment 226378 [PATCH] For Landing Clearing flags on attachment: 226378 Committed r165427: <http://trac.webkit.org/changeset/165427> 1144554 7 webkit-bug-importer 2015-11-26 21:33:02 -0800 <rdar://problem/23673692> 226345 2014-03-10 15:44:45 -0700 2014-03-10 20:37:49 -0700 [PATCH] Proposed Fix cache.patch text/plain 5134 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlODQyZDQ0Li5jODM3MTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTQtMDMtMTAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBGcm9udGVuZCBsb2FkZWQgcmVzb3VyY2VzIGZyb20gY2Fj aGUgYXJlIG5vdCBoaWRkZW4gYXMgZXhwZWN0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDA0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6Cisg ICAgICAgIENhcnJ5IG92ZXIgdGhlIGhpZGRlbiBmcm9tIGluc3BlY3RvciBzdGF0ZSBpZiB0aGUg cGFzc2VkIGluIHJlcXVlc3QgaGFkIGl0LgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpzaG91 bGRDb250aW51ZUFmdGVyTm90aWZ5aW5nTG9hZGVkRnJvbU1lbW9yeUNhY2hlKToKKyAgICAgICAg Q2Fycnkgb3ZlciB0aGUgaGlkZGVuIGZyb20gaW5zcGVjdG9yIHN0YXRlIGlmIHRoZSBwYXNzZWQg aW4gcmVxdWVzdCBoYWQgaXQuCisgICAgICAgIFBhc3MgdGhlIGhpZGRlbiBmb3IgaW5zcGVjdG9y IGZsYWcgaW50byB0aGUgZnVuY3Rpb24gd2l0aCB0aGUgc29vbiB0byBiZSByZXBsYWNlZAorICAg ICAgICBuZXcgcmVxdWVzdC4KKworICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVzdCk6CisgICAgICAg IEFkZCBtaXNzaW5nIGlmZGVmcyBmb3IgSU5TUEVDVE9SIG9ubHkgZnVuY3Rpb24uCisKIDIwMTQt MDMtMTAgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JF U1NJT04gKHIxNTkyMTgpOiBGcmFtZVZpZXc6OmxheW91dCgpIHNob3VsZCBkZXN0cm95IFRlbXBv cmFyeUNoYW5nZTxMYXlvdXRQaGFzZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IGEwYTQ3ZmEuLjRkYmM3NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcApAQCAtMjk5NSw4ICsyOTk1LDE3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnJlcXVlc3RGcm9t RGVsZWdhdGUoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCB1bnNpZ25lZCBsb25nJiBpCiAKIHZv aWQgRnJhbWVMb2FkZXI6OmxvYWRlZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKENhY2hlZFJlc291 cmNlKiByZXNvdXJjZSwgUmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0KQogeworI2lmIEVOQUJM RShJTlNQRUNUT1IpCisgICAgYm9vbCB3YXNIaWRkZW5Gcm9tSW5zcGVjdG9yID0gbmV3UmVxdWVz dC5oaWRkZW5Gcm9tSW5zcGVjdG9yKCk7CisjZW5kaWYKKwogICAgIG5ld1JlcXVlc3QgPSBSZXNv dXJjZVJlcXVlc3QocmVzb3VyY2UtPnVybCgpKTsKIAorI2lmIEVOQUJMRShJTlNQRUNUT1IpCisg ICAgaWYgKHdhc0hpZGRlbkZyb21JbnNwZWN0b3IpCisgICAgICAgIG5ld1JlcXVlc3Quc2V0SGlk ZGVuRnJvbUluc3BlY3Rvcih0cnVlKTsKKyNlbmRpZgorCiAgICAgUGFnZSogcGFnZSA9IG1fZnJh bWUucGFnZSgpOwogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXgg YWFkY2FhYi4uY2UyMWNkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0zOTMsMTIgKzM5MywxNiBAQCBib29sIENh Y2hlZFJlc291cmNlTG9hZGVyOjpjYW5SZXF1ZXN0KENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUs IGNvbnN0IFVSTCYgdXJsLAogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIENhY2hlZFJlc291 cmNlTG9hZGVyOjpzaG91bGRDb250aW51ZUFmdGVyTm90aWZ5aW5nTG9hZGVkRnJvbU1lbW9yeUNh Y2hlKENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkKK2Jvb2wgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6 OnNob3VsZENvbnRpbnVlQWZ0ZXJOb3RpZnlpbmdMb2FkZWRGcm9tTWVtb3J5Q2FjaGUoY29uc3Qg Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2Up CiB7CiAgICAgaWYgKCFyZXNvdXJjZSB8fCAhZnJhbWUoKSB8fCByZXNvdXJjZS0+c3RhdHVzKCkg IT0gQ2FjaGVkUmVzb3VyY2U6OkNhY2hlZCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBS ZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdDsKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQorICAgIGlm IChyZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLmhpZGRlbkZyb21JbnNwZWN0b3IoKSkKKyAgICAg ICAgbmV3UmVxdWVzdC5zZXRIaWRkZW5Gcm9tSW5zcGVjdG9yKHRydWUpOworI2VuZGlmCiAgICAg ZnJhbWUoKS0+bG9hZGVyKCkubG9hZGVkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUocmVzb3VyY2Us IG5ld1JlcXVlc3QpOwogICAgIAogICAgIC8vIEZJWE1FIDxodHRwOi8vd2Via2l0Lm9yZy9iLzEx MzI1MT46IElmIHRoZSBkZWxlZ2F0ZSBtb2RpZmllcyB0aGUgcmVxdWVzdCdzCkBAIC00NTMsNyAr NDU3LDcgQEAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhY2hlZFJlc291 cmNlTG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UoQ2FjaGUKICAgICAgICAgcmVzb3VyY2UgPSByZXZh bGlkYXRlUmVzb3VyY2UocmVxdWVzdCwgcmVzb3VyY2UuZ2V0KCkpOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIFVzZToKLSAgICAgICAgaWYgKCFzaG91bGRDb250aW51ZUFmdGVyTm90aWZ5aW5n TG9hZGVkRnJvbU1lbW9yeUNhY2hlKHJlc291cmNlLmdldCgpKSkKKyAgICAgICAgaWYgKCFzaG91 bGRDb250aW51ZUFmdGVyTm90aWZ5aW5nTG9hZGVkRnJvbU1lbW9yeUNhY2hlKHJlcXVlc3QsIHJl c291cmNlLmdldCgpKSkKICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICBtZW1vcnlDYWNo ZSgpLT5yZXNvdXJjZUFjY2Vzc2VkKHJlc291cmNlLmdldCgpKTsKICAgICAgICAgYnJlYWs7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5o CmluZGV4IDAxYjY0N2MuLjRlMmM5YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCkBAIC0xNDcsNyArMTQ3LDcgQEAgcHJpdmF0 ZToKICAgICBlbnVtIFJldmFsaWRhdGlvblBvbGljeSB7IFVzZSwgUmV2YWxpZGF0ZSwgUmVsb2Fk LCBMb2FkIH07CiAgICAgUmV2YWxpZGF0aW9uUG9saWN5IGRldGVybWluZVJldmFsaWRhdGlvblBv bGljeShDYWNoZWRSZXNvdXJjZTo6VHlwZSwgUmVzb3VyY2VSZXF1ZXN0JiwgYm9vbCBmb3JQcmVs b2FkLCBDYWNoZWRSZXNvdXJjZSogZXhpc3RpbmdSZXNvdXJjZSwgQ2FjaGVkUmVzb3VyY2VSZXF1 ZXN0OjpEZWZlck9wdGlvbikgY29uc3Q7CiAgICAgCi0gICAgYm9vbCBzaG91bGRDb250aW51ZUFm dGVyTm90aWZ5aW5nTG9hZGVkRnJvbU1lbW9yeUNhY2hlKENhY2hlZFJlc291cmNlKik7CisgICAg Ym9vbCBzaG91bGRDb250aW51ZUFmdGVyTm90aWZ5aW5nTG9hZGVkRnJvbU1lbW9yeUNhY2hlKGNv bnN0IENhY2hlZFJlc291cmNlUmVxdWVzdCYsIENhY2hlZFJlc291cmNlKik7CiAgICAgYm9vbCBj aGVja0luc2VjdXJlQ29udGVudChDYWNoZWRSZXNvdXJjZTo6VHlwZSwgY29uc3QgVVJMJikgY29u c3Q7CiAKICAgICB2b2lkIGdhcmJhZ2VDb2xsZWN0RG9jdW1lbnRSZXNvdXJjZXNUaW1lckZpcmVk KFRpbWVyPENhY2hlZFJlc291cmNlTG9hZGVyPiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx dWVzdC5jcHAKaW5kZXggNmM3ZjczNy4uZGYxMDYxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0 cFJlcXVlc3QuY3BwCkBAIC03ODEsNyArNzgxLDkgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6Y3Jl YXRlUmVxdWVzdChFeGNlcHRpb25Db2RlJiBlYykKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1 ZXN0KG1fdXJsKTsKICAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QobV9tZXRob2QpOworI2lmIEVO QUJMRShJTlNQRUNUT1IpCiAgICAgcmVxdWVzdC5zZXRIaWRkZW5Gcm9tSW5zcGVjdG9yKG1fc2Vu ZGluZ0Zvckluc3BlY3Rvcik7CisjZW5kaWYKIAogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6d2lsbExvYWRYSFIoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCB0aGlzLCBtX21ldGhvZCwg bV91cmwsIG1fYXN5bmMsIG1fcmVxdWVzdEVudGl0eUJvZHkgPyBtX3JlcXVlc3RFbnRpdHlCb2R5 LT5kZWVwQ29weSgpIDogMCwgbV9yZXF1ZXN0SGVhZGVycywgbV9pbmNsdWRlQ3JlZGVudGlhbHMp OwogCg== 226378 2014-03-10 20:37:42 -0700 2014-03-10 21:16:17 -0700 [PATCH] For Landing for-landing.patch text/plain 4935 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NjQyMGVjLi42OTg2OTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTQtMDMtMTAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBGcm9udGVuZCBsb2FkZWQgcmVzb3VyY2VzIGZyb20gY2Fj aGUgYXJlIG5vdCBoaWRkZW4gYXMgZXhwZWN0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDA0NAorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90 aHkgSGF0Y2hlci4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUpOgor ICAgICAgICBVc2UgdGhlIG5ldyByZXF1ZXN0IHRoYXQgd2FzIHBhc3NlZCBpbi4gQXNzdW1lIGl0 IGlzIGZpbGxlZCBpbiBhcHByb3ByaWF0ZWx5LgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpz aG91bGRDb250aW51ZUFmdGVyTm90aWZ5aW5nTG9hZGVkRnJvbU1lbW9yeUNhY2hlKToKKyAgICAg ICAgQ2Fycnkgb3ZlciB0aGUgaGlkZGVuIGZyb20gaW5zcGVjdG9yIHN0YXRlIGlmIHRoZSBwYXNz ZWQgaW4gcmVxdWVzdCBoYWQgaXQsCisgICAgICAgIGFuZCBjcmVhdGUgdGhlIHJlcXVlc3QgdGhh dCBsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSB3aWxsIHVzZS4KKworICAgICAgICAqIHht bC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6 Y3JlYXRlUmVxdWVzdCk6CisgICAgICAgIEFkZCBtaXNzaW5nIGlmZGVmcyBmb3IgSU5TUEVDVE9S IG9ubHkgZnVuY3Rpb24uCisKIDIwMTQtMDMtMTAgIEppbndvbyBTb25nICA8amlud29vNy5zb25n QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJlbW92ZSAndmlzaWJpbGl0eWNoYW5nZScgYXR0cmli dXRlIGV2ZW50IGxpc3RlbmVyIGZyb20gZG9jdW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCmluZGV4IGEwYTQ3ZmEuLmEzMmMxNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcApAQCAtMjk5NSw4ICsyOTk1LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6cmVx dWVzdEZyb21EZWxlZ2F0ZShSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIHVuc2lnbmVkIGxvbmcm IGkKIAogdm9pZCBGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoQ2Fj aGVkUmVzb3VyY2UqIHJlc291cmNlLCBSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QpCiB7Ci0g ICAgbmV3UmVxdWVzdCA9IFJlc291cmNlUmVxdWVzdChyZXNvdXJjZS0+dXJsKCkpOwotCiAgICAg UGFnZSogcGFnZSA9IG1fZnJhbWUucGFnZSgpOwogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0 dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5jcHAKaW5kZXggYWFkY2FhYi4uNjAxZjcxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0zOTMsMTIg KzM5MywxNiBAQCBib29sIENhY2hlZFJlc291cmNlTG9hZGVyOjpjYW5SZXF1ZXN0KENhY2hlZFJl c291cmNlOjpUeXBlIHR5cGUsIGNvbnN0IFVSTCYgdXJsLAogICAgIHJldHVybiB0cnVlOwogfQog Ci1ib29sIENhY2hlZFJlc291cmNlTG9hZGVyOjpzaG91bGRDb250aW51ZUFmdGVyTm90aWZ5aW5n TG9hZGVkRnJvbU1lbW9yeUNhY2hlKENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkKK2Jvb2wgQ2Fj aGVkUmVzb3VyY2VMb2FkZXI6OnNob3VsZENvbnRpbnVlQWZ0ZXJOb3RpZnlpbmdMb2FkZWRGcm9t TWVtb3J5Q2FjaGUoY29uc3QgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBDYWNoZWRS ZXNvdXJjZSogcmVzb3VyY2UpCiB7CiAgICAgaWYgKCFyZXNvdXJjZSB8fCAhZnJhbWUoKSB8fCBy ZXNvdXJjZS0+c3RhdHVzKCkgIT0gQ2FjaGVkUmVzb3VyY2U6OkNhY2hlZCkKICAgICAgICAgcmV0 dXJuIHRydWU7CiAKLSAgICBSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdDsKKyAgICBSZXNvdXJj ZVJlcXVlc3QgbmV3UmVxdWVzdCA9IFJlc291cmNlUmVxdWVzdChyZXNvdXJjZS0+dXJsKCkpOwor I2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgaWYgKHJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCku aGlkZGVuRnJvbUluc3BlY3RvcigpKQorICAgICAgICBuZXdSZXF1ZXN0LnNldEhpZGRlbkZyb21J bnNwZWN0b3IodHJ1ZSk7CisjZW5kaWYKICAgICBmcmFtZSgpLT5sb2FkZXIoKS5sb2FkZWRSZXNv dXJjZUZyb21NZW1vcnlDYWNoZShyZXNvdXJjZSwgbmV3UmVxdWVzdCk7CiAgICAgCiAgICAgLy8g RklYTUUgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTEzMjUxPjogSWYgdGhlIGRlbGVnYXRlIG1vZGlm aWVzIHRoZSByZXF1ZXN0J3MKQEAgLTQ1Myw3ICs0NTcsNyBAQCBDYWNoZWRSZXNvdXJjZUhhbmRs ZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZShD YWNoZQogICAgICAgICByZXNvdXJjZSA9IHJldmFsaWRhdGVSZXNvdXJjZShyZXF1ZXN0LCByZXNv dXJjZS5nZXQoKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVXNlOgotICAgICAgICBpZiAo IXNob3VsZENvbnRpbnVlQWZ0ZXJOb3RpZnlpbmdMb2FkZWRGcm9tTWVtb3J5Q2FjaGUocmVzb3Vy Y2UuZ2V0KCkpKQorICAgICAgICBpZiAoIXNob3VsZENvbnRpbnVlQWZ0ZXJOb3RpZnlpbmdMb2Fk ZWRGcm9tTWVtb3J5Q2FjaGUocmVxdWVzdCwgcmVzb3VyY2UuZ2V0KCkpKQogICAgICAgICAgICAg cmV0dXJuIDA7CiAgICAgICAgIG1lbW9yeUNhY2hlKCktPnJlc291cmNlQWNjZXNzZWQocmVzb3Vy Y2UuZ2V0KCkpOwogICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmgKaW5kZXggMDFiNjQ3Yy4uNGUyYzlhMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVy LmgKQEAgLTE0Nyw3ICsxNDcsNyBAQCBwcml2YXRlOgogICAgIGVudW0gUmV2YWxpZGF0aW9uUG9s aWN5IHsgVXNlLCBSZXZhbGlkYXRlLCBSZWxvYWQsIExvYWQgfTsKICAgICBSZXZhbGlkYXRpb25Q b2xpY3kgZGV0ZXJtaW5lUmV2YWxpZGF0aW9uUG9saWN5KENhY2hlZFJlc291cmNlOjpUeXBlLCBS ZXNvdXJjZVJlcXVlc3QmLCBib29sIGZvclByZWxvYWQsIENhY2hlZFJlc291cmNlKiBleGlzdGlu Z1Jlc291cmNlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OkRlZmVyT3B0aW9uKSBjb25zdDsKICAg ICAKLSAgICBib29sIHNob3VsZENvbnRpbnVlQWZ0ZXJOb3RpZnlpbmdMb2FkZWRGcm9tTWVtb3J5 Q2FjaGUoQ2FjaGVkUmVzb3VyY2UqKTsKKyAgICBib29sIHNob3VsZENvbnRpbnVlQWZ0ZXJOb3Rp ZnlpbmdMb2FkZWRGcm9tTWVtb3J5Q2FjaGUoY29uc3QgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Jiwg Q2FjaGVkUmVzb3VyY2UqKTsKICAgICBib29sIGNoZWNrSW5zZWN1cmVDb250ZW50KENhY2hlZFJl c291cmNlOjpUeXBlLCBjb25zdCBVUkwmKSBjb25zdDsKIAogICAgIHZvaWQgZ2FyYmFnZUNvbGxl Y3REb2N1bWVudFJlc291cmNlc1RpbWVyRmlyZWQoVGltZXI8Q2FjaGVkUmVzb3VyY2VMb2FkZXI+ Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIv U291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCA2YzdmNzM3Li5kZjEw NjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTc4MSw3ICs3ODEs OSBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KEV4Y2VwdGlvbkNvZGUmIGVj KQogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QobV91cmwpOwogICAgIHJlcXVlc3Quc2V0 SFRUUE1ldGhvZChtX21ldGhvZCk7CisjaWYgRU5BQkxFKElOU1BFQ1RPUikKICAgICByZXF1ZXN0 LnNldEhpZGRlbkZyb21JbnNwZWN0b3IobV9zZW5kaW5nRm9ySW5zcGVjdG9yKTsKKyNlbmRpZgog CiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsTG9hZFhIUihzY3JpcHRFeGVjdXRp b25Db250ZXh0KCksIHRoaXMsIG1fbWV0aG9kLCBtX3VybCwgbV9hc3luYywgbV9yZXF1ZXN0RW50 aXR5Qm9keSA/IG1fcmVxdWVzdEVudGl0eUJvZHktPmRlZXBDb3B5KCkgOiAwLCBtX3JlcXVlc3RI ZWFkZXJzLCBtX2luY2x1ZGVDcmVkZW50aWFscyk7CiAK