143619 2015-04-10 14:28:06 -0700 Stop referring to outdated RFC2616 in CacheValidation.cpp 2015-04-11 11:26:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez andersca commit-queue darin koivisto oldest_to_newest 1084389 0 cdumez 2015-04-10 14:28:06 -0700 Stop referring to outdated RFC2616 in CacheValidation.cpp and refer to the newer RFC7230 & RFC7234. 1084390 1 250535 cdumez 2015-04-10 14:30:39 -0700 Created attachment 250535 Patch 1084521 2 250535 darin 2015-04-11 08:44:52 -0700 Comment on attachment 250535 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250535&action=review > Source/WebCore/platform/network/CacheValidation.h:51 > +WEBCORE_EXPORT std::chrono::microseconds computeCurrentAge(const ResourceResponse&, const std::chrono::system_clock::time_point& responseTimestamp); > +WEBCORE_EXPORT std::chrono::microseconds computeFreshnessLifetimeForHTTPFamily(const ResourceResponse&, const std::chrono::system_clock::time_point& responseTimestamp); Do we really want to change to const time_point&? Anders has pushed me to actually pass objects rather than references for modest-sized structures in the recent past, so maybe that applies here. 1084528 3 250535 cdumez 2015-04-11 10:34:52 -0700 Comment on attachment 250535 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250535&action=review >> Source/WebCore/platform/network/CacheValidation.h:51 >> +WEBCORE_EXPORT std::chrono::microseconds computeFreshnessLifetimeForHTTPFamily(const ResourceResponse&, const std::chrono::system_clock::time_point& responseTimestamp); > > Do we really want to change to const time_point&? Anders has pushed me to actually pass objects rather than references for modest-sized structures in the recent past, so maybe that applies here. I have just verified that std::chrono::system_clock::time_point is only 8 bytes on my machine, so you are likely right. I'll revert this change. 1084529 4 250574 cdumez 2015-04-11 10:37:26 -0700 Created attachment 250574 Patch 1084538 5 cdumez 2015-04-11 11:04:32 -0700 FYI, I confirmed locally that passing by value here seems slightly faster on my MacBook Pro (lower is better): size: 8 bytes by_ref: 348884550 by_value: 341103395 (~2.2% faster) Benchmark: http://pastebin.com/UNmezmER // clang++ -std=c++11 -O3 test.cpp 1084543 6 250574 commit-queue 2015-04-11 11:26:48 -0700 Comment on attachment 250574 Patch Clearing flags on attachment: 250574 Committed r182659: <http://trac.webkit.org/changeset/182659> 1084544 7 commit-queue 2015-04-11 11:26:54 -0700 All reviewed patches have been landed. Closing bug. 250535 2015-04-10 14:30:39 -0700 2015-04-11 10:37:23 -0700 Patch bug-143619-20150410142946.patch text/plain 7534 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNjMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE4MWZjN2M5M2FlNTM3 MmVkZGJiZjY1YmZhZTAwZWY4YzE3OTFlYi4uN2FlMzJlYTYwY2ZiYWQxODdhZmZhYjAxY2YzZmU5 NzYzNTI2YWM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTA0LTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCByZWZlcnJpbmcgdG8g b3V0ZGF0ZWQgUkZDMjYxNiBpbiBDYWNoZVZhbGlkYXRpb24uY3BwCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM2MTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9wIHJlZmVycmluZyB0byBvdXRkYXRl ZCBSRkMyNjE2IGluIENhY2hlVmFsaWRhdGlvbi5jcHAgYW5kIHJlZmVyIHRvCisgICAgICAgIHRo ZSBuZXdlciBSRkM3MjMwICYgUkZDNzIzNC4gQWxzbyB1cGRhdGUgc29tZSB2YXJpYWJsZXMgdG8g bWF0Y2ggdGhlCisgICAgICAgIG5hbWluZyBpbiB0aGUgUkZDIGZvciBjbGFyaXR5LgorCisgICAg ICAgIE5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvQ2Fj aGVWYWxpZGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZVJlc3BvbnNlSGVhZGVy c0FmdGVyUmV2YWxpZGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVDdXJyZW50QWdl KToKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVGcmVzaG5lc3NMaWZldGltZUZvckhUVFBGYW1p bHkpOgorICAgICAgICAoV2ViQ29yZTo6aXNDYWNoZUhlYWRlclNlcGFyYXRvcik6CisgICAgICAg IChXZWJDb3JlOjpwYXJzZUNhY2hlQ29udHJvbERpcmVjdGl2ZXMpOgorICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvQ2FjaGVWYWxpZGF0aW9uLmg6CisKIDIwMTUtMDQtMTAgIEVyaWMgQ2FybHNv biAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gUmVmYWN0b3IgTWVk aWFQbGF5YmFja1RhcmdldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9DYWNoZVZhbGlkYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9DYWNoZVZhbGlkYXRpb24uY3BwCmluZGV4IGExOTU3Zjk3MjRiOWU3NWUxZmE3NDYzNDVjM2Zk ZWE3NDAyZDY1ZDQuLmZlM2Q4ODZhYTkwNmJhZWI1OGQxMDZmZTJkYzVmYjc1MWNmNDAyNzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQ2FjaGVWYWxpZGF0aW9u LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0NhY2hlVmFsaWRhdGlv bi5jcHAKQEAgLTc1LDggKzc1LDggQEAgc3RhdGljIGlubGluZSBib29sIHNob3VsZFVwZGF0ZUhl YWRlckFmdGVyUmV2YWxpZGF0aW9uKGNvbnN0IFN0cmluZyYgaGVhZGVyKQogCiB2b2lkIHVwZGF0 ZVJlc3BvbnNlSGVhZGVyc0FmdGVyUmV2YWxpZGF0aW9uKFJlc291cmNlUmVzcG9uc2UmIHJlc3Bv bnNlLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiB2YWxpZGF0aW5nUmVzcG9uc2UpCiB7Ci0gICAg Ly8gUkZDMjYxNiAxMC4zLjUKLSAgICAvLyBVcGRhdGUgY2FjaGVkIGhlYWRlcnMgZnJvbSB0aGUg MzA0IHJlc3BvbnNlCisgICAgLy8gRnJlc2hlbmluZyBzdG9yZWQgcmVzcG9uc2UgdXBvbiB2YWxp ZGF0aW9uOgorICAgIC8vIGh0dHA6Ly90b29scy5pZXRmLm9yZy9odG1sL3JmYzcyMzQjc2VjdGlv bi00LjMuNAogICAgIGZvciAoY29uc3QgYXV0byYgaGVhZGVyIDogdmFsaWRhdGluZ1Jlc3BvbnNl Lmh0dHBIZWFkZXJGaWVsZHMoKSkgewogICAgICAgICAvLyBFbnRpdHkgaGVhZGVycyBzaG91bGQg bm90IGJlIHNlbnQgYnkgc2VydmVycyB3aGVuIGdlbmVyYXRpbmcgYSAzMDQKICAgICAgICAgLy8g cmVzcG9uc2U7IG1pc2NvbmZpZ3VyZWQgc2VydmVycyBzZW5kIHRoZW0gYW55d2F5LiBXZSBzaG91 bGRuJ3QgYWxsb3cKQEAgLTg5LDM3ICs4OSw0MyBAQCB2b2lkIHVwZGF0ZVJlc3BvbnNlSGVhZGVy c0FmdGVyUmV2YWxpZGF0aW9uKFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBSZQog ICAgIH0KIH0KIAotc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBjb21wdXRlQ3VycmVudEFnZShj b25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9j azo6dGltZV9wb2ludCByZXNwb25zZVRpbWVzdGFtcCkKK3N0ZDo6Y2hyb25vOjptaWNyb3NlY29u ZHMgY29tcHV0ZUN1cnJlbnRBZ2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGNv bnN0IHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQmIHJlc3BvbnNlVGltZSkK IHsKICAgICB1c2luZyBuYW1lc3BhY2Ugc3RkOjpjaHJvbm87CiAKLSAgICAvLyBSRkMyNjE2IDEz LjIuMwotICAgIC8vIE5vIGNvbXBlbnNhdGlvbiBmb3IgbGF0ZW5jeSBhcyB0aGF0IGlzIG5vdCB0 ZXJyaWJseSBpbXBvcnRhbnQgaW4gcHJhY3RpY2UKKyAgICAvLyBBZ2UgY2FsY3VsYXRpb246Cisg ICAgLy8gaHR0cDovL3Rvb2xzLmlldGYub3JnL2h0bWwvcmZjNzIzNCNzZWN0aW9uLTQuMi4zCisg ICAgLy8gTm8gY29tcGVuc2F0aW9uIGZvciBsYXRlbmN5IGFzIHRoYXQgaXMgbm90IHRlcnJpYmx5 IGltcG9ydGFudCBpbiBwcmFjdGljZS4KICAgICBhdXRvIGRhdGVWYWx1ZSA9IHJlc3BvbnNlLmRh dGUoKTsKLSAgICBhdXRvIGFwcGFyZW50QWdlID0gZGF0ZVZhbHVlID8gc3RkOjptYXgobWljcm9z ZWNvbmRzOjp6ZXJvKCksIGR1cmF0aW9uX2Nhc3Q8bWljcm9zZWNvbmRzPihyZXNwb25zZVRpbWVz dGFtcCAtIGRhdGVWYWx1ZS52YWx1ZSgpKSkgOiBtaWNyb3NlY29uZHM6Onplcm8oKTsKLSAgICBh dXRvIGFnZVZhbHVlID0gcmVzcG9uc2UuYWdlKCk7Ci0gICAgYXV0byBjb3JyZWN0ZWRSZWNlaXZl ZEFnZSA9IGFnZVZhbHVlID8gc3RkOjptYXgoYXBwYXJlbnRBZ2UsIGFnZVZhbHVlLnZhbHVlKCkp IDogYXBwYXJlbnRBZ2U7Ci0gICAgYXV0byByZXNpZGVudFRpbWUgPSBkdXJhdGlvbl9jYXN0PG1p Y3Jvc2Vjb25kcz4oc3lzdGVtX2Nsb2NrOjpub3coKSAtIHJlc3BvbnNlVGltZXN0YW1wKTsKLSAg ICByZXR1cm4gY29ycmVjdGVkUmVjZWl2ZWRBZ2UgKyByZXNpZGVudFRpbWU7CisgICAgYXV0byBh cHBhcmVudEFnZSA9IGRhdGVWYWx1ZSA/IHN0ZDo6bWF4KG1pY3Jvc2Vjb25kczo6emVybygpLCBk dXJhdGlvbl9jYXN0PG1pY3Jvc2Vjb25kcz4ocmVzcG9uc2VUaW1lIC0gZGF0ZVZhbHVlLnZhbHVl KCkpKSA6IG1pY3Jvc2Vjb25kczo6emVybygpOworICAgIGF1dG8gYWdlVmFsdWUgPSByZXNwb25z ZS5hZ2UoKS52YWx1ZU9yKG1pY3Jvc2Vjb25kczo6emVybygpKTsKKyAgICBhdXRvIGNvcnJlY3Rl ZEluaXRpYWxBZ2UgPSBzdGQ6Om1heChhcHBhcmVudEFnZSwgYWdlVmFsdWUpOworICAgIGF1dG8g cmVzaWRlbnRUaW1lID0gZHVyYXRpb25fY2FzdDxtaWNyb3NlY29uZHM+KHN5c3RlbV9jbG9jazo6 bm93KCkgLSByZXNwb25zZVRpbWUpOworICAgIHJldHVybiBjb3JyZWN0ZWRJbml0aWFsQWdlICsg cmVzaWRlbnRUaW1lOwogfQogCi1zdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGNvbXB1dGVGcmVz aG5lc3NMaWZldGltZUZvckhUVFBGYW1pbHkoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9u c2UsIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgcmVzcG9uc2VUaW1lc3Rh bXApCitzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGNvbXB1dGVGcmVzaG5lc3NMaWZldGltZUZv ckhUVFBGYW1pbHkoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGNvbnN0IHN0ZDo6 Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQmIHJlc3BvbnNlVGltZSkKIHsKICAgICB1 c2luZyBuYW1lc3BhY2Ugc3RkOjpjaHJvbm87CiAgICAgQVNTRVJUKHJlc3BvbnNlLnVybCgpLnBy b3RvY29sSXNJbkhUVFBGYW1pbHkoKSk7CiAKLSAgICAvLyBSRkMyNjE2IDEzLjIuNAorICAgIC8v IEZyZXNobmVzcyBMaWZldGltZToKKyAgICAvLyBodHRwOi8vdG9vbHMuaWV0Zi5vcmcvaHRtbC9y ZmM3MjM0I3NlY3Rpb24tNC4yLjEKICAgICBhdXRvIG1heEFnZSA9IHJlc3BvbnNlLmNhY2hlQ29u dHJvbE1heEFnZSgpOwogICAgIGlmIChtYXhBZ2UpCiAgICAgICAgIHJldHVybiBtYXhBZ2UudmFs dWUoKTsKICAgICBhdXRvIGV4cGlyZXMgPSByZXNwb25zZS5leHBpcmVzKCk7CiAgICAgYXV0byBk YXRlID0gcmVzcG9uc2UuZGF0ZSgpOwotICAgIGF1dG8gY3JlYXRpb25UaW1lID0gZGF0ZSA/IGRh dGUudmFsdWUoKSA6IHJlc3BvbnNlVGltZXN0YW1wOworICAgIGF1dG8gZGF0ZVZhbHVlID0gZGF0 ZSA/IGRhdGUudmFsdWUoKSA6IHJlc3BvbnNlVGltZTsKICAgICBpZiAoZXhwaXJlcykKLSAgICAg ICAgcmV0dXJuIGR1cmF0aW9uX2Nhc3Q8bWljcm9zZWNvbmRzPihleHBpcmVzLnZhbHVlKCkgLSBj cmVhdGlvblRpbWUpOworICAgICAgICByZXR1cm4gZHVyYXRpb25fY2FzdDxtaWNyb3NlY29uZHM+ KGV4cGlyZXMudmFsdWUoKSAtIGRhdGVWYWx1ZSk7CisKKyAgICAvLyBIZXVyaXN0aWMgRnJlc2hu ZXNzOgorICAgIC8vIGh0dHA6Ly90b29scy5pZXRmLm9yZy9odG1sL3JmYzcyMzQjc2VjdGlvbi00 LjIuMgogICAgIGF1dG8gbGFzdE1vZGlmaWVkID0gcmVzcG9uc2UubGFzdE1vZGlmaWVkKCk7CiAg ICAgaWYgKGxhc3RNb2RpZmllZCkKLSAgICAgICAgcmV0dXJuIGR1cmF0aW9uX2Nhc3Q8bWljcm9z ZWNvbmRzPigoY3JlYXRpb25UaW1lIC0gbGFzdE1vZGlmaWVkLnZhbHVlKCkpICogMC4xKTsKKyAg ICAgICAgcmV0dXJuIGR1cmF0aW9uX2Nhc3Q8bWljcm9zZWNvbmRzPigoZGF0ZVZhbHVlIC0gbGFz dE1vZGlmaWVkLnZhbHVlKCkpICogMC4xKTsKKwogICAgIC8vIElmIG5vIGNhY2hlIGhlYWRlcnMg YXJlIHByZXNlbnQsIHRoZSBzcGVjaWZpY2F0aW9uIGxlYXZlcyB0aGUgZGVjaXNpb24gdG8gdGhl IFVBLiBPdGhlciBicm93c2VycyBzZWVtIHRvIG9wdCBmb3IgMC4KICAgICByZXR1cm4gbWljcm9z ZWNvbmRzOjp6ZXJvKCk7CiB9CkBAIC0xNTgsNyArMTY0LDcgQEAgYm9vbCByZWRpcmVjdENoYWlu QWxsb3dzUmV1c2UoUmVkaXJlY3RDaGFpbkNhY2hlU3RhdHVzIHJlZGlyZWN0Q2hhaW5DYWNoZVN0 YXR1cywKIAogaW5saW5lIGJvb2wgaXNDYWNoZUhlYWRlclNlcGFyYXRvcihVQ2hhciBjKQogewot ICAgIC8vIFNlZSBSRkMgMjYxNiwgU2VjdGlvbiAyLjIKKyAgICAvLyBodHRwOi8vdG9vbHMuaWV0 Zi5vcmcvaHRtbC9yZmM3MjMwI3NlY3Rpb24tMy4yLjYKICAgICBzd2l0Y2ggKGMpIHsKICAgICBj YXNlICcoJzoKICAgICBjYXNlICcpJzoKQEAgLTI2NSw4ICsyNzEsOSBAQCBDYWNoZUNvbnRyb2xE aXJlY3RpdmVzIHBhcnNlQ2FjaGVDb250cm9sRGlyZWN0aXZlcyhjb25zdCBIVFRQSGVhZGVyTWFw JiBoZWFkZXJzKQogCiAgICAgICAgIHNpemVfdCBkaXJlY3RpdmVzU2l6ZSA9IGRpcmVjdGl2ZXMu c2l6ZSgpOwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGRpcmVjdGl2ZXNTaXplOyAr K2kpIHsKLSAgICAgICAgICAgIC8vIFJGQzI2MTYgMTQuOS4xOiBBIG5vLWNhY2hlIGRpcmVjdGl2 ZSB3aXRoIGEgdmFsdWUgaXMgb25seSBtZWFuaW5nZnVsIGZvciBwcm94eSBjYWNoZXMuCisgICAg ICAgICAgICAvLyBBIG5vLWNhY2hlIGRpcmVjdGl2ZSB3aXRoIGEgdmFsdWUgaXMgb25seSBtZWFu aW5nZnVsIGZvciBwcm94eSBjYWNoZXMuCiAgICAgICAgICAgICAvLyBJdCBzaG91bGQgYmUgaWdu b3JlZCBieSBhIGJyb3dzZXIgbGV2ZWwgY2FjaGUuCisgICAgICAgICAgICAvLyBodHRwOi8vdG9v bHMuaWV0Zi5vcmcvaHRtbC9yZmM3MjM0I3NlY3Rpb24tNS4yLjIuMgogICAgICAgICAgICAgaWYg KGVxdWFsSWdub3JpbmdDYXNlKGRpcmVjdGl2ZXNbaV0uZmlyc3QsICJuby1jYWNoZSIpICYmIGRp cmVjdGl2ZXNbaV0uc2Vjb25kLmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICByZXN1bHQubm9D YWNoZSA9IHRydWU7CiAgICAgICAgICAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShkaXJl Y3RpdmVzW2ldLmZpcnN0LCAibm8tc3RvcmUiKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvQ2FjaGVWYWxpZGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL0NhY2hlVmFsaWRhdGlvbi5oCmluZGV4IDQ1ZjRkM2Q4N2RiZmUyNzg5OTEx ZDcwNmZkOWMyN2Y5ZWUyN2MwZTguLmNiNDJlNzg4YTIzODdmODdkNGY5Mzk3ZWE2Mzc0MDBiYWUz ZDVhYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQ2FjaGVW YWxpZGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9DYWNoZVZh bGlkYXRpb24uaApAQCAtNDcsOCArNDcsOCBAQCBzdHJ1Y3QgUmVkaXJlY3RDaGFpbkNhY2hlU3Rh dHVzIHsKICAgICBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IGVuZE9mVmFs aWRpdHk7CiB9OwogCi1XRUJDT1JFX0VYUE9SVCBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGNv bXB1dGVDdXJyZW50QWdlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBzdGQ6OmNocm9ubzo6c3lz dGVtX2Nsb2NrOjp0aW1lX3BvaW50IHJlc3BvbnNlVGltZXN0YW1wKTsKLVdFQkNPUkVfRVhQT1JU IHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMgY29tcHV0ZUZyZXNobmVzc0xpZmV0aW1lRm9ySFRU UEZhbWlseShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9j azo6dGltZV9wb2ludCByZXNwb25zZVRpbWVzdGFtcCk7CitXRUJDT1JFX0VYUE9SVCBzdGQ6OmNo cm9ubzo6bWljcm9zZWNvbmRzIGNvbXB1dGVDdXJyZW50QWdlKGNvbnN0IFJlc291cmNlUmVzcG9u c2UmLCBjb25zdCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50JiByZXNwb25z ZVRpbWVzdGFtcCk7CitXRUJDT1JFX0VYUE9SVCBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGNv bXB1dGVGcmVzaG5lc3NMaWZldGltZUZvckhUVFBGYW1pbHkoY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYsIGNvbnN0IHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQmIHJlc3BvbnNl VGltZXN0YW1wKTsKIFdFQkNPUkVfRVhQT1JUIHZvaWQgdXBkYXRlUmVzcG9uc2VIZWFkZXJzQWZ0 ZXJSZXZhbGlkYXRpb24oUmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2Um IHZhbGlkYXRpbmdSZXNwb25zZSk7CiBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZVJlZGlyZWN0 Q2hhaW5TdGF0dXMoUmVkaXJlY3RDaGFpbkNhY2hlU3RhdHVzJiwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYpOwogCg== 250574 2015-04-11 10:37:26 -0700 2015-04-11 11:26:48 -0700 Patch bug-143619-20150411103636.patch text/plain 6209 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ3ZmFmZjI2YjUzZDI4 NjM4NDc3YzY4ZWVhZGU0YjU0YmZhMzg5NC4uZjI0MTIyZTE0NDk0NjFhZDlmMjJiNmUwNjkwMmI3 M2Y3MWI5NzZmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA0LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCByZWZlcnJpbmcgdG8g b3V0ZGF0ZWQgUkZDMjYxNiBpbiBDYWNoZVZhbGlkYXRpb24uY3BwCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM2MTkKKworICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBTdG9wIHJlZmVycmluZyB0byBvdXRkYXRlZCBS RkMyNjE2IGluIENhY2hlVmFsaWRhdGlvbi5jcHAgYW5kIHJlZmVyIHRvCisgICAgICAgIHRoZSBu ZXdlciBSRkM3MjMwICYgUkZDNzIzNC4gQWxzbyB1cGRhdGUgc29tZSB2YXJpYWJsZXMgdG8gbWF0 Y2ggdGhlCisgICAgICAgIG5hbWluZyBpbiB0aGUgUkZDIGZvciBjbGFyaXR5LgorCisgICAgICAg IE5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvQ2FjaGVW YWxpZGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZVJlc3BvbnNlSGVhZGVyc0Fm dGVyUmV2YWxpZGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVDdXJyZW50QWdlKToK KyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVGcmVzaG5lc3NMaWZldGltZUZvckhUVFBGYW1pbHkp OgorICAgICAgICAoV2ViQ29yZTo6aXNDYWNoZUhlYWRlclNlcGFyYXRvcik6CisgICAgICAgIChX ZWJDb3JlOjpwYXJzZUNhY2hlQ29udHJvbERpcmVjdGl2ZXMpOgorCiAyMDE1LTA0LTExICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFdlYktpdCBwbGFjZXMgY2Fy ZXQgaW4gZnJvbnQgb2YgcGFzdGVkIE51bWJlcnMgY2VsbHMgaW5zdGVhZCBvZiBiZWhpbmQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQ2FjaGVWYWxpZGF0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQ2FjaGVWYWxpZGF0aW9uLmNw cAppbmRleCBhMTk1N2Y5NzI0YjllNzVlMWZhNzQ2MzQ1YzNmZGVhNzQwMmQ2NWQ0Li5iZDgwYTRl YmU0OTU4NjcyZTcyYjc2NmUwMTU3ZmQ2YzE2OWRlNGYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL0NhY2hlVmFsaWRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9DYWNoZVZhbGlkYXRpb24uY3BwCkBAIC03NSw4ICs3NSw4 IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBzaG91bGRVcGRhdGVIZWFkZXJBZnRlclJldmFsaWRhdGlv bihjb25zdCBTdHJpbmcmIGhlYWRlcikKIAogdm9pZCB1cGRhdGVSZXNwb25zZUhlYWRlcnNBZnRl clJldmFsaWRhdGlvbihSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYgdmFsaWRhdGluZ1Jlc3BvbnNlKQogewotICAgIC8vIFJGQzI2MTYgMTAuMy41Ci0g ICAgLy8gVXBkYXRlIGNhY2hlZCBoZWFkZXJzIGZyb20gdGhlIDMwNCByZXNwb25zZQorICAgIC8v IEZyZXNoZW5pbmcgc3RvcmVkIHJlc3BvbnNlIHVwb24gdmFsaWRhdGlvbjoKKyAgICAvLyBodHRw Oi8vdG9vbHMuaWV0Zi5vcmcvaHRtbC9yZmM3MjM0I3NlY3Rpb24tNC4zLjQKICAgICBmb3IgKGNv bnN0IGF1dG8mIGhlYWRlciA6IHZhbGlkYXRpbmdSZXNwb25zZS5odHRwSGVhZGVyRmllbGRzKCkp IHsKICAgICAgICAgLy8gRW50aXR5IGhlYWRlcnMgc2hvdWxkIG5vdCBiZSBzZW50IGJ5IHNlcnZl cnMgd2hlbiBnZW5lcmF0aW5nIGEgMzA0CiAgICAgICAgIC8vIHJlc3BvbnNlOyBtaXNjb25maWd1 cmVkIHNlcnZlcnMgc2VuZCB0aGVtIGFueXdheS4gV2Ugc2hvdWxkbid0IGFsbG93CkBAIC04OSwz NyArODksNDMgQEAgdm9pZCB1cGRhdGVSZXNwb25zZUhlYWRlcnNBZnRlclJldmFsaWRhdGlvbihS ZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29uc3QgUmUKICAgICB9CiB9CiAKLXN0ZDo6Y2hy b25vOjptaWNyb3NlY29uZHMgY29tcHV0ZUN1cnJlbnRBZ2UoY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYgcmVzcG9uc2UsIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgcmVzcG9u c2VUaW1lc3RhbXApCitzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGNvbXB1dGVDdXJyZW50QWdl KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Ns b2NrOjp0aW1lX3BvaW50IHJlc3BvbnNlVGltZSkKIHsKICAgICB1c2luZyBuYW1lc3BhY2Ugc3Rk OjpjaHJvbm87CiAKLSAgICAvLyBSRkMyNjE2IDEzLjIuMwotICAgIC8vIE5vIGNvbXBlbnNhdGlv biBmb3IgbGF0ZW5jeSBhcyB0aGF0IGlzIG5vdCB0ZXJyaWJseSBpbXBvcnRhbnQgaW4gcHJhY3Rp Y2UKKyAgICAvLyBBZ2UgY2FsY3VsYXRpb246CisgICAgLy8gaHR0cDovL3Rvb2xzLmlldGYub3Jn L2h0bWwvcmZjNzIzNCNzZWN0aW9uLTQuMi4zCisgICAgLy8gTm8gY29tcGVuc2F0aW9uIGZvciBs YXRlbmN5IGFzIHRoYXQgaXMgbm90IHRlcnJpYmx5IGltcG9ydGFudCBpbiBwcmFjdGljZS4KICAg ICBhdXRvIGRhdGVWYWx1ZSA9IHJlc3BvbnNlLmRhdGUoKTsKLSAgICBhdXRvIGFwcGFyZW50QWdl ID0gZGF0ZVZhbHVlID8gc3RkOjptYXgobWljcm9zZWNvbmRzOjp6ZXJvKCksIGR1cmF0aW9uX2Nh c3Q8bWljcm9zZWNvbmRzPihyZXNwb25zZVRpbWVzdGFtcCAtIGRhdGVWYWx1ZS52YWx1ZSgpKSkg OiBtaWNyb3NlY29uZHM6Onplcm8oKTsKLSAgICBhdXRvIGFnZVZhbHVlID0gcmVzcG9uc2UuYWdl KCk7Ci0gICAgYXV0byBjb3JyZWN0ZWRSZWNlaXZlZEFnZSA9IGFnZVZhbHVlID8gc3RkOjptYXgo YXBwYXJlbnRBZ2UsIGFnZVZhbHVlLnZhbHVlKCkpIDogYXBwYXJlbnRBZ2U7Ci0gICAgYXV0byBy ZXNpZGVudFRpbWUgPSBkdXJhdGlvbl9jYXN0PG1pY3Jvc2Vjb25kcz4oc3lzdGVtX2Nsb2NrOjpu b3coKSAtIHJlc3BvbnNlVGltZXN0YW1wKTsKLSAgICByZXR1cm4gY29ycmVjdGVkUmVjZWl2ZWRB Z2UgKyByZXNpZGVudFRpbWU7CisgICAgYXV0byBhcHBhcmVudEFnZSA9IGRhdGVWYWx1ZSA/IHN0 ZDo6bWF4KG1pY3Jvc2Vjb25kczo6emVybygpLCBkdXJhdGlvbl9jYXN0PG1pY3Jvc2Vjb25kcz4o cmVzcG9uc2VUaW1lIC0gZGF0ZVZhbHVlLnZhbHVlKCkpKSA6IG1pY3Jvc2Vjb25kczo6emVybygp OworICAgIGF1dG8gYWdlVmFsdWUgPSByZXNwb25zZS5hZ2UoKS52YWx1ZU9yKG1pY3Jvc2Vjb25k czo6emVybygpKTsKKyAgICBhdXRvIGNvcnJlY3RlZEluaXRpYWxBZ2UgPSBzdGQ6Om1heChhcHBh cmVudEFnZSwgYWdlVmFsdWUpOworICAgIGF1dG8gcmVzaWRlbnRUaW1lID0gZHVyYXRpb25fY2Fz dDxtaWNyb3NlY29uZHM+KHN5c3RlbV9jbG9jazo6bm93KCkgLSByZXNwb25zZVRpbWUpOworICAg IHJldHVybiBjb3JyZWN0ZWRJbml0aWFsQWdlICsgcmVzaWRlbnRUaW1lOwogfQogCi1zdGQ6OmNo cm9ubzo6bWljcm9zZWNvbmRzIGNvbXB1dGVGcmVzaG5lc3NMaWZldGltZUZvckhUVFBGYW1pbHko Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xv Y2s6OnRpbWVfcG9pbnQgcmVzcG9uc2VUaW1lc3RhbXApCitzdGQ6OmNocm9ubzo6bWljcm9zZWNv bmRzIGNvbXB1dGVGcmVzaG5lc3NMaWZldGltZUZvckhUVFBGYW1pbHkoY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYgcmVzcG9uc2UsIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQg cmVzcG9uc2VUaW1lKQogewogICAgIHVzaW5nIG5hbWVzcGFjZSBzdGQ6OmNocm9ubzsKICAgICBB U1NFUlQocmVzcG9uc2UudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKTsKIAotICAgIC8v IFJGQzI2MTYgMTMuMi40CisgICAgLy8gRnJlc2huZXNzIExpZmV0aW1lOgorICAgIC8vIGh0dHA6 Ly90b29scy5pZXRmLm9yZy9odG1sL3JmYzcyMzQjc2VjdGlvbi00LjIuMQogICAgIGF1dG8gbWF4 QWdlID0gcmVzcG9uc2UuY2FjaGVDb250cm9sTWF4QWdlKCk7CiAgICAgaWYgKG1heEFnZSkKICAg ICAgICAgcmV0dXJuIG1heEFnZS52YWx1ZSgpOwogICAgIGF1dG8gZXhwaXJlcyA9IHJlc3BvbnNl LmV4cGlyZXMoKTsKICAgICBhdXRvIGRhdGUgPSByZXNwb25zZS5kYXRlKCk7Ci0gICAgYXV0byBj cmVhdGlvblRpbWUgPSBkYXRlID8gZGF0ZS52YWx1ZSgpIDogcmVzcG9uc2VUaW1lc3RhbXA7Cisg ICAgYXV0byBkYXRlVmFsdWUgPSBkYXRlID8gZGF0ZS52YWx1ZSgpIDogcmVzcG9uc2VUaW1lOwog ICAgIGlmIChleHBpcmVzKQotICAgICAgICByZXR1cm4gZHVyYXRpb25fY2FzdDxtaWNyb3NlY29u ZHM+KGV4cGlyZXMudmFsdWUoKSAtIGNyZWF0aW9uVGltZSk7CisgICAgICAgIHJldHVybiBkdXJh dGlvbl9jYXN0PG1pY3Jvc2Vjb25kcz4oZXhwaXJlcy52YWx1ZSgpIC0gZGF0ZVZhbHVlKTsKKwor ICAgIC8vIEhldXJpc3RpYyBGcmVzaG5lc3M6CisgICAgLy8gaHR0cDovL3Rvb2xzLmlldGYub3Jn L2h0bWwvcmZjNzIzNCNzZWN0aW9uLTQuMi4yCiAgICAgYXV0byBsYXN0TW9kaWZpZWQgPSByZXNw b25zZS5sYXN0TW9kaWZpZWQoKTsKICAgICBpZiAobGFzdE1vZGlmaWVkKQotICAgICAgICByZXR1 cm4gZHVyYXRpb25fY2FzdDxtaWNyb3NlY29uZHM+KChjcmVhdGlvblRpbWUgLSBsYXN0TW9kaWZp ZWQudmFsdWUoKSkgKiAwLjEpOworICAgICAgICByZXR1cm4gZHVyYXRpb25fY2FzdDxtaWNyb3Nl Y29uZHM+KChkYXRlVmFsdWUgLSBsYXN0TW9kaWZpZWQudmFsdWUoKSkgKiAwLjEpOworCiAgICAg Ly8gSWYgbm8gY2FjaGUgaGVhZGVycyBhcmUgcHJlc2VudCwgdGhlIHNwZWNpZmljYXRpb24gbGVh dmVzIHRoZSBkZWNpc2lvbiB0byB0aGUgVUEuIE90aGVyIGJyb3dzZXJzIHNlZW0gdG8gb3B0IGZv ciAwLgogICAgIHJldHVybiBtaWNyb3NlY29uZHM6Onplcm8oKTsKIH0KQEAgLTE1OCw3ICsxNjQs NyBAQCBib29sIHJlZGlyZWN0Q2hhaW5BbGxvd3NSZXVzZShSZWRpcmVjdENoYWluQ2FjaGVTdGF0 dXMgcmVkaXJlY3RDaGFpbkNhY2hlU3RhdHVzLAogCiBpbmxpbmUgYm9vbCBpc0NhY2hlSGVhZGVy U2VwYXJhdG9yKFVDaGFyIGMpCiB7Ci0gICAgLy8gU2VlIFJGQyAyNjE2LCBTZWN0aW9uIDIuMgor ICAgIC8vIGh0dHA6Ly90b29scy5pZXRmLm9yZy9odG1sL3JmYzcyMzAjc2VjdGlvbi0zLjIuNgog ICAgIHN3aXRjaCAoYykgewogICAgIGNhc2UgJygnOgogICAgIGNhc2UgJyknOgpAQCAtMjY1LDgg KzI3MSw5IEBAIENhY2hlQ29udHJvbERpcmVjdGl2ZXMgcGFyc2VDYWNoZUNvbnRyb2xEaXJlY3Rp dmVzKGNvbnN0IEhUVFBIZWFkZXJNYXAmIGhlYWRlcnMpCiAKICAgICAgICAgc2l6ZV90IGRpcmVj dGl2ZXNTaXplID0gZGlyZWN0aXZlcy5zaXplKCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgZGlyZWN0aXZlc1NpemU7ICsraSkgewotICAgICAgICAgICAgLy8gUkZDMjYxNiAxNC45 LjE6IEEgbm8tY2FjaGUgZGlyZWN0aXZlIHdpdGggYSB2YWx1ZSBpcyBvbmx5IG1lYW5pbmdmdWwg Zm9yIHByb3h5IGNhY2hlcy4KKyAgICAgICAgICAgIC8vIEEgbm8tY2FjaGUgZGlyZWN0aXZlIHdp dGggYSB2YWx1ZSBpcyBvbmx5IG1lYW5pbmdmdWwgZm9yIHByb3h5IGNhY2hlcy4KICAgICAgICAg ICAgIC8vIEl0IHNob3VsZCBiZSBpZ25vcmVkIGJ5IGEgYnJvd3NlciBsZXZlbCBjYWNoZS4KKyAg ICAgICAgICAgIC8vIGh0dHA6Ly90b29scy5pZXRmLm9yZy9odG1sL3JmYzcyMzQjc2VjdGlvbi01 LjIuMi4yCiAgICAgICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZGlyZWN0aXZlc1tpXS5m aXJzdCwgIm5vLWNhY2hlIikgJiYgZGlyZWN0aXZlc1tpXS5zZWNvbmQuaXNFbXB0eSgpKQogICAg ICAgICAgICAgICAgIHJlc3VsdC5ub0NhY2hlID0gdHJ1ZTsKICAgICAgICAgICAgIGVsc2UgaWYg KGVxdWFsSWdub3JpbmdDYXNlKGRpcmVjdGl2ZXNbaV0uZmlyc3QsICJuby1zdG9yZSIpKQo=