132917 2014-05-14 11:12:01 -0700 remove duplicate code in web timing 2014-05-14 11:30:35 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac Unspecified RESOLVED FIXED P2 Trivial --- 1 achristensen webkit-unassigned ap oldest_to_newest 1009302 0 achristensen 2014-05-14 11:12:01 -0700 I added some duplicate code copying timing data from the NSURLConnection to the ResourceLoadTiming in https://bugs.webkit.org/show_bug.cgi?id=132574 and I'm going to move that code to ResourceHandle. 1009303 1 231459 achristensen 2014-05-14 11:15:48 -0700 Created attachment 231459 Patch 1009304 2 231459 ap 2014-05-14 11:22:36 -0700 Comment on attachment 231459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231459&action=review > Source/WebCore/platform/network/ResourceHandle.h:33 > +#include "ResourceLoadTiming.h" Please don't include it, just forward declare. > Source/WebCore/platform/network/ResourceHandle.h:134 > + static void transferTimingData(NSURLConnection*, ResourceLoadTiming&); I'd say "get", not "transfer". > Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm:175 > + ResourceHandle::transferTimingData(connection, resourceResponse.resourceLoadTiming()); This is not what I was thinking of - I think that a nicer way to implement this would be to call into ResourceHandle here, which would then read the timing data, and call the client. Duplicating even the ResourceHandle::transferTimingData still leaves the potential for us to forget about it in future reimplementations. It's OK to land as is though, the patch is an improvement. 1009306 3 achristensen 2014-05-14 11:30:35 -0700 (In reply to comment #2) > Please don't include it, just forward declare. done > I'd say "get", not "transfer". done Committed with these changes to http://trac.webkit.org/changeset/168849 231459 2014-05-14 11:15:48 -0700 2014-05-14 11:22:36 -0700 Patch bug-132917-20140514111525.patch text/plain 10400 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODg0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA1LTE0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVmYWN0b3Ig ZHVwbGljYXRlIGNvZGUgaW4gd2ViIHRpbWluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjkxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5o OgorICAgICAgICBBZGRlZCB0cmFuc2ZlclRpbWluZ0RhdGEgZGVjbGFyYXRpb24uCisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW06CisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6dHJhbnNmZXJUaW1pbmdEYXRhKToKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlLm1tOgor ICAgICAgICAoLVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlIGNvbm5lY3Rpb246ZGlk UmVjZWl2ZVJlc3BvbnNlOl0pOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFjL1dlYkNv cmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxlZ2F0ZS5tbToKKyAgICAgICAgKC1b V2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlIGNvbm5lY3Rpb246 ZGlkUmVjZWl2ZVJlc3BvbnNlOl0pOgorICAgICAgICBNb3ZlZCBkdXBsaWNhdGUgY29kZSB0byBS ZXNvdXJjZUhhbmRsZS4KKwogMjAxNC0wNS0xNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3Rl bnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFVzZSByZWZlcmVuY2VzIGluc3RlYWQgb2YgcG9p bnRlcnMgd2l0aCBSZXNvdXJjZUxvYWRUaW1pbmcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oCShyZXZpc2lvbiAxNjg4NDYpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgJKHdvcmtp bmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJIVFRQSGVhZGVyTWFwLmgiCiAj aW5jbHVkZSAiUmVzb3VyY2VIYW5kbGVUeXBlcy5oIgogI2luY2x1ZGUgIlJlc291cmNlTG9hZFBy aW9yaXR5LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VMb2FkVGltaW5nLmgiCiAjaW5jbHVkZSA8d3Rm L093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAKQEAgLTEzMCw2ICsxMzEs NyBAQCBwdWJsaWM6CiAjaWYgUExBVEZPUk0oQ09DT0EpICYmICFVU0UoQ0ZORVRXT1JLKQogICAg IHZvaWQgZGlkQ2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoY29uc3QgQXV0aGVudGljYXRp b25DaGFsbGVuZ2UmKTsKICAgICBOU1VSTENvbm5lY3Rpb24gKmNvbm5lY3Rpb24oKSBjb25zdDsK KyAgICBzdGF0aWMgdm9pZCB0cmFuc2ZlclRpbWluZ0RhdGEoTlNVUkxDb25uZWN0aW9uKiwgUmVz b3VyY2VMb2FkVGltaW5nJik7CiAgICAgaWQgbWFrZURlbGVnYXRlKGJvb2wpOwogICAgIGlkIGRl bGVnYXRlKCk7CiAgICAgdm9pZCByZWxlYXNlRGVsZWdhdGUoKTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFjLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFj Lm1tCShyZXZpc2lvbiAxNjg4NDYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjEsNiArNjEsNyBA QAogI2Vsc2UKIEBpbnRlcmZhY2UgTlNVUkxDb25uZWN0aW9uIChUaW1pbmdEYXRhKQogKyAodm9p ZClfc2V0Q29sbGVjdHNUaW1pbmdEYXRhOihCT09MKWNvbGxlY3Q7CistIChOU0RpY3Rpb25hcnkg KilfdGltaW5nRGF0YTsKIEBlbmQKICNlbmRpZgogCkBAIC0zNjgsNyArMzY5LDMyIEBAIE5TVVJM Q29ubmVjdGlvbiAqUmVzb3VyY2VIYW5kbGU6OmNvbm5lY3QKIHsKICAgICByZXR1cm4gZC0+bV9j b25uZWN0aW9uLmdldCgpOwogfQotCisgICAgCit2b2lkIFJlc291cmNlSGFuZGxlOjp0cmFuc2Zl clRpbWluZ0RhdGEoTlNVUkxDb25uZWN0aW9uICpjb25uZWN0aW9uLCBSZXNvdXJjZUxvYWRUaW1p bmcmIHRpbWluZykKK3sKKyAgICBpZiAoTlNEaWN0aW9uYXJ5ICp0aW1pbmdEYXRhID0gW2Nvbm5l Y3Rpb24gX3RpbWluZ0RhdGFdKSB7CisgICAgICAgIC8vIFRoaXMgaXMgbm90IHRoZSBuYXZpZ2F0 aW9uU3RhcnQgdGltZSBpbiBtb25vdG9uaWMgdGltZSwgYnV0IHRoZSBvdGhlciB0aW1lcyBhcmUg cmVsYXRpdmUgdG8gdGhpcyB0aW1lCisgICAgICAgIC8vIGFuZCBvbmx5IHRoZSBkaWZmZXJlbmNl cyBiZXR3ZWVuIHRpbWVzIGFyZSBzdG9yZWQuCisgICAgICAgIGRvdWJsZSByZWZlcmVuY2VTdGFy dCA9IFtbdGltaW5nRGF0YSB2YWx1ZUZvcktleTpAIl9rQ0ZOVGltaW5nRGF0YVRpbWluZ0RhdGFJ bml0Il0gZG91YmxlVmFsdWVdOworICAgICAgICAKKyAgICAgICAgZG91YmxlIGRvbWFpbkxvb2t1 cFN0YXJ0ID0gW1t0aW1pbmdEYXRhIHZhbHVlRm9yS2V5OkAiX2tDRk5UaW1pbmdEYXRhRG9tYWlu TG9va3VwU3RhcnQiXSBkb3VibGVWYWx1ZV07CisgICAgICAgIGRvdWJsZSBkb21haW5Mb29rdXBF bmQgPSBbW3RpbWluZ0RhdGEgdmFsdWVGb3JLZXk6QCJfa0NGTlRpbWluZ0RhdGFEb21haW5Mb29r dXBFbmQiXSBkb3VibGVWYWx1ZV07CisgICAgICAgIGRvdWJsZSBjb25uZWN0U3RhcnQgPSBbW3Rp bWluZ0RhdGEgdmFsdWVGb3JLZXk6QCJfa0NGTlRpbWluZ0RhdGFDb25uZWN0U3RhcnQiXSBkb3Vi bGVWYWx1ZV07CisgICAgICAgIGRvdWJsZSBzZWN1cmVDb25uZWN0aW9uU3RhcnQgPSBbW3RpbWlu Z0RhdGEgdmFsdWVGb3JLZXk6QCJfa0NGTlRpbWluZ0RhdGFTZWN1cmVDb25uZWN0aW9uU3RhcnQi XSBkb3VibGVWYWx1ZV07CisgICAgICAgIGRvdWJsZSBjb25uZWN0RW5kID0gW1t0aW1pbmdEYXRh IHZhbHVlRm9yS2V5OkAiX2tDRk5UaW1pbmdEYXRhQ29ubmVjdEVuZCJdIGRvdWJsZVZhbHVlXTsK KyAgICAgICAgZG91YmxlIHJlcXVlc3RTdGFydCA9IFtbdGltaW5nRGF0YSB2YWx1ZUZvcktleTpA Il9rQ0ZOVGltaW5nRGF0YVJlcXVlc3RTdGFydCJdIGRvdWJsZVZhbHVlXTsKKyAgICAgICAgZG91 YmxlIHJlc3BvbnNlU3RhcnQgPSBbW3RpbWluZ0RhdGEgdmFsdWVGb3JLZXk6QCJfa0NGTlRpbWlu Z0RhdGFSZXNwb25zZVN0YXJ0Il0gZG91YmxlVmFsdWVdOworICAgICAgICAKKyAgICAgICAgdGlt aW5nLmRvbWFpbkxvb2t1cFN0YXJ0ID0gZG9tYWluTG9va3VwU3RhcnQgPD0gMCA/IC0xIDogKGRv bWFpbkxvb2t1cFN0YXJ0IC0gcmVmZXJlbmNlU3RhcnQpICogMTAwMDsKKyAgICAgICAgdGltaW5n LmRvbWFpbkxvb2t1cEVuZCA9IGRvbWFpbkxvb2t1cEVuZCA8PSAwID8gLTEgOiAoZG9tYWluTG9v a3VwRW5kIC0gcmVmZXJlbmNlU3RhcnQpICogMTAwMDsKKyAgICAgICAgdGltaW5nLmNvbm5lY3RT dGFydCA9IGNvbm5lY3RTdGFydCA8PSAwID8gLTEgOiAoY29ubmVjdFN0YXJ0IC0gcmVmZXJlbmNl U3RhcnQpICogMTAwMDsKKyAgICAgICAgdGltaW5nLnNlY3VyZUNvbm5lY3Rpb25TdGFydCA9IHNl Y3VyZUNvbm5lY3Rpb25TdGFydCA8PSAwID8gLTEgOiAoc2VjdXJlQ29ubmVjdGlvblN0YXJ0IC0g cmVmZXJlbmNlU3RhcnQpICogMTAwMDsKKyAgICAgICAgdGltaW5nLmNvbm5lY3RFbmQgPSBjb25u ZWN0RW5kIDw9IDAgPyAtMSA6IChjb25uZWN0RW5kIC0gcmVmZXJlbmNlU3RhcnQpICogMTAwMDsK KyAgICAgICAgdGltaW5nLnJlcXVlc3RTdGFydCA9IHJlcXVlc3RTdGFydCA8PSAwID8gLTEgOiAo cmVxdWVzdFN0YXJ0IC0gcmVmZXJlbmNlU3RhcnQpICogMTAwMDsKKyAgICAgICAgdGltaW5nLnJl c3BvbnNlU3RhcnQgPSByZXNwb25zZVN0YXJ0IDw9IDAgPyAtMSA6IChyZXNwb25zZVN0YXJ0IC0g cmVmZXJlbmNlU3RhcnQpICogMTAwMDsKKyAgICB9Cit9CisgICAgCiBib29sIFJlc291cmNlSGFu ZGxlOjpsb2Fkc0Jsb2NrZWQoKQogewogICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1dlYkNvcmVSZXNvdXJjZUhhbmRsZUFzRGVsZWdh dGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMv V2ViQ29yZVJlc291cmNlSGFuZGxlQXNEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMTY4ODQ2KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvV2ViQ29yZVJlc291cmNlSGFuZGxl QXNEZWxlZ2F0ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzgsMTQgKzM4LDYgQEAKICNpbXBvcnQg IlNoYXJlZEJ1ZmZlci5oIgogI2ltcG9ydCAiV2ViQ29yZVVSTFJlc3BvbnNlLmgiCiAKLSNpZiBf X2hhc19pbmNsdWRlKDxDRk5ldHdvcmsvQ0ZOU1VSTENvbm5lY3Rpb24uaD4pCi0jaW1wb3J0IDxD Rk5ldHdvcmsvQ0ZOU1VSTENvbm5lY3Rpb24uaD4KLSNlbHNlCi1AaW50ZXJmYWNlIE5TVVJMQ29u bmVjdGlvbiAoVGltaW5nRGF0YSkKLS0gKE5TRGljdGlvbmFyeSAqKV90aW1pbmdEYXRhOwotQGVu ZAotI2VuZGlmCi0KIEBpbnRlcmZhY2UgTlNVUkxSZXF1ZXN0IChEZXRhaWxzKQogLSAoaWQpX3By b3BlcnR5Rm9yS2V5OihOU1N0cmluZyAqKWtleTsKIEBlbmQKQEAgLTE4MCwyOCArMTcyLDcgQEAg LSAodm9pZCljb25uZWN0aW9uOihOU1VSTENvbm5lY3Rpb24gKiljbwogICAgIAogICAgIFJlc291 cmNlUmVzcG9uc2UgcmVzb3VyY2VSZXNwb25zZShyKTsKICNpZiBFTkFCTEUoV0VCX1RJTUlORykK LSAgICBpZiAoTlNEaWN0aW9uYXJ5ICp0aW1pbmdEYXRhID0gW2Nvbm5lY3Rpb24gX3RpbWluZ0Rh dGFdKSB7Ci0gICAgICAgIC8vIFRoaXMgaXMgbm90IHRoZSBuYXZpZ2F0aW9uU3RhcnQgdGltZSBp biBtb25vdG9uaWMgdGltZSwgYnV0IHRoZSBvdGhlciB0aW1lcyBhcmUgcmVsYXRpdmUgdG8gdGhp cyB0aW1lCi0gICAgICAgIC8vIGFuZCBvbmx5IHRoZSBkaWZmZXJlbmNlcyBiZXR3ZWVuIHRpbWVz IGFyZSBzdG9yZWQuCi0gICAgICAgIGRvdWJsZSByZWZlcmVuY2VTdGFydCA9IFtbdGltaW5nRGF0 YSB2YWx1ZUZvcktleTpAIl9rQ0ZOVGltaW5nRGF0YVRpbWluZ0RhdGFJbml0Il0gZG91YmxlVmFs dWVdOwotICAgICAgICAKLSAgICAgICAgZG91YmxlIGRvbWFpbkxvb2t1cFN0YXJ0ID0gW1t0aW1p bmdEYXRhIHZhbHVlRm9yS2V5OkAiX2tDRk5UaW1pbmdEYXRhRG9tYWluTG9va3VwU3RhcnQiXSBk b3VibGVWYWx1ZV07Ci0gICAgICAgIGRvdWJsZSBkb21haW5Mb29rdXBFbmQgPSBbW3RpbWluZ0Rh dGEgdmFsdWVGb3JLZXk6QCJfa0NGTlRpbWluZ0RhdGFEb21haW5Mb29rdXBFbmQiXSBkb3VibGVW YWx1ZV07Ci0gICAgICAgIGRvdWJsZSBjb25uZWN0U3RhcnQgPSBbW3RpbWluZ0RhdGEgdmFsdWVG b3JLZXk6QCJfa0NGTlRpbWluZ0RhdGFDb25uZWN0U3RhcnQiXSBkb3VibGVWYWx1ZV07Ci0gICAg ICAgIGRvdWJsZSBzZWN1cmVDb25uZWN0aW9uU3RhcnQgPSBbW3RpbWluZ0RhdGEgdmFsdWVGb3JL ZXk6QCJfa0NGTlRpbWluZ0RhdGFTZWN1cmVDb25uZWN0aW9uU3RhcnQiXSBkb3VibGVWYWx1ZV07 Ci0gICAgICAgIGRvdWJsZSBjb25uZWN0RW5kID0gW1t0aW1pbmdEYXRhIHZhbHVlRm9yS2V5OkAi X2tDRk5UaW1pbmdEYXRhQ29ubmVjdEVuZCJdIGRvdWJsZVZhbHVlXTsKLSAgICAgICAgZG91Ymxl IHJlcXVlc3RTdGFydCA9IFtbdGltaW5nRGF0YSB2YWx1ZUZvcktleTpAIl9rQ0ZOVGltaW5nRGF0 YVJlcXVlc3RTdGFydCJdIGRvdWJsZVZhbHVlXTsKLSAgICAgICAgZG91YmxlIHJlc3BvbnNlU3Rh cnQgPSBbW3RpbWluZ0RhdGEgdmFsdWVGb3JLZXk6QCJfa0NGTlRpbWluZ0RhdGFSZXNwb25zZVN0 YXJ0Il0gZG91YmxlVmFsdWVdOwotICAgICAgICAKLSAgICAgICAgUmVzb3VyY2VMb2FkVGltaW5n JiB0aW1pbmcgPSByZXNvdXJjZVJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpOwotICAgICAg ICB0aW1pbmcuZG9tYWluTG9va3VwU3RhcnQgPSBkb21haW5Mb29rdXBTdGFydCA8PSAwLjAgPyAt MSA6IChkb21haW5Mb29rdXBTdGFydCAtIHJlZmVyZW5jZVN0YXJ0KSAqIDEwMDA7Ci0gICAgICAg IHRpbWluZy5kb21haW5Mb29rdXBFbmQgPSBkb21haW5Mb29rdXBFbmQgPD0gMC4wID8gLTEgOiAo ZG9tYWluTG9va3VwRW5kIC0gcmVmZXJlbmNlU3RhcnQpICogMTAwMDsKLSAgICAgICAgdGltaW5n LmNvbm5lY3RTdGFydCA9IGNvbm5lY3RTdGFydCA8PSAwLjAgPyAtMSA6IChjb25uZWN0U3RhcnQg LSByZWZlcmVuY2VTdGFydCkgKiAxMDAwOwotICAgICAgICB0aW1pbmcuc2VjdXJlQ29ubmVjdGlv blN0YXJ0ID0gc2VjdXJlQ29ubmVjdGlvblN0YXJ0IDw9IDAuMCA/IC0xIDogKHNlY3VyZUNvbm5l Y3Rpb25TdGFydCAtIHJlZmVyZW5jZVN0YXJ0KSAqIDEwMDA7Ci0gICAgICAgIHRpbWluZy5jb25u ZWN0RW5kID0gY29ubmVjdEVuZCA8PSAwLjAgPyAtMSA6IChjb25uZWN0RW5kIC0gcmVmZXJlbmNl U3RhcnQpICogMTAwMDsKLSAgICAgICAgdGltaW5nLnJlcXVlc3RTdGFydCA9IHJlcXVlc3RTdGFy dCA8PSAwLjAgPyAtMSA6IChyZXF1ZXN0U3RhcnQgLSByZWZlcmVuY2VTdGFydCkgKiAxMDAwOwot ICAgICAgICB0aW1pbmcucmVzcG9uc2VTdGFydCA9IHJlc3BvbnNlU3RhcnQgPD0gMC4wID8gLTEg OiAocmVzcG9uc2VTdGFydCAtIHJlZmVyZW5jZVN0YXJ0KSAqIDEwMDA7Ci0gICAgfQorICAgIFJl c291cmNlSGFuZGxlOjp0cmFuc2ZlclRpbWluZ0RhdGEoY29ubmVjdGlvbiwgcmVzb3VyY2VSZXNw b25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKSk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShjb25u ZWN0aW9uKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9t YWMvV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1dlYkNvcmVSZXNv dXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMTY4ODQ2KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvV2ViQ29yZVJlc291cmNlSGFu ZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zOSwxNCAr MzksNiBAQAogI2ltcG9ydCAiV2ViQ29yZVVSTFJlc3BvbnNlLmgiCiAjaW1wb3J0IDx3dGYvTWFp blRocmVhZC5oPgogCi0jaWYgX19oYXNfaW5jbHVkZSg8Q0ZOZXR3b3JrL0NGTlNVUkxDb25uZWN0 aW9uLmg+KQotI2ltcG9ydCA8Q0ZOZXR3b3JrL0NGTlNVUkxDb25uZWN0aW9uLmg+Ci0jZWxzZQot QGludGVyZmFjZSBOU1VSTENvbm5lY3Rpb24gKFRpbWluZ0RhdGEpCi0tIChOU0RpY3Rpb25hcnkg KilfdGltaW5nRGF0YTsKLUBlbmQKLSNlbmRpZgotCiBAaW50ZXJmYWNlIE5TVVJMUmVxdWVzdCAo RGV0YWlscykKIC0gKGlkKV9wcm9wZXJ0eUZvcktleTooTlNTdHJpbmcgKilrZXk7CiBAZW5kCkBA IC0yMjIsMjggKzIxNCw3IEBAIC0gKHZvaWQpY29ubmVjdGlvbjooTlNVUkxDb25uZWN0aW9uICop Y28KICAgICAgICAgCiAgICAgICAgIFJlc291cmNlUmVzcG9uc2UgcmVzb3VyY2VSZXNwb25zZShy KTsKICNpZiBFTkFCTEUoV0VCX1RJTUlORykKLSAgICAgICAgaWYgKE5TRGljdGlvbmFyeSAqdGlt aW5nRGF0YSA9IFtjb25uZWN0aW9uIF90aW1pbmdEYXRhXSkgewotICAgICAgICAgICAgLy8gVGhp cyBpcyBub3QgdGhlIG5hdmlnYXRpb25TdGFydCB0aW1lIGluIG1vbm90b25pYyB0aW1lLCBidXQg dGhlIG90aGVyIHRpbWVzIGFyZSByZWxhdGl2ZSB0byB0aGlzIHRpbWUKLSAgICAgICAgICAgIC8v IGFuZCBvbmx5IHRoZSBkaWZmZXJlbmNlcyBiZXR3ZWVuIHRpbWVzIGFyZSBzdG9yZWQuCi0gICAg ICAgICAgICBkb3VibGUgcmVmZXJlbmNlU3RhcnQgPSBbW3RpbWluZ0RhdGEgdmFsdWVGb3JLZXk6 QCJfa0NGTlRpbWluZ0RhdGFUaW1pbmdEYXRhSW5pdCJdIGRvdWJsZVZhbHVlXTsKLSAgICAgICAg ICAgIAotICAgICAgICAgICAgZG91YmxlIGRvbWFpbkxvb2t1cFN0YXJ0ID0gW1t0aW1pbmdEYXRh IHZhbHVlRm9yS2V5OkAiX2tDRk5UaW1pbmdEYXRhRG9tYWluTG9va3VwU3RhcnQiXSBkb3VibGVW YWx1ZV07Ci0gICAgICAgICAgICBkb3VibGUgZG9tYWluTG9va3VwRW5kID0gW1t0aW1pbmdEYXRh IHZhbHVlRm9yS2V5OkAiX2tDRk5UaW1pbmdEYXRhRG9tYWluTG9va3VwRW5kIl0gZG91YmxlVmFs dWVdOwotICAgICAgICAgICAgZG91YmxlIGNvbm5lY3RTdGFydCA9IFtbdGltaW5nRGF0YSB2YWx1 ZUZvcktleTpAIl9rQ0ZOVGltaW5nRGF0YUNvbm5lY3RTdGFydCJdIGRvdWJsZVZhbHVlXTsKLSAg ICAgICAgICAgIGRvdWJsZSBzZWN1cmVDb25uZWN0aW9uU3RhcnQgPSBbW3RpbWluZ0RhdGEgdmFs dWVGb3JLZXk6QCJfa0NGTlRpbWluZ0RhdGFTZWN1cmVDb25uZWN0aW9uU3RhcnQiXSBkb3VibGVW YWx1ZV07Ci0gICAgICAgICAgICBkb3VibGUgY29ubmVjdEVuZCA9IFtbdGltaW5nRGF0YSB2YWx1 ZUZvcktleTpAIl9rQ0ZOVGltaW5nRGF0YUNvbm5lY3RFbmQiXSBkb3VibGVWYWx1ZV07Ci0gICAg ICAgICAgICBkb3VibGUgcmVxdWVzdFN0YXJ0ID0gW1t0aW1pbmdEYXRhIHZhbHVlRm9yS2V5OkAi X2tDRk5UaW1pbmdEYXRhUmVxdWVzdFN0YXJ0Il0gZG91YmxlVmFsdWVdOwotICAgICAgICAgICAg ZG91YmxlIHJlc3BvbnNlU3RhcnQgPSBbW3RpbWluZ0RhdGEgdmFsdWVGb3JLZXk6QCJfa0NGTlRp bWluZ0RhdGFSZXNwb25zZVN0YXJ0Il0gZG91YmxlVmFsdWVdOwotICAgICAgICAgICAgCi0gICAg ICAgICAgICBSZXNvdXJjZUxvYWRUaW1pbmcmIHRpbWluZyA9IHJlc291cmNlUmVzcG9uc2UucmVz b3VyY2VMb2FkVGltaW5nKCk7Ci0gICAgICAgICAgICB0aW1pbmcuZG9tYWluTG9va3VwU3RhcnQg PSBkb21haW5Mb29rdXBTdGFydCA8PSAwLjAgPyAtMSA6IChkb21haW5Mb29rdXBTdGFydCAtIHJl ZmVyZW5jZVN0YXJ0KSAqIDEwMDA7Ci0gICAgICAgICAgICB0aW1pbmcuZG9tYWluTG9va3VwRW5k ID0gZG9tYWluTG9va3VwRW5kIDw9IDAuMCA/IC0xIDogKGRvbWFpbkxvb2t1cEVuZCAtIHJlZmVy ZW5jZVN0YXJ0KSAqIDEwMDA7Ci0gICAgICAgICAgICB0aW1pbmcuY29ubmVjdFN0YXJ0ID0gY29u bmVjdFN0YXJ0IDw9IDAuMCA/IC0xIDogKGNvbm5lY3RTdGFydCAtIHJlZmVyZW5jZVN0YXJ0KSAq IDEwMDA7Ci0gICAgICAgICAgICB0aW1pbmcuc2VjdXJlQ29ubmVjdGlvblN0YXJ0ID0gc2VjdXJl Q29ubmVjdGlvblN0YXJ0IDw9IDAuMCA/IC0xIDogKHNlY3VyZUNvbm5lY3Rpb25TdGFydCAtIHJl ZmVyZW5jZVN0YXJ0KSAqIDEwMDA7Ci0gICAgICAgICAgICB0aW1pbmcuY29ubmVjdEVuZCA9IGNv bm5lY3RFbmQgPD0gMC4wID8gLTEgOiAoY29ubmVjdEVuZCAtIHJlZmVyZW5jZVN0YXJ0KSAqIDEw MDA7Ci0gICAgICAgICAgICB0aW1pbmcucmVxdWVzdFN0YXJ0ID0gcmVxdWVzdFN0YXJ0IDw9IDAu MCA/IC0xIDogKHJlcXVlc3RTdGFydCAtIHJlZmVyZW5jZVN0YXJ0KSAqIDEwMDA7Ci0gICAgICAg ICAgICB0aW1pbmcucmVzcG9uc2VTdGFydCA9IHJlc3BvbnNlU3RhcnQgPD0gMC4wID8gLTEgOiAo cmVzcG9uc2VTdGFydCAtIHJlZmVyZW5jZVN0YXJ0KSAqIDEwMDA7Ci0gICAgICAgIH0KKyAgICAg ICAgUmVzb3VyY2VIYW5kbGU6OnRyYW5zZmVyVGltaW5nRGF0YShjb25uZWN0aW9uLCByZXNvdXJj ZVJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpKTsKICNlbHNlCiAgICAgICAgIFVOVVNFRF9Q QVJBTShjb25uZWN0aW9uKTsKICNlbmRpZgo=