139753 2014-12-17 15:58:02 -0800 [iOS] Log navigation types using FeatureCounter API 2014-12-18 10:42:39 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 139652 1 cdumez cdumez ap barraclough commit-queue japhet kling koivisto oldest_to_newest 1056574 0 cdumez 2014-12-17 15:58:02 -0800 We should log navigation types using FeatureCounter API. Radar: <rdar://problem/19285978> 1056575 1 243467 cdumez 2014-12-17 16:01:31 -0800 Created attachment 243467 Patch 1056711 2 243478 cdumez 2014-12-17 19:11:23 -0800 Created attachment 243478 Patch 1056791 3 243478 darin 2014-12-18 09:32:20 -0800 Comment on attachment 243478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243478&action=review > Source/WebCore/loader/FrameLoader.cpp:1383 > + const char* key = nullptr; Given the current code exactly the way it is, there is no reason to initialize key since it’s initialized in all code paths. > Source/WebCore/loader/FrameLoader.cpp:1407 > + default: > + return; Why would we return without logging or asserting when we saw an unexpected frame load type? Is this a real case that we intentionally handle this way because we want to leave this data out of the feature counter, or perhaps an unexpected case where we should be asserting instead? By including a default in the switch, we won’t get a warning if we add a new frame load type and forget to add a case to this switch statement. It would be better to not have default, and thus get the warning if a case is missing. My preference would be a separate function where we use a return statement to exit the function inside each case. That way, we could catch unknown frame load types at runtime, with code after the switch, but also get a reminder to handle new frame load types at compile time, because of the compiler’s checking of the switch. > Source/WebCore/loader/FrameLoader.cpp:1409 > + ASSERT(key); I don’t think this assertion is valuable. 1056792 4 243478 darin 2014-12-18 09:33:40 -0800 Comment on attachment 243478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243478&action=review > Source/WebCore/ChangeLog:11 > + No new tests, no behavior change. I think that’s misleading. There is indeed a behavior change! We added new feature counting. The reason we have no new tests is that it’s not our practice to add tests for feature counters, for some reason. It would be better to state that rather than calling this “no behavior change”. Even “no behavior change other than additional feature counting” would be better than what we have written here. 1056800 5 243478 cdumez 2014-12-18 09:48:53 -0800 Comment on attachment 243478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243478&action=review >> Source/WebCore/loader/FrameLoader.cpp:1407 >> + return; > > Why would we return without logging or asserting when we saw an unexpected frame load type? Is this a real case that we intentionally handle this way because we want to leave this data out of the feature counter, or perhaps an unexpected case where we should be asserting instead? > > By including a default in the switch, we won’t get a warning if we add a new frame load type and forget to add a case to this switch statement. It would be better to not have default, and thus get the warning if a case is missing. My preference would be a separate function where we use a return statement to exit the function inside each case. That way, we could catch unknown frame load types at runtime, with code after the switch, but also get a reminder to handle new frame load types at compile time, because of the compiler’s checking of the switch. Ok, I will explicitly state all possible values. I am currently not logging RedirectWithLockedBackForwardList / Replace because I wasn't sure we were interested in such navigations. 1056804 6 243498 cdumez 2014-12-18 10:08:33 -0800 Created attachment 243498 Patch 1056813 7 243498 commit-queue 2014-12-18 10:42:33 -0800 Comment on attachment 243498 Patch Clearing flags on attachment: 243498 Committed r177504: <http://trac.webkit.org/changeset/177504> 1056814 8 commit-queue 2014-12-18 10:42:39 -0800 All reviewed patches have been landed. Closing bug. 243467 2014-12-17 16:01:31 -0800 2014-12-17 19:11:18 -0800 Patch bug-139753-20141217160221.patch text/plain 4576 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjFmYjY0ZGRmZGI4MGIx YzQxYzhmZWMwNWFjNWJhNGQwZmM3MjIzMC4uNTgxOGY3ODYyNDhjOTFhMjcwMTRkZTQ0ZGVmNjli MWNlMTVjYjg2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTEyLTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTG9nIG5hdmlnYXRp b24gdHlwZXMgdXNpbmcgRmVhdHVyZUNvdW50ZXIgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb2cgbmF2aWdhdGlvbiB0eXBlcyB1c2luZyBGZWF0 dXJlQ291bnRlciBBUEkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFu Z2UuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6bG9nTmF2aWdhdGlvbldpdGhGZWF0dXJlQ291bnRlcik6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZUxvYWRlcjo6bG9hZFdpdGhEb2N1bWVudExvYWRlcik6CisgICAgICAgICogcGxhdGZvcm0v RmVhdHVyZUNvdW50ZXJLZXlzLmg6CisKIDIwMTQtMTItMTcgIHBlYXZvQG91dGxvb2suY29tICA8 cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW0N1cmxdIENvbXBpbGUgZXJyb3IsIHNldFdh c0NhY2hlZCBtZXRob2QgaGFzIGJlZW4gcmVtb3ZlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCmluZGV4IDI3ZjUyODUyMTA2MGVkNzY5ZWZjODIzZWZmMjMzM2RkNmNlN2M0MTUu LjdkOWQwYTdiYzc2YWMwNTNmODdlNzE3N2Q1MDI2YzVhZjJlNTBiYmYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtNTgsNiArNTgsNyBAQAogI2luY2x1ZGUgIkV2ZW50 LmgiCiAjaW5jbHVkZSAiRXZlbnRIYW5kbGVyLmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgor I2luY2x1ZGUgIkZlYXR1cmVDb3VudGVyLmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAjaW5j bHVkZSAiRm9ybVN0YXRlLmgiCiAjaW5jbHVkZSAiRm9ybVN1Ym1pc3Npb24uaCIKQEAgLTE0MTIs NiArMTQxMywzOCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkKERvY3VtZW50TG9hZGVyKiBuZXdE b2N1bWVudExvYWRlcikKICAgICBsb2FkV2l0aERvY3VtZW50TG9hZGVyKG5ld0RvY3VtZW50TG9h ZGVyLCB0eXBlLCAwLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Olllcyk7CiB9CiAKK3N0 YXRpYyB2b2lkIGxvZ05hdmlnYXRpb25XaXRoRmVhdHVyZUNvdW50ZXIoUGFnZSogcGFnZSwgRnJh bWVMb2FkVHlwZSB0eXBlKQoreworICAgIGNvbnN0IGNoYXIqIGtleSA9IG51bGxwdHI7CisgICAg c3dpdGNoICh0eXBlKSB7CisgICAgY2FzZSBGcmFtZUxvYWRUeXBlOjpTdGFuZGFyZDoKKyAgICAg ICAga2V5ID0gRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uU3RhbmRhcmQ7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6QmFjazoKKyAgICAgICAga2V5ID0gRmVhdHVyZUNv dW50ZXJOYXZpZ2F0aW9uQmFjazsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGcmFtZUxvYWRU eXBlOjpGb3J3YXJkOgorICAgICAgICBrZXkgPSBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25Gb3J3 YXJkOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OkluZGV4ZWRCYWNr Rm9yd2FyZDoKKyAgICAgICAga2V5ID0gRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uSW5kZXhlZEJh Y2tGb3J3YXJkOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OlJlbG9h ZDoKKyAgICAgICAga2V5ID0gRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uUmVsb2FkOworICAgICAg ICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OlNhbWU6CisgICAgICAgIGtleSA9IEZl YXR1cmVDb3VudGVyTmF2aWdhdGlvblNhbWU7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRnJh bWVMb2FkVHlwZTo6UmVsb2FkRnJvbU9yaWdpbjoKKyAgICAgICAga2V5ID0gRmVhdHVyZUNvdW50 ZXJOYXZpZ2F0aW9uUmVsb2FkRnJvbU9yaWdpbjsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVs dDoKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBBU1NFUlQoa2V5KTsKKyAgICBGRUFUVVJF X0NPVU5URVJfSU5DUkVNRU5UX0tFWShwYWdlLCBrZXkpOworfQorCiB2b2lkIEZyYW1lTG9hZGVy Ojpsb2FkV2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIEZyYW1lTG9h ZFR5cGUgdHlwZSwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+IHBycEZvcm1TdGF0ZSwgQWxsb3dOYXZp Z2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCkKIHsKICAgICAv LyBSZXRhaW4gYmVjYXVzZSBkaXNwYXRjaEJlZm9yZUxvYWRFdmVudCBtYXkgcmVsZWFzZSB0aGUg bGFzdCByZWZlcmVuY2UgdG8gaXQuCkBAIC0xNDMwLDYgKzE0NjMsMTAgQEAgdm9pZCBGcmFtZUxv YWRlcjo6bG9hZFdpdGhEb2N1bWVudExvYWRlcihEb2N1bWVudExvYWRlciogbG9hZGVyLCBGcmFt ZUxvYWRUeXBlIHQKICAgICBpZiAobV9mcmFtZS5kb2N1bWVudCgpKQogICAgICAgICBtX3ByZXZp b3VzVVJMID0gbV9mcmFtZS5kb2N1bWVudCgpLT51cmwoKTsKIAorICAgIC8vIExvZyBtYWluIGZy YW1lIG5hdmlnYXRpb24gdHlwZXMuCisgICAgaWYgKG1fZnJhbWUuaXNNYWluRnJhbWUoKSkKKyAg ICAgICAgbG9nTmF2aWdhdGlvbldpdGhGZWF0dXJlQ291bnRlcihtX2ZyYW1lLnBhZ2UoKSwgdHlw ZSk7CisKICAgICBwb2xpY3lDaGVja2VyKCkuc2V0TG9hZFR5cGUodHlwZSk7CiAgICAgUmVmUHRy PEZvcm1TdGF0ZT4gZm9ybVN0YXRlID0gcHJwRm9ybVN0YXRlOwogICAgIGJvb2wgaXNGb3JtU3Vi bWlzc2lvbiA9IGZvcm1TdGF0ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0ZlYXR1cmVDb3VudGVyS2V5cy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNv dW50ZXJLZXlzLmgKaW5kZXggMmNmZjM4MmQ0Y2Q1MzgyZWMxMWY1NmRiNzZmYjUzODY3YWM2ZDcw MS4uM2Q0ZWY5Y2QxNTczMDUyMmIzMWFmODEzZTExZjFkNmE4YzhiYWNlOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmgKQEAgLTYxLDYgKzYxLDE1IEBA IHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZVNhbWVMb2Fk S2V5W10gPSAiY29tLmFwcGxlLldlYktpCiBzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRl clBhZ2VDYWNoZUZhaWx1cmVLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0LnBhZ2VDYWNoZS5mYWls dXJlIjsKIHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlU3VjY2Vzc0tl eVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLnN1Y2Nlc3MiOwogCisvLyBOYXZpZ2F0 aW9uIHR5cGVzLgorc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uU3Rh bmRhcmRbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm5hdmlnYXRpb24uc3RhbmRhcmQiOworc3RhdGlj IGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uQmFja1tdID0gImNvbS5hcHBsZS5X ZWJLaXQubmF2aWdhdGlvbi5iYWNrIjsKK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVy TmF2aWdhdGlvbkZvcndhcmRbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm5hdmlnYXRpb24uZm9yd2Fy ZCI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25JbmRleGVkQmFj a0ZvcndhcmRbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm5hdmlnYXRpb24uaW5kZXhlZEJhY2tGb3J3 YXJkIjsKK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyTmF2aWdhdGlvblJlbG9hZFtd ID0gImNvbS5hcHBsZS5XZWJLaXQubmF2aWdhdGlvbi5yZWxvYWQiOworc3RhdGljIGNvbnN0IGNo YXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uU2FtZVtdID0gImNvbS5hcHBsZS5XZWJLaXQubmF2 aWdhdGlvbi5zYW1lIjsKK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyTmF2aWdhdGlv blJlbG9hZEZyb21PcmlnaW5bXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm5hdmlnYXRpb24ucmVsb2Fk RnJvbU9yaWdpbiI7CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEZlYXR1 cmVDb3VudGVyS2V5c19oCg== 243478 2014-12-17 19:11:23 -0800 2014-12-18 10:08:25 -0800 Patch bug-139753-20141217191124.patch text/plain 4623 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE5Nzk1ZGQ3ZjJmYzhh Y2Y1MWY3OGEwNjNiMThhZmMxOWU2MzY3Zi4uMzQzOWY2YjQzMjM3ZTVjODViYTVjZjM3YjBjZmQ3 ZWIxYzEwZTk1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTEyLTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTG9nIG5hdmlnYXRp b24gdHlwZXMgdXNpbmcgRmVhdHVyZUNvdW50ZXIgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3NTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzE5Mjg1OTc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIExvZyBuYXZpZ2F0aW9uIHR5cGVzIHVzaW5nIEZlYXR1cmVDb3VudGVyIEFQSS4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGxvYWRl ci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dOYXZpZ2F0aW9uV2l0aEZl YXR1cmVDb3VudGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkV2l0aERv Y3VtZW50TG9hZGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaDoK KwogMjAxNC0xMi0xNyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xOTI4MjUwOD4gV2ViS2l0TGVnYWN5IGlzIHVudXNhYmxlIGR1ZSB0 byBiYWQgZHlsaWIgaWRlbnRpZmllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK aW5kZXggY2FjMmIxZGI0NGRkNTI3Nzk4YTJkYTU4MGRkZDdjYTMzMWI5YTgxZS4uNWUxNDhmZjgy Yjk1NDU1NzEzYjQzOWU1Y2MyNjRjYjAxMzc4ZmY0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCkBAIC01OCw2ICs1OCw3IEBACiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNs dWRlICJFdmVudEhhbmRsZXIuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCisjaW5jbHVkZSAi RmVhdHVyZUNvdW50ZXIuaCIKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKICNpbmNsdWRlICJGb3Jt U3RhdGUuaCIKICNpbmNsdWRlICJGb3JtU3VibWlzc2lvbi5oIgpAQCAtMTM3Nyw2ICsxMzc4LDM4 IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoRG9jdW1lbnRMb2FkZXIqIG5ld0RvY3VtZW50TG9h ZGVyKQogICAgIGxvYWRXaXRoRG9jdW1lbnRMb2FkZXIobmV3RG9jdW1lbnRMb2FkZXIsIHR5cGUs IDAsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6WWVzKTsKIH0KIAorc3RhdGljIHZvaWQg bG9nTmF2aWdhdGlvbldpdGhGZWF0dXJlQ291bnRlcihQYWdlKiBwYWdlLCBGcmFtZUxvYWRUeXBl IHR5cGUpCit7CisgICAgY29uc3QgY2hhcioga2V5ID0gbnVsbHB0cjsKKyAgICBzd2l0Y2ggKHR5 cGUpIHsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OlN0YW5kYXJkOgorICAgICAgICBrZXkgPSBG ZWF0dXJlQ291bnRlck5hdmlnYXRpb25TdGFuZGFyZDsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBGcmFtZUxvYWRUeXBlOjpCYWNrOgorICAgICAgICBrZXkgPSBGZWF0dXJlQ291bnRlck5hdmln YXRpb25CYWNrOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OkZvcndh cmQ6CisgICAgICAgIGtleSA9IEZlYXR1cmVDb3VudGVyTmF2aWdhdGlvbkZvcndhcmQ7CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6SW5kZXhlZEJhY2tGb3J3YXJkOgor ICAgICAgICBrZXkgPSBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25JbmRleGVkQmFja0ZvcndhcmQ7 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6UmVsb2FkOgorICAgICAg ICBrZXkgPSBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25SZWxvYWQ7CisgICAgICAgIGJyZWFrOwor ICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6U2FtZToKKyAgICAgICAga2V5ID0gRmVhdHVyZUNvdW50 ZXJOYXZpZ2F0aW9uU2FtZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGcmFtZUxvYWRUeXBl OjpSZWxvYWRGcm9tT3JpZ2luOgorICAgICAgICBrZXkgPSBGZWF0dXJlQ291bnRlck5hdmlnYXRp b25SZWxvYWRGcm9tT3JpZ2luOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAg ICByZXR1cm47CisgICAgfQorICAgIEFTU0VSVChrZXkpOworICAgIEZFQVRVUkVfQ09VTlRFUl9J TkNSRU1FTlRfS0VZKHBhZ2UsIGtleSk7Cit9CisKIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRXaXRo RG9jdW1lbnRMb2FkZXIoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgRnJhbWVMb2FkVHlwZSB0eXBl LCBQYXNzUmVmUHRyPEZvcm1TdGF0ZT4gcHJwRm9ybVN0YXRlLCBBbGxvd05hdmlnYXRpb25Ub0lu dmFsaWRVUkwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMKQogewogICAgIC8vIFJldGFpbiBi ZWNhdXNlIGRpc3BhdGNoQmVmb3JlTG9hZEV2ZW50IG1heSByZWxlYXNlIHRoZSBsYXN0IHJlZmVy ZW5jZSB0byBpdC4KQEAgLTEzOTUsNiArMTQyOCwxMCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2Fk V2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIEZyYW1lTG9hZFR5cGUg dAogICAgIGlmIChtX2ZyYW1lLmRvY3VtZW50KCkpCiAgICAgICAgIG1fcHJldmlvdXNVUkwgPSBt X2ZyYW1lLmRvY3VtZW50KCktPnVybCgpOwogCisgICAgLy8gTG9nIG1haW4gZnJhbWUgbmF2aWdh dGlvbiB0eXBlcy4KKyAgICBpZiAobV9mcmFtZS5pc01haW5GcmFtZSgpKQorICAgICAgICBsb2dO YXZpZ2F0aW9uV2l0aEZlYXR1cmVDb3VudGVyKG1fZnJhbWUucGFnZSgpLCB0eXBlKTsKKwogICAg IHBvbGljeUNoZWNrZXIoKS5zZXRMb2FkVHlwZSh0eXBlKTsKICAgICBSZWZQdHI8Rm9ybVN0YXRl PiBmb3JtU3RhdGUgPSBwcnBGb3JtU3RhdGU7CiAgICAgYm9vbCBpc0Zvcm1TdWJtaXNzaW9uID0g Zm9ybVN0YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNv dW50ZXJLZXlzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMu aAppbmRleCAyY2ZmMzgyZDRjZDUzODJlYzExZjU2ZGI3NmZiNTM4NjdhYzZkNzAxLi4zZDRlZjlj ZDE1NzMwNTIyYjMxYWY4MTNlMTFmMWQ2YThjOGJhY2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaApAQCAtNjEsNiArNjEsMTUgQEAgc3RhdGljIGNv bnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlU2FtZUxvYWRLZXlbXSA9ICJj b20uYXBwbGUuV2ViS2kKIHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hl RmFpbHVyZUtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUiOwogc3Rh dGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVTdWNjZXNzS2V5W10gPSAiY29t LmFwcGxlLldlYktpdC5wYWdlQ2FjaGUuc3VjY2VzcyI7CiAKKy8vIE5hdmlnYXRpb24gdHlwZXMu CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25TdGFuZGFyZFtdID0g ImNvbS5hcHBsZS5XZWJLaXQubmF2aWdhdGlvbi5zdGFuZGFyZCI7CitzdGF0aWMgY29uc3QgY2hh ciBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25CYWNrW10gPSAiY29tLmFwcGxlLldlYktpdC5uYXZp Z2F0aW9uLmJhY2siOworc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9u Rm9yd2FyZFtdID0gImNvbS5hcHBsZS5XZWJLaXQubmF2aWdhdGlvbi5mb3J3YXJkIjsKK3N0YXRp YyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyTmF2aWdhdGlvbkluZGV4ZWRCYWNrRm9yd2FyZFtd ID0gImNvbS5hcHBsZS5XZWJLaXQubmF2aWdhdGlvbi5pbmRleGVkQmFja0ZvcndhcmQiOworc3Rh dGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uUmVsb2FkW10gPSAiY29tLmFw cGxlLldlYktpdC5uYXZpZ2F0aW9uLnJlbG9hZCI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJl Q291bnRlck5hdmlnYXRpb25TYW1lW10gPSAiY29tLmFwcGxlLldlYktpdC5uYXZpZ2F0aW9uLnNh bWUiOworc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uUmVsb2FkRnJv bU9yaWdpbltdID0gImNvbS5hcHBsZS5XZWJLaXQubmF2aWdhdGlvbi5yZWxvYWRGcm9tT3JpZ2lu IjsKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRmVhdHVyZUNvdW50ZXJL ZXlzX2gK 243498 2014-12-18 10:08:33 -0800 2014-12-18 10:42:33 -0800 Patch bug-139753-20141218100833.patch text/plain 4850 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI2MTAxODQ0OGUxYmRj ZTAyNTI3MDQ0ZTQ0ZjcyMzgyMDNmYjY3MC4uYTI3MzdmZDQ5MGIyMDdhMTFlMTlhZTUyMjFkMzQw YzFhODhhYzkwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTEyLTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTG9nIG5hdmlnYXRp b24gdHlwZXMgdXNpbmcgRmVhdHVyZUNvdW50ZXIgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBMb2cgbmF2aWdhdGlvbiB0eXBlcyB1c2luZyBGZWF0dXJl Q291bnRlciBBUEkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2Ug b3RoZXIgdGhhbiBhZGRpdGlvbmFsIGZlYXR1cmUKKyAgICAgICAgY291bnRpbmcuCisKKyAgICAg ICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bG9nTmF2aWdh dGlvbldpdGhGZWF0dXJlQ291bnRlcik6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 bG9hZFdpdGhEb2N1bWVudExvYWRlcik6CisgICAgICAgICogcGxhdGZvcm0vRmVhdHVyZUNvdW50 ZXJLZXlzLmg6CisKIDIwMTQtMTItMTggIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dz a2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgSW50ZXJuYWxzIG1ldGhvZHMgcmV0dXJuIDAgaW5z dGVhZCBvZiBmYWxzZSB3aGVuIHRoZXkgZmFpbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKaW5kZXggY2FjMmIxZGI0NGRkNTI3Nzk4YTJkYTU4MGRkZDdjYTMzMWI5YTgxZS4uZjMz MjMxMDFjM2Q4M2QxY2ViZWNjYzQxZWYzYzg1ZWRmNGMwYmUzOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC01OCw2ICs1OCw3IEBACiAjaW5jbHVkZSAiRXZlbnQuaCIK ICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCisjaW5j bHVkZSAiRmVhdHVyZUNvdW50ZXIuaCIKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKICNpbmNsdWRl ICJGb3JtU3RhdGUuaCIKICNpbmNsdWRlICJGb3JtU3VibWlzc2lvbi5oIgpAQCAtMTM3Nyw2ICsx Mzc4LDM5IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoRG9jdW1lbnRMb2FkZXIqIG5ld0RvY3Vt ZW50TG9hZGVyKQogICAgIGxvYWRXaXRoRG9jdW1lbnRMb2FkZXIobmV3RG9jdW1lbnRMb2FkZXIs IHR5cGUsIDAsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6WWVzKTsKIH0KIAorc3RhdGlj IHZvaWQgbG9nTmF2aWdhdGlvbldpdGhGZWF0dXJlQ291bnRlcihQYWdlKiBwYWdlLCBGcmFtZUxv YWRUeXBlIHR5cGUpCit7CisgICAgY29uc3QgY2hhcioga2V5OworICAgIHN3aXRjaCAodHlwZSkg eworICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6U3RhbmRhcmQ6CisgICAgICAgIGtleSA9IEZlYXR1 cmVDb3VudGVyTmF2aWdhdGlvblN0YW5kYXJkOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZy YW1lTG9hZFR5cGU6OkJhY2s6CisgICAgICAgIGtleSA9IEZlYXR1cmVDb3VudGVyTmF2aWdhdGlv bkJhY2s7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6Rm9yd2FyZDoK KyAgICAgICAga2V5ID0gRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uRm9yd2FyZDsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBGcmFtZUxvYWRUeXBlOjpJbmRleGVkQmFja0ZvcndhcmQ6CisgICAg ICAgIGtleSA9IEZlYXR1cmVDb3VudGVyTmF2aWdhdGlvbkluZGV4ZWRCYWNrRm9yd2FyZDsKKyAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBGcmFtZUxvYWRUeXBlOjpSZWxvYWQ6CisgICAgICAgIGtl eSA9IEZlYXR1cmVDb3VudGVyTmF2aWdhdGlvblJlbG9hZDsKKyAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBGcmFtZUxvYWRUeXBlOjpTYW1lOgorICAgICAgICBrZXkgPSBGZWF0dXJlQ291bnRlck5h dmlnYXRpb25TYW1lOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OlJl bG9hZEZyb21PcmlnaW46CisgICAgICAgIGtleSA9IEZlYXR1cmVDb3VudGVyTmF2aWdhdGlvblJl bG9hZEZyb21PcmlnaW47CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6 UmVwbGFjZToKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OlJlZGlyZWN0V2l0aExvY2tlZEJhY2tG b3J3YXJkTGlzdDoKKyAgICAgICAgLy8gTm90IGxvZ2dpbmcgdGhvc2UgZm9yIG5vdy4KKyAgICAg ICAgcmV0dXJuOworICAgIH0KKyAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShwYWdl LCBrZXkpOworfQorCiB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkV2l0aERvY3VtZW50TG9hZGVyKERv Y3VtZW50TG9hZGVyKiBsb2FkZXIsIEZyYW1lTG9hZFR5cGUgdHlwZSwgUGFzc1JlZlB0cjxGb3Jt U3RhdGU+IHBycEZvcm1TdGF0ZSwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2 aWdhdGlvblRvSW52YWxpZFVSTCkKIHsKICAgICAvLyBSZXRhaW4gYmVjYXVzZSBkaXNwYXRjaEJl Zm9yZUxvYWRFdmVudCBtYXkgcmVsZWFzZSB0aGUgbGFzdCByZWZlcmVuY2UgdG8gaXQuCkBAIC0x Mzk1LDYgKzE0MjksMTAgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFdpdGhEb2N1bWVudExvYWRl cihEb2N1bWVudExvYWRlciogbG9hZGVyLCBGcmFtZUxvYWRUeXBlIHQKICAgICBpZiAobV9mcmFt ZS5kb2N1bWVudCgpKQogICAgICAgICBtX3ByZXZpb3VzVVJMID0gbV9mcmFtZS5kb2N1bWVudCgp LT51cmwoKTsKIAorICAgIC8vIExvZyBtYWluIGZyYW1lIG5hdmlnYXRpb24gdHlwZXMuCisgICAg aWYgKG1fZnJhbWUuaXNNYWluRnJhbWUoKSkKKyAgICAgICAgbG9nTmF2aWdhdGlvbldpdGhGZWF0 dXJlQ291bnRlcihtX2ZyYW1lLnBhZ2UoKSwgdHlwZSk7CisKICAgICBwb2xpY3lDaGVja2VyKCku c2V0TG9hZFR5cGUodHlwZSk7CiAgICAgUmVmUHRyPEZvcm1TdGF0ZT4gZm9ybVN0YXRlID0gcHJw Rm9ybVN0YXRlOwogICAgIGJvb2wgaXNGb3JtU3VibWlzc2lvbiA9IGZvcm1TdGF0ZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZlYXR1cmVDb3VudGVyS2V5cy5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmgKaW5kZXggMWI0YzAwMTNh MjhhZDYxZTQxY2M1ZWIxYzA5ODQ0YTkyZGM2MDhlYi4uNmZmMjFjMDQ0MDAyZDI1NGQyMGRlMDZj ZTIxYTg2NjUyYWExMWYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVh dHVyZUNvdW50ZXJLZXlzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNv dW50ZXJLZXlzLmgKQEAgLTcwLDYgKzcwLDE1IEBAIHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVD b3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25SZWFzb25Ob1N0b3JlS2V5W10gPSAiCiBz dGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlckNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9u UmVhc29uTXVzdFJldmFsaWRhdGVJc0V4cGlyZWRLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0LmNh Y2hlZFJlc291cmNlUmV2YWxpZGF0aW9uLnJlYXNvbi5tdXN0UmV2YWxpZGF0ZUlzRXhwaXJlZCI7 CiBzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlckNhY2hlZFJlc291cmNlUmV2YWxpZGF0 aW9uUmVhc29uSXNFeHBpcmVkS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5jYWNoZWRSZXNvdXJj ZVJldmFsaWRhdGlvbi5yZWFzb24uaXNFeHBpcmVkIjsKIAorLy8gTmF2aWdhdGlvbiB0eXBlcy4K K3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyTmF2aWdhdGlvblN0YW5kYXJkW10gPSAi Y29tLmFwcGxlLldlYktpdC5uYXZpZ2F0aW9uLnN0YW5kYXJkIjsKK3N0YXRpYyBjb25zdCBjaGFy IEZlYXR1cmVDb3VudGVyTmF2aWdhdGlvbkJhY2tbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm5hdmln YXRpb24uYmFjayI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25G b3J3YXJkW10gPSAiY29tLmFwcGxlLldlYktpdC5uYXZpZ2F0aW9uLmZvcndhcmQiOworc3RhdGlj IGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uSW5kZXhlZEJhY2tGb3J3YXJkW10g PSAiY29tLmFwcGxlLldlYktpdC5uYXZpZ2F0aW9uLmluZGV4ZWRCYWNrRm9yd2FyZCI7CitzdGF0 aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25SZWxvYWRbXSA9ICJjb20uYXBw bGUuV2ViS2l0Lm5hdmlnYXRpb24ucmVsb2FkIjsKK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVD b3VudGVyTmF2aWdhdGlvblNhbWVbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm5hdmlnYXRpb24uc2Ft ZSI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlck5hdmlnYXRpb25SZWxvYWRGcm9t T3JpZ2luW10gPSAiY29tLmFwcGxlLldlYktpdC5uYXZpZ2F0aW9uLnJlbG9hZEZyb21PcmlnaW4i OworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBGZWF0dXJlQ291bnRlcktl eXNfaAo=