54744 2011-02-18 06:47:51 -0800 Add Prerendering Motivation information to ResourceRequest 2012-04-21 21:15:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED WONTFIX P2 Normal --- 0 gavinp webkit-unassigned abarth eric fishd gavinp oldest_to_newest 353571 0 gavinp 2011-02-18 06:47:51 -0800 Add Prerendering Motivation information to ResourceRequest 353574 1 82955 gavinp 2011-02-18 06:49:34 -0800 Created attachment 82955 Patch 353581 2 gavinp 2011-02-18 06:57:55 -0800 See http://codereview.chromium.org/6542016/ for the chromium code review that uses this feature. 353713 3 82955 abarth 2011-02-18 11:44:07 -0800 Comment on attachment 82955 Patch I thought the client had a way to associate arbitrary information with a resource request without teaching WebCore what that information was. 353723 4 abarth 2011-02-18 11:56:25 -0800 Looks like the arbitrary data thing hasn't happened yet: https://bugs.webkit.org/show_bug.cgi?id=49113 This seems like a good use case for it. 353727 5 82955 eric 2011-02-18 11:59:13 -0800 Comment on attachment 82955 Patch "triggeredByPrerendering" or "forPrerendering" seem better than "hasPrenderingMotivation" (which is quite a mouthful). I agree with Adam, seems this would be better to store off in Chromium land instead of in WebCore if possible. Unless WebCore really needs to know about it being a prerender? 353729 6 eric 2011-02-18 11:59:40 -0800 (I'm sure one could come up with better, or more concise names than the two I suggested as well.) 353757 7 82997 gavinp 2011-02-18 12:39:30 -0800 Created attachment 82997 Patch 353762 8 abarth 2011-02-18 12:45:10 -0800 Gavin has promised to fix Bug 49113 after landing this patch. 353763 9 gavinp 2011-02-18 12:45:44 -0800 (In reply to comment #5) > (From update of attachment 82955 [details]) > "triggeredByPrerendering" or "forPrerendering" seem better than "hasPrenderingMotivation" (which is quite a mouthful). You are right. I've uploaded a new patch. > > I agree with Adam, seems this would be better to store off in Chromium land instead of in WebCore if possible. > > Unless WebCore really needs to know about it being a prerender? WebCore does not need to know about it being a prerender. I think both you and Adam are right, and 49113 is the right way forward; requiring WebKit changes for load information to pass through each time Chrome gets more clever about request life is not a sustainable way forward. Adam asked me to promise that I'd work on 49113 to make this ugliness go away: By these words I promise that I will hack at 49113. This will come up in Chrome networking again as we improve prioritization of requests, since information about the origination of requests (a hidden tab? a visible tab? ...) will motivate that. As well I know other folks here who have similar FavIcon changes for Auth they want. I'll try and talk them into waiting on 49113. 353825 10 fishd 2011-02-18 14:23:33 -0800 Actually, now I'm not sure why this is needed. Can't you derive the exact same information from the requestorID, which corresponds to the RenderView's routing ID (aka, the view ID)? From the browser process, you can observe the routing ID associated with a network request, and you should be able to keep a set of routing IDs corresponding to pre-rendered pages browser-side. 353983 11 82997 gavinp 2011-02-18 19:10:59 -0800 Comment on attachment 82997 Patch I'm removing review? and commit-queue? as we're thinking of other ways to move this information over on the chromium bug thread. 361607 12 82997 gavinp 2011-03-03 07:28:05 -0800 Comment on attachment 82997 Patch Now totally obsolete; a chrome only solution to this has landed. 82955 2011-02-18 06:49:34 -0800 2011-02-18 12:39:26 -0800 Patch bug-54744-20110218094933.patch text/plain 5319 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogNzg4NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1NTQ5MjkxZGVkYmI4NmJm YjcxYjRlZDlmZWUxZDQzZDg2YTU1OWY4Li45M2I5MmE3ZWUzMTE3NTU4MWQ4OTExMGJmY2FkNjdm ZTFlMDFjNDcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDItMTggIEdhdmlu IFBldGVycyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIFByZXJlbmRlcmluZyBNb3RpdmF0aW9uIGluZm9y bWF0aW9uIHRvIFJlc291cmNlUmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTQ3NDQKKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpoYXNQcmVyZW5kZXJpbmdNb3RpdmF0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6c2V0SGFzUHJlcmVuZGVyaW5nTW90aXZh dGlvbik6CisKIDIwMTEtMDItMTggIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3Qu aAppbmRleCAwN2IzMWViYjUwYjJmZGY2NGY5YjE4NmMwYjY1M2UwNmNhMWE1ZjFmLi5hMWI0Njlk MTY4Mjk2NGRhYTkwNWU1ZGMzMzkxMjhmY2ZlYzdmNzU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgK QEAgLTQzLDYgKzQzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX2Fw cENhY2hlSG9zdElEKDApCiAgICAgICAgICAgICAsIG1faGFzVXNlckdlc3R1cmUoZmFsc2UpCiAg ICAgICAgICAgICAsIG1fZG93bmxvYWRUb0ZpbGUoZmFsc2UpCisgICAgICAgICAgICAsIG1faGFz UHJlcmVuZGVyaW5nTW90aXZhdGlvbihmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAg LTUzLDYgKzU0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX2FwcENh Y2hlSG9zdElEKDApCiAgICAgICAgICAgICAsIG1faGFzVXNlckdlc3R1cmUoZmFsc2UpCiAgICAg ICAgICAgICAsIG1fZG93bmxvYWRUb0ZpbGUoZmFsc2UpCisgICAgICAgICAgICAsIG1faGFzUHJl cmVuZGVyaW5nTW90aXZhdGlvbihmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTYz LDYgKzY1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX2FwcENhY2hl SG9zdElEKDApCiAgICAgICAgICAgICAsIG1faGFzVXNlckdlc3R1cmUoZmFsc2UpCiAgICAgICAg ICAgICAsIG1fZG93bmxvYWRUb0ZpbGUoZmFsc2UpCisgICAgICAgICAgICAsIG1faGFzUHJlcmVu ZGVyaW5nTW90aXZhdGlvbihmYWxzZSkKICAgICAgICAgewogICAgICAgICAgICAgc2V0SFRUUFJl ZmVycmVyKHJlZmVycmVyKTsKICAgICAgICAgfQpAQCAtNzQsNiArNzcsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKICAgICAgICAgICAg ICwgbV9oYXNVc2VyR2VzdHVyZShmYWxzZSkKICAgICAgICAgICAgICwgbV9kb3dubG9hZFRvRmls ZShmYWxzZSkKKyAgICAgICAgICAgICwgbV9oYXNQcmVyZW5kZXJpbmdNb3RpdmF0aW9uKGZhbHNl KQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtMTAwLDYgKzEwNCwxMCBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIGJvb2wgZG93bmxvYWRUb0ZpbGUoKSBjb25zdCB7IHJldHVybiBt X2Rvd25sb2FkVG9GaWxlOyB9CiAgICAgICAgIHZvaWQgc2V0RG93bmxvYWRUb0ZpbGUoYm9vbCBk b3dubG9hZFRvRmlsZSkgeyBtX2Rvd25sb2FkVG9GaWxlID0gZG93bmxvYWRUb0ZpbGU7IH0KIAor ICAgICAgICAvLyBUcnVlIGlmIHJlcXVlc3QgaXMgbW90aXZhdGVkIGJ5IHByZXJlbmRlcmluZy4K KyAgICAgICAgYm9vbCBoYXNQcmVyZW5kZXJpbmdNb3RpdmF0aW9uKCkgY29uc3QgeyByZXR1cm4g bV9oYXNQcmVyZW5kZXJpbmdNb3RpdmF0aW9uOyB9CisgICAgICAgIHZvaWQgc2V0SGFzUHJlcmVu ZGVyaW5nTW90aXZhdGlvbihib29sIHByZXJlbmRlcmluZ01vdGl2YXRpb24pIHsgbV9oYXNQcmVy ZW5kZXJpbmdNb3RpdmF0aW9uID0gcHJlcmVuZGVyaW5nTW90aXZhdGlvbjsgfQorCiAgICAgcHJp dmF0ZToKICAgICAgICAgZnJpZW5kIGNsYXNzIFJlc291cmNlUmVxdWVzdEJhc2U7CiAKQEAgLTEx NCw2ICsxMjIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGludCBtX2FwcENhY2hl SG9zdElEOwogICAgICAgICBib29sIG1faGFzVXNlckdlc3R1cmU7CiAgICAgICAgIGJvb2wgbV9k b3dubG9hZFRvRmlsZTsKKyAgICAgICAgYm9vbCBtX2hhc1ByZXJlbmRlcmluZ01vdGl2YXRpb247 CiAgICAgfTsKIAogICAgIHN0cnVjdCBDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGEgOiBw dWJsaWMgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVlc3REYXRhQmFzZSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDE3NzYxZWFhM2VjMGU5YWFlNGZiZTZkZjk2YzBkOTRlNGE5MWE3MGUu LmI5MzdjNGJmZTc4MTlhM2UxMzcxNzBmMTQ5YjE1MzRjM2I4OGUwZDUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDItMTggIEdhdmluIFBldGVycyAg PGdhdmlucEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIFByZXJlbmRlcmluZyBNb3RpdmF0aW9uIGluZm9ybWF0aW9uIHRv IFJlc291cmNlUmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTQ3NDQKKworICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXF1ZXN0Lmg6CisgICAg ICAgICogc3JjL1dlYlVSTFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJVUkxSZXF1 ZXN0OjpoYXNQcmVyZW5kZXJpbmdNb3RpdmF0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViVVJM UmVxdWVzdDo6c2V0SGFzUHJlcmVuZGVyaW5nTW90aXZhdGlvbik6CisKIDIwMTEtMDItMTcgIFl1 em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNo aW5pY2hpcm8gSGFtYWppLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViVVJMUmVxdWVzdC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJM UmVxdWVzdC5oCmluZGV4IDdkZDk3Y2E1OWQwOTRmOGQ4YWNhOWM4NWExYjRjNjFiYmE3MWU1YTgu LjQxNjI0ZmE0Y2FjOTFmNDE0NDcwZTdjYWNiMGMyZWQ5Nzg3ZmM4Y2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlcXVlc3QuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXF1ZXN0LmgKQEAgLTE2Myw2ICsxNjMsMTAg QEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgYm9vbCBkb3dubG9hZFRvRmlsZSgpIGNvbnN0Owog ICAgIFdFQktJVF9BUEkgdm9pZCBzZXREb3dubG9hZFRvRmlsZShib29sKTsKIAorICAgIC8vIFRy dWUgaWYgdGhlIHJlcXVlc3QgaXMgbW90aXZhdGVkIGJ5IHByZXJlbmRlcmluZy4KKyAgICBXRUJL SVRfQVBJIGJvb2wgaGFzUHJlcmVuZGVyaW5nTW90aXZhdGlvbigpIGNvbnN0OworICAgIFdFQktJ VF9BUEkgdm9pZCBzZXRIYXNQcmVyZW5kZXJpbmdNb3RpdmF0aW9uKGJvb2wpOworCiAjaWYgZGVm aW5lZChXRUJLSVRfSU1QTEVNRU5UQVRJT04pCiAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiB0b011dGFibGVSZXNvdXJjZVJlcXVlc3QoKTsKICAgICBjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmIHRvUmVzb3VyY2VSZXF1ZXN0KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlVSTFJlcXVlc3QuY3BwCmluZGV4IDdhNzdjYTNhYTliODkwYmY0ODQ0ZDEw MDNjNWQyZWUyMTliNGNkM2YuLjY2Y2ViOGNmMTIxZTBkOTc1M2JlYTc5YjEwYTZhZDAyMjk2ZWJm OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlcXVlc3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlcXVlc3QuY3BwCkBA IC0yNzcsNiArMjc3LDE2IEBAIHZvaWQgV2ViVVJMUmVxdWVzdDo6c2V0RG93bmxvYWRUb0ZpbGUo Ym9vbCBkb3dubG9hZFRvRmlsZSkKICAgICBtX3ByaXZhdGUtPm1fZG93bmxvYWRUb0ZpbGUgPSBk b3dubG9hZFRvRmlsZTsKIH0KIAorYm9vbCBXZWJVUkxSZXF1ZXN0OjpoYXNQcmVyZW5kZXJpbmdN b3RpdmF0aW9uKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5tX3Jlc291cmNlUmVx dWVzdC0+aGFzUHJlcmVuZGVyaW5nTW90aXZhdGlvbigpOworfQorCit2b2lkIFdlYlVSTFJlcXVl c3Q6OnNldEhhc1ByZXJlbmRlcmluZ01vdGl2YXRpb24oYm9vbCBwcmVyZW5kZXJpbmdNb3RpdmF0 aW9uKQoreworICAgIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlcXVlc3QtPnNldEhhc1ByZXJlbmRl cmluZ01vdGl2YXRpb24ocHJlcmVuZGVyaW5nTW90aXZhdGlvbik7Cit9CisKIFJlc291cmNlUmVx dWVzdCYgV2ViVVJMUmVxdWVzdDo6dG9NdXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCkKIHsKICAgICBB U1NFUlQobV9wcml2YXRlKTsK 82997 2011-02-18 12:39:30 -0800 2011-03-03 07:28:05 -0800 Patch bug-54744-20110218153929.patch text/plain 5141 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogNzg4NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1NTQ5MjkxZGVkYmI4NmJm YjcxYjRlZDlmZWUxZDQzZDg2YTU1OWY4Li45M2I5MmE3ZWUzMTE3NTU4MWQ4OTExMGJmY2FkNjdm ZTFlMDFjNDcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDItMTggIEdhdmlu IFBldGVycyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIFByZXJlbmRlcmluZyBNb3RpdmF0aW9uIGluZm9y bWF0aW9uIHRvIFJlc291cmNlUmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTQ3NDQKKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpoYXNQcmVyZW5kZXJpbmdNb3RpdmF0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6c2V0SGFzUHJlcmVuZGVyaW5nTW90aXZh dGlvbik6CisKIDIwMTEtMDItMTggIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3Qu aAppbmRleCAwN2IzMWViYjUwYjJmZGY2NGY5YjE4NmMwYjY1M2UwNmNhMWE1ZjFmLi5iMDIwMDQ0 YjVhMWY4NzAzNzE4NjE2MDZlZmU2MDNlYjI3NjE0OTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgK QEAgLTQzLDYgKzQzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX2Fw cENhY2hlSG9zdElEKDApCiAgICAgICAgICAgICAsIG1faGFzVXNlckdlc3R1cmUoZmFsc2UpCiAg ICAgICAgICAgICAsIG1fZG93bmxvYWRUb0ZpbGUoZmFsc2UpCisgICAgICAgICAgICAsIG1fZm9y UHJlcmVuZGVyaW5nKGZhbHNlKQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtNTMsNiArNTQs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQo MCkKICAgICAgICAgICAgICwgbV9oYXNVc2VyR2VzdHVyZShmYWxzZSkKICAgICAgICAgICAgICwg bV9kb3dubG9hZFRvRmlsZShmYWxzZSkKKyAgICAgICAgICAgICwgbV9mb3JQcmVyZW5kZXJpbmco ZmFsc2UpCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC02Myw2ICs2NSw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQogICAgICAgICAg ICAgLCBtX2hhc1VzZXJHZXN0dXJlKGZhbHNlKQogICAgICAgICAgICAgLCBtX2Rvd25sb2FkVG9G aWxlKGZhbHNlKQorICAgICAgICAgICAgLCBtX2ZvclByZXJlbmRlcmluZyhmYWxzZSkKICAgICAg ICAgewogICAgICAgICAgICAgc2V0SFRUUFJlZmVycmVyKHJlZmVycmVyKTsKICAgICAgICAgfQpA QCAtNzQsNiArNzcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fYXBw Q2FjaGVIb3N0SUQoMCkKICAgICAgICAgICAgICwgbV9oYXNVc2VyR2VzdHVyZShmYWxzZSkKICAg ICAgICAgICAgICwgbV9kb3dubG9hZFRvRmlsZShmYWxzZSkKKyAgICAgICAgICAgICwgbV9mb3JQ cmVyZW5kZXJpbmcoZmFsc2UpCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC0xMDAsNiArMTA0 LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBkb3dubG9hZFRvRmlsZSgp IGNvbnN0IHsgcmV0dXJuIG1fZG93bmxvYWRUb0ZpbGU7IH0KICAgICAgICAgdm9pZCBzZXREb3du bG9hZFRvRmlsZShib29sIGRvd25sb2FkVG9GaWxlKSB7IG1fZG93bmxvYWRUb0ZpbGUgPSBkb3du bG9hZFRvRmlsZTsgfQogCisgICAgICAgIC8vIFRydWUgaWYgcmVxdWVzdCBpcyBtb3RpdmF0ZWQg YnkgcHJlcmVuZGVyaW5nLgorICAgICAgICBib29sIGZvclByZXJlbmRlcmluZygpIGNvbnN0IHsg cmV0dXJuIG1fZm9yUHJlcmVuZGVyaW5nOyB9CisgICAgICAgIHZvaWQgc2V0Rm9yUHJlcmVuZGVy aW5nKGJvb2wgZm9yUHJlcmVuZGVyaW5nKSB7IG1fZm9yUHJlcmVuZGVyaW5nID0gZm9yUHJlcmVu ZGVyaW5nOyB9CisKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VS ZXF1ZXN0QmFzZTsKIApAQCAtMTE0LDYgKzEyMiw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgaW50IG1fYXBwQ2FjaGVIb3N0SUQ7CiAgICAgICAgIGJvb2wgbV9oYXNVc2VyR2VzdHVy ZTsKICAgICAgICAgYm9vbCBtX2Rvd25sb2FkVG9GaWxlOworICAgICAgICBib29sIG1fZm9yUHJl cmVuZGVyaW5nOwogICAgIH07CiAKICAgICBzdHJ1Y3QgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVl c3REYXRhIDogcHVibGljIENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0YUJhc2UgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCAxNzc2MWVhYTNlYzBlOWFhZTRmYmU2ZGY5NmMwZDk0 ZTRhOTFhNzBlLi5iOTM3YzRiZmU3ODE5YTNlMTM3MTcwZjE0OWIxNTM0YzNiODhlMGQ1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTAyLTE4ICBHYXZp biBQZXRlcnMgIDxnYXZpbnBAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBQcmVyZW5kZXJpbmcgTW90aXZhdGlvbiBpbmZv cm1hdGlvbiB0byBSZXNvdXJjZVJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU0NzQ0CisKKyAgICAgICAgKiBwdWJsaWMvV2ViVVJMUmVxdWVz dC5oOgorICAgICAgICAqIHNyYy9XZWJVUkxSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViVVJMUmVxdWVzdDo6aGFzUHJlcmVuZGVyaW5nTW90aXZhdGlvbik6CisgICAgICAgIChXZWJL aXQ6OldlYlVSTFJlcXVlc3Q6OnNldEhhc1ByZXJlbmRlcmluZ01vdGl2YXRpb24pOgorCiAyMDEx LTAyLTE3ICBZdXpvIEZ1amlzaGltYSAgPHl1em9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBTaGluaWNoaXJvIEhhbWFqaS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYlVSTFJlcXVlc3QuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlVSTFJlcXVlc3QuaAppbmRleCA3ZGQ5N2NhNTlkMDk0ZjhkOGFjYTljODVhMWI0YzYx YmJhNzFlNWE4Li43ZTQxMmNkM2M5ZjBkYWZhZGVhMGZlMTQ0ZGIyY2UyNzlmN2M1ZmQ4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXF1ZXN0LmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVxdWVzdC5oCkBAIC0xNjMs NiArMTYzLDEwIEBAIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJIGJvb2wgZG93bmxvYWRUb0ZpbGUo KSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0RG93bmxvYWRUb0ZpbGUoYm9vbCk7CiAK KyAgICAvLyBUcnVlIGlmIHRoZSByZXF1ZXN0IGlzIG1vdGl2YXRlZCBieSBwcmVyZW5kZXJpbmcu CisgICAgV0VCS0lUX0FQSSBib29sIGZvclByZXJlbmRlcmluZygpIGNvbnN0OworICAgIFdFQktJ VF9BUEkgdm9pZCBzZXRGb3JQcmVyZW5kZXJpbmcoYm9vbCk7CisKICNpZiBkZWZpbmVkKFdFQktJ VF9JTVBMRU1FTlRBVElPTikKICAgICBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHRvTXV0YWJs ZVJlc291cmNlUmVxdWVzdCgpOwogICAgIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYg dG9SZXNvdXJjZVJlcXVlc3QoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlVSTFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVVJMUmVxdWVzdC5jcHAKaW5kZXggN2E3N2NhM2FhOWI4OTBiZjQ4NDRkMTAwM2M1ZDJlZTIx OWI0Y2QzZi4uZjkzMDU0OWJmZWNjNTY3ZTliYmMzNTI2ODQ1Y2U5NTk3ZWU2YmYwYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVxdWVzdC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVxdWVzdC5jcHAKQEAgLTI3Nyw2ICsy NzcsMTYgQEAgdm9pZCBXZWJVUkxSZXF1ZXN0OjpzZXREb3dubG9hZFRvRmlsZShib29sIGRvd25s b2FkVG9GaWxlKQogICAgIG1fcHJpdmF0ZS0+bV9kb3dubG9hZFRvRmlsZSA9IGRvd25sb2FkVG9G aWxlOwogfQogCitib29sIFdlYlVSTFJlcXVlc3Q6OmZvclByZXJlbmRlcmluZygpIGNvbnN0Cit7 CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlcXVlc3QtPmZvclByZXJlbmRlcmlu ZygpOworfQorCit2b2lkIFdlYlVSTFJlcXVlc3Q6OnNldEZvclByZXJlbmRlcmluZyhib29sIGZv clByZXJlbmRlcmluZykKK3sKKyAgICBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXF1ZXN0LT5zZXRG b3JQcmVyZW5kZXJpbmcoZm9yUHJlcmVuZGVyaW5nKTsKK30KKwogUmVzb3VyY2VSZXF1ZXN0JiBX ZWJVUkxSZXF1ZXN0Ojp0b011dGFibGVSZXNvdXJjZVJlcXVlc3QoKQogewogICAgIEFTU0VSVCht X3ByaXZhdGUpOwo=