145650 2015-06-04 12:00:22 -0700 [Web Timing] Use new SPI to enable data collection. 2015-06-25 16:08:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin bfulgham cdumez cmarcelo commit-queue dbates ddkilzer oldest_to_newest 1099553 0 achristensen 2015-06-04 12:00:22 -0700 There is a new SPI. Let's use it. 1099554 1 254284 achristensen 2015-06-04 12:02:13 -0700 Created attachment 254284 Patch 1099555 2 achristensen 2015-06-04 12:03:09 -0700 This patch does not actually enable data collection. Someone who knows the SPI should point out what I'm doing wrong. Maybe it's a strange ObjC problem. Maybe I'm using the SPI wrong. 1099622 3 254284 simon.fraser 2015-06-04 14:39:58 -0700 Comment on attachment 254284 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254284&action=review > Source/WebCore/platform/network/mac/ResourceHandleMac.mm:74 > +// FIXME: Move this to CFNetworkSPI.h. Seems like this would be a good time to do that. 1099649 4 254308 achristensen 2015-06-04 15:39:10 -0700 Created attachment 254308 Patch 1099678 5 254316 achristensen 2015-06-04 17:01:20 -0700 Created attachment 254316 Patch 1099691 6 achristensen 2015-06-04 17:40:22 -0700 (In reply to comment #3) > Seems like this would be a good time to do that. I disagree. This is already cross-platform and platform dependent enough. I don't want to mess with breaking Windows in this patch. 1099693 7 254321 achristensen 2015-06-04 17:46:53 -0700 Created attachment 254321 Patch 1099872 8 254321 cdumez 2015-06-05 11:19:08 -0700 Comment on attachment 254321 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254321&action=review > Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp:65 > +#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 Shouldn't this be in Platform.h ? > Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp:215 > +#if HAVE_TIMINGDATAOPTIONS #if HAVE(TIMINGDATAOPTIONS) > Source/WebCore/platform/network/mac/ResourceHandleMac.mm:68 > +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) Shouldn't this be in Platform.h? > Source/WebCore/platform/network/mac/ResourceHandleMac.mm:79 > +#if !HAVE_TIMINGDATAOPTIONS #if !HAVE(TIMINGDATAOPTIONS) > Source/WebCore/platform/network/mac/ResourceHandleMac.mm:84 > +#if HAVE_TIMINGDATAOPTIONS #if HAVE(TIMINGDATAOPTIONS) > Source/WebCore/platform/network/mac/ResourceHandleMac.mm:236 > +#if HAVE_TIMINGDATAOPTIONS #if HAVE(TIMINGDATAOPTIONS) > Source/WebCore/platform/network/mac/ResourceHandleMac.mm:765 > +#if !HAVE_TIMINGDATAOPTIONS #if !HAVE(TIMINGDATAOPTIONS) 1099919 9 254321 achristensen 2015-06-05 13:30:09 -0700 Comment on attachment 254321 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254321&action=review > Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp:218 > + CFDictionaryAddValue(propertiesDictionary.get(), CFSTR("kCFURLConnectionURLConnectionProperties"), &TimingDataOptionsEnableW3CNavigationTiming); timingDataOptionsDictionary here, not propertiesDictionary. 1099932 10 254321 achristensen 2015-06-05 14:00:09 -0700 Comment on attachment 254321 Patch And I need to call CFNumberCreate on iOS. 1099935 11 254381 achristensen 2015-06-05 14:12:22 -0700 Created attachment 254381 Patch 1099945 12 254381 cdumez 2015-06-05 14:26:18 -0700 Comment on attachment 254381 Patch r=me 1099964 13 achristensen 2015-06-05 14:38:38 -0700 http://trac.webkit.org/changeset/185264 1104767 14 bfulgham 2015-06-25 16:08:47 -0700 <rdar://problem/21203358> 254284 2015-06-04 12:02:13 -0700 2015-06-04 15:39:08 -0700 Patch bug-145650-20150604120151.patch text/plain 3160 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTIwOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA2LTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYiBUaW1p bmddIFVzZSBuZXcgU1BJIHRvIGVuYWJsZSBkYXRhIGNvbGxlY3Rpb24uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2NTAKKyAgICAgICAgcmRhcjov L3Byb2JsZW0vMjEyMDMzNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmNyZWF0ZU5TVVJMQ29ubmVjdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6c2V0Q29sbGVjdHNUaW1pbmdEYXRh KToKKwogMjAxNS0wNi0wNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAog ICAgICAgICBMYXRjaGluZyBhbGdvcml0aG0gaW4gZmluZEVuY2xvc2luZ092ZXJmbG93U2Nyb2xs IGlzIGJyb2tlbgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVz b3VyY2VIYW5kbGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0JKHJldmlzaW9uIDE4NTE3OCkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFjLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC02NSwxMyArNjUsMjYgQEAgQ0ZEaWN0aW9uYXJ5UmVmIF9DRlVSTENv bm5lY3Rpb25Db3B5VGltaQogfQogI2VuZGlmIC8vIFVTRShDRk5FVFdPUkspCiAKKyNpZiAoZGVm aW5lZCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEICYmIF9fTUFDX09TX1hfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gMTAxMTAwKSB8fCAoZGVmaW5lZCBfX0lQSE9ORV9PU19WRVJTSU9O X01JTl9SRVFVSVJFRCAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSA5MDAw MCkKKyNkZWZpbmUgSEFWRV9USU1JTkdEQVRBT1BUSU9OUyAxCisjZWxzZQorI2RlZmluZSBIQVZF X1RJTUlOR0RBVEFPUFRJT05TIDAKKyNlbmRpZgorCisvLyBGSVhNRTogTW92ZSB0aGlzIHRvIENG TmV0d29ya1NQSS5oLgogI2lmIF9faGFzX2luY2x1ZGUoPEZvdW5kYXRpb24vTlNVUkxDb25uZWN0 aW9uUHJpdmF0ZS5oPikKICNpbXBvcnQgPEZvdW5kYXRpb24vTlNVUkxDb25uZWN0aW9uUHJpdmF0 ZS5oPgogI2Vsc2UKIEBpbnRlcmZhY2UgTlNVUkxDb25uZWN0aW9uIChUaW1pbmdEYXRhKQorI2lm ICFIQVZFX1RJTUlOR0RBVEFPUFRJT05TCiArICh2b2lkKV9zZXRDb2xsZWN0c1RpbWluZ0RhdGE6 KEJPT0wpY29sbGVjdDsKKyNlbmRpZgogLSAoTlNEaWN0aW9uYXJ5ICopX3RpbWluZ0RhdGE7CiBA ZW5kCisjaWYgSEFWRV9USU1JTkdEQVRBT1BUSU9OUworZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVm IF9rQ0ZVUkxDb25uZWN0aW9uUHJvcGVydHlUaW1pbmdEYXRhT3B0aW9uczsKK2NvbnN0IGludDY0 X3QgX1RpbWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdhdGlvblRpbWluZyA9ICgxIDw8IDAp OworI2VuZGlmCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKQEAgLTIxNyw5ICsyMzAsMTIg QEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlTlNVUkxDb25uZWN0aQogICAgIGlmIChzeW5j aHJvbm91c1dpbGxTZW5kUmVxdWVzdEVuYWJsZWQoKSkKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0 U2hvdWxkU3RhcnRTeW5jaHJvbm91c2x5KFtuc1JlcXVlc3QgX0NGVVJMUmVxdWVzdF0sIDEpOwog I2Vsc2UKLSAgICBOU0RpY3Rpb25hcnkgKnByb3BlcnR5RGljdGlvbmFyeSA9IFtOU0RpY3Rpb25h cnkgZGljdGlvbmFyeVdpdGhPYmplY3Q6c3RyZWFtUHJvcGVydGllcyBmb3JLZXk6QCJrQ0ZVUkxD b25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcyJdOworICAgIE5TTXV0YWJsZURpY3Rpb25h cnkgKnByb3BlcnR5RGljdGlvbmFyeSA9IFtOU011dGFibGVEaWN0aW9uYXJ5IGRpY3Rpb25hcnlX aXRoT2JqZWN0OnN0cmVhbVByb3BlcnRpZXMgZm9yS2V5OkAia0NGVVJMQ29ubmVjdGlvblNvY2tl dFN0cmVhbVByb3BlcnRpZXMiXTsKICAgICBjb25zdCBib29sIHVzZXNDYWNoZSA9IHRydWU7CiAj ZW5kaWYKKyNpZiBIQVZFX1RJTUlOR0RBVEFPUFRJT05TCisgICAgW3Byb3BlcnR5RGljdGlvbmFy eSBzZXRPYmplY3Q6QChfVGltaW5nRGF0YU9wdGlvbnNFbmFibGVXM0NOYXZpZ2F0aW9uVGltaW5n KSBmb3JLZXk6KE5TU3RyaW5nICopX2tDRlVSTENvbm5lY3Rpb25Qcm9wZXJ0eVRpbWluZ0RhdGFP cHRpb25zXTsKKyNlbmRpZgogICAgIGQtPm1fY29ubmVjdGlvbiA9IGFkb3B0TlMoW1tOU1VSTENv bm5lY3Rpb24gYWxsb2NdIF9pbml0V2l0aFJlcXVlc3Q6bnNSZXF1ZXN0IGRlbGVnYXRlOmRlbGVn YXRlIHVzZXNDYWNoZTp1c2VzQ2FjaGUgbWF4Q29udGVudExlbmd0aDowIHN0YXJ0SW1tZWRpYXRl bHk6Tk8gY29ubmVjdGlvblByb3BlcnRpZXM6cHJvcGVydHlEaWN0aW9uYXJ5XSk7CiB9CiAKQEAg LTc0NiwxMCArNzYyLDEyIEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OmdldENvbm5lY3Rpb25UaW1p bmcKIAogdm9pZCBSZXNvdXJjZUhhbmRsZTo6c2V0Q29sbGVjdHNUaW1pbmdEYXRhKCkKIHsKKyNp ZiAhSEFWRV9USU1JTkdEQVRBT1BUSU9OUwogICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3Qgb25j ZVRva2VuOwogICAgIGRpc3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsKICAgICAgICAgW05TVVJM Q29ubmVjdGlvbiBfc2V0Q29sbGVjdHNUaW1pbmdEYXRhOllFU107CiAgICAgfSk7CisjZW5kaWYK IH0KIAogI2lmIFVTRShDRk5FVFdPUkspCg== 254308 2015-06-04 15:39:10 -0700 2015-06-04 17:01:17 -0700 Patch bug-145650-20150604153849.patch text/plain 3198 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTIwOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA2LTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYiBUaW1p bmddIFVzZSBuZXcgU1BJIHRvIGVuYWJsZSBkYXRhIGNvbGxlY3Rpb24uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2NTAKKyAgICAgICAgcmRhcjov L3Byb2JsZW0vMjEyMDMzNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmNyZWF0ZU5TVVJMQ29ubmVjdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6c2V0Q29sbGVjdHNUaW1pbmdEYXRh KToKKwogMjAxNS0wNi0wNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAog ICAgICAgICBMYXRjaGluZyBhbGdvcml0aG0gaW4gZmluZEVuY2xvc2luZ092ZXJmbG93U2Nyb2xs IGlzIGJyb2tlbgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVz b3VyY2VIYW5kbGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0JKHJldmlzaW9uIDE4NTE3OCkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFjLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC02NSwxMyArNjUsMjYgQEAgQ0ZEaWN0aW9uYXJ5UmVmIF9DRlVSTENv bm5lY3Rpb25Db3B5VGltaQogfQogI2VuZGlmIC8vIFVTRShDRk5FVFdPUkspCiAKKyNpZiAoZGVm aW5lZCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEICYmIF9fTUFDX09TX1hfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gMTAxMTAwKSB8fCAoZGVmaW5lZCBfX0lQSE9ORV9PU19WRVJTSU9O X01JTl9SRVFVSVJFRCAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSA5MDAw MCkKKyNkZWZpbmUgSEFWRV9USU1JTkdEQVRBT1BUSU9OUyAxCisjZWxzZQorI2RlZmluZSBIQVZF X1RJTUlOR0RBVEFPUFRJT05TIDAKKyNlbmRpZgorCisvLyBGSVhNRTogTW92ZSB0aGlzIHRvIENG TmV0d29ya1NQSS5oLgogI2lmIF9faGFzX2luY2x1ZGUoPEZvdW5kYXRpb24vTlNVUkxDb25uZWN0 aW9uUHJpdmF0ZS5oPikKICNpbXBvcnQgPEZvdW5kYXRpb24vTlNVUkxDb25uZWN0aW9uUHJpdmF0 ZS5oPgogI2Vsc2UKIEBpbnRlcmZhY2UgTlNVUkxDb25uZWN0aW9uIChUaW1pbmdEYXRhKQorI2lm ICFIQVZFX1RJTUlOR0RBVEFPUFRJT05TCiArICh2b2lkKV9zZXRDb2xsZWN0c1RpbWluZ0RhdGE6 KEJPT0wpY29sbGVjdDsKKyNlbmRpZgogLSAoTlNEaWN0aW9uYXJ5ICopX3RpbWluZ0RhdGE7CiBA ZW5kCisjaWYgSEFWRV9USU1JTkdEQVRBT1BUSU9OUworZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVm IF9rQ0ZVUkxDb25uZWN0aW9uUHJvcGVydHlUaW1pbmdEYXRhT3B0aW9uczsKK2NvbnN0IGludDY0 X3QgX1RpbWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdhdGlvblRpbWluZyA9ICgxIDw8IDAp OworI2VuZGlmCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKQEAgLTIxNyw5ICsyMzAsMTIg QEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlTlNVUkxDb25uZWN0aQogICAgIGlmIChzeW5j aHJvbm91c1dpbGxTZW5kUmVxdWVzdEVuYWJsZWQoKSkKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0 U2hvdWxkU3RhcnRTeW5jaHJvbm91c2x5KFtuc1JlcXVlc3QgX0NGVVJMUmVxdWVzdF0sIDEpOwog I2Vsc2UKLSAgICBOU0RpY3Rpb25hcnkgKnByb3BlcnR5RGljdGlvbmFyeSA9IFtOU0RpY3Rpb25h cnkgZGljdGlvbmFyeVdpdGhPYmplY3Q6c3RyZWFtUHJvcGVydGllcyBmb3JLZXk6QCJrQ0ZVUkxD b25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcyJdOworICAgIE5TTXV0YWJsZURpY3Rpb25h cnkgKnByb3BlcnR5RGljdGlvbmFyeSA9IFtOU011dGFibGVEaWN0aW9uYXJ5IGRpY3Rpb25hcnlX aXRoT2JqZWN0OnN0cmVhbVByb3BlcnRpZXMgZm9yS2V5OkAia0NGVVJMQ29ubmVjdGlvblNvY2tl dFN0cmVhbVByb3BlcnRpZXMiXTsKICAgICBjb25zdCBib29sIHVzZXNDYWNoZSA9IHRydWU7CiAj ZW5kaWYKKyNpZiBIQVZFX1RJTUlOR0RBVEFPUFRJT05TCisgICAgW3Byb3BlcnR5RGljdGlvbmFy eSBzZXRPYmplY3Q6QHtAIl9rQ0ZVUkxDb25uZWN0aW9uUHJvcGVydHlUaW1pbmdEYXRhT3B0aW9u cyI6IEAoX1RpbWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdhdGlvblRpbWluZyl9IGZvcktl eTpAImtDRlVSTENvbm5lY3Rpb25VUkxDb25uZWN0aW9uUHJvcGVydGllcyJdOworI2VuZGlmCiAg ICAgZC0+bV9jb25uZWN0aW9uID0gYWRvcHROUyhbW05TVVJMQ29ubmVjdGlvbiBhbGxvY10gX2lu aXRXaXRoUmVxdWVzdDpuc1JlcXVlc3QgZGVsZWdhdGU6ZGVsZWdhdGUgdXNlc0NhY2hlOnVzZXND YWNoZSBtYXhDb250ZW50TGVuZ3RoOjAgc3RhcnRJbW1lZGlhdGVseTpOTyBjb25uZWN0aW9uUHJv cGVydGllczpwcm9wZXJ0eURpY3Rpb25hcnldKTsKIH0KIApAQCAtNzQ2LDEwICs3NjIsMTIgQEAg dm9pZCBSZXNvdXJjZUhhbmRsZTo6Z2V0Q29ubmVjdGlvblRpbWluZwogCiB2b2lkIFJlc291cmNl SGFuZGxlOjpzZXRDb2xsZWN0c1RpbWluZ0RhdGEoKQogeworI2lmICFIQVZFX1RJTUlOR0RBVEFP UFRJT05TCiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CiAgICAgZGlzcGF0 Y2hfb25jZSgmb25jZVRva2VuLCBeewogICAgICAgICBbTlNVUkxDb25uZWN0aW9uIF9zZXRDb2xs ZWN0c1RpbWluZ0RhdGE6WUVTXTsKICAgICB9KTsKKyNlbmRpZgogfQogCiAjaWYgVVNFKENGTkVU V09SSykK 254316 2015-06-04 17:01:20 -0700 2015-06-04 17:46:50 -0700 Patch bug-145650-20150604170058.patch text/plain 5097 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTIyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA2LTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYiBUaW1p bmddIFVzZSBuZXcgU1BJIHRvIGVuYWJsZSBkYXRhIGNvbGxlY3Rpb24uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2NTAKKyAgICAgICAgcmRhcjov L3Byb2JsZW0vMjEyMDMzNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlQ0ZVUkxDb25uZWN0aW9u KToKKyAgICAgICAgR2F0aGVyIHdlYiB0aW1pbmcgZGF0YSBvbiBpT1MuCisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW06CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlTlNVUkxDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlSGFuZGxlOjpzZXRDb2xsZWN0c1RpbWluZ0RhdGEpOgorICAgICAgICBHYXRo ZXIgd2ViIHRpbWluZyBkYXRhIG9uIE1hYy4KKwogMjAxNS0wNi0wNCAgTWF0dCBSYWpjYSAgPG1y YWpjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIE1lZGlhU2Vzc2lvbk1hbmFnZXIgdG8g UGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyIGZvciBjb25zaXN0ZW5jeSB3aXRoIFBsYXRmb3Jt TWVkaWFTZXNzaW9uLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9S ZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCShyZXZpc2lvbiAxODUxNzgp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZO ZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Miw2ICs2MiwxMiBAQAogI2VuZGlmCiAjZW5kaWYK IAorI2lmIFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gOTAwMDAKKyNkZWZpbmUgSEFWRV9USU1JTkdEQVRBT1BUSU9OUyAxCisjZWxzZQorI2RlZmlu ZSBIQVZFX1RJTUlOR0RBVEFPUFRJT05TIDAKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oV0lOKQog I2luY2x1ZGUgPFdlYktpdFN5c3RlbUludGVyZmFjZS9XZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4K ICNpbmNsdWRlIDxwcm9jZXNzLmg+CkBAIC0yMDYsNiArMjEyLDEyIEBAIHZvaWQgUmVzb3VyY2VI YW5kbGU6OmNyZWF0ZUNGVVJMQ29ubmVjdGkKICAgICAgICAgcHJvcGVydGllc0RpY3Rpb25hcnkg PSBhZG9wdENGKENGRGljdGlvbmFyeUNyZWF0ZU11dGFibGVDb3B5KGtDRkFsbG9jYXRvckRlZmF1 bHQsIDAsIGNsaWVudFByb3BlcnRpZXMpKTsKICAgICBlbHNlCiAgICAgICAgIHByb3BlcnRpZXNE aWN0aW9uYXJ5ID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRv ckRlZmF1bHQsIDAsICZrQ0ZUeXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0 aW9uYXJ5VmFsdWVDYWxsQmFja3MpKTsKKyNpZiBIQVZFX1RJTUlOR0RBVEFPUFRJT05TCisgICAg YXV0byB0aW1pbmdEYXRhT3B0aW9uc0RpY3Rpb25hcnkgPSBhZG9wdENGKENGRGljdGlvbmFyeUNy ZWF0ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgJmtDRlR5cGVEaWN0aW9uYXJ5S2V5 Q2FsbEJhY2tzLCAma0NGVHlwZURpY3Rpb25hcnlWYWx1ZUNhbGxCYWNrcykpOworICAgIGludDY0 X3QgdmFsdWUgPSBfVGltaW5nRGF0YU9wdGlvbnNFbmFibGVXM0NOYXZpZ2F0aW9uVGltaW5nOwor ICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKHByb3BlcnRpZXNEaWN0aW9uYXJ5LmdldCgpLCBDRlNU Uigia0NGVVJMQ29ubmVjdGlvblVSTENvbm5lY3Rpb25Qcm9wZXJ0aWVzIiksICZ2YWx1ZSk7Cisg ICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUocHJvcGVydGllc0RpY3Rpb25hcnkuZ2V0KCksIENGU1RS KCJfa0NGVVJMQ29ubmVjdGlvblByb3BlcnR5VGltaW5nRGF0YU9wdGlvbnMiKSwgdGltaW5nRGF0 YU9wdGlvbnNEaWN0aW9uYXJ5LmdldCgpKTsKKyNlbmRpZgogCiAgICAgLy8gRklYTUU6IFRoaXMg Y29kZSBpcyBkaWZmZXJlbnQgZnJvbSBpT1MgY29kZSBpbiBSZXNvdXJjZUhhbmRsZU1hYy5tbSBp biB0aGF0IGhlcmUgd2UgaWdub3JlIHN0cmVhbSBwcm9wZXJ0aWVzIHRoYXQgd2VyZSBwcmVzZW50 IGluIGNsaWVudCBwcm9wZXJ0aWVzLgogICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKHByb3BlcnRp ZXNEaWN0aW9uYXJ5LmdldCgpLCBrQ0ZVUkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGll cywgc3RyZWFtUHJvcGVydGllcyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQkocmV2aXNpb24gMTg1 MTc4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5k bGVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY1LDEzICs2NSwyNiBAQCBDRkRpY3Rpb25hcnlS ZWYgX0NGVVJMQ29ubmVjdGlvbkNvcHlUaW1pCiB9CiAjZW5kaWYgLy8gVVNFKENGTkVUV09SSykK IAorI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTAxMTAwKSB8fCAoVEFSR0VUX09TX0lQSE9ORSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSA5MDAwMCkKKyNkZWZpbmUgSEFWRV9USU1JTkdEQVRBT1BUSU9OUyAxCisj ZWxzZQorI2RlZmluZSBIQVZFX1RJTUlOR0RBVEFPUFRJT05TIDAKKyNlbmRpZgorCisvLyBGSVhN RTogTW92ZSB0aGlzIHRvIENGTmV0d29ya1NQSS5oLgogI2lmIF9faGFzX2luY2x1ZGUoPEZvdW5k YXRpb24vTlNVUkxDb25uZWN0aW9uUHJpdmF0ZS5oPikKICNpbXBvcnQgPEZvdW5kYXRpb24vTlNV UkxDb25uZWN0aW9uUHJpdmF0ZS5oPgogI2Vsc2UKIEBpbnRlcmZhY2UgTlNVUkxDb25uZWN0aW9u IChUaW1pbmdEYXRhKQorI2lmICFIQVZFX1RJTUlOR0RBVEFPUFRJT05TCiArICh2b2lkKV9zZXRD b2xsZWN0c1RpbWluZ0RhdGE6KEJPT0wpY29sbGVjdDsKKyNlbmRpZgogLSAoTlNEaWN0aW9uYXJ5 ICopX3RpbWluZ0RhdGE7CiBAZW5kCisjaWYgSEFWRV9USU1JTkdEQVRBT1BUSU9OUworZXh0ZXJu IGNvbnN0IENGU3RyaW5nUmVmIF9rQ0ZVUkxDb25uZWN0aW9uUHJvcGVydHlUaW1pbmdEYXRhT3B0 aW9uczsKK2NvbnN0IGludDY0X3QgX1RpbWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdhdGlv blRpbWluZyA9ICgxIDw8IDApOworI2VuZGlmCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykK QEAgLTIxNyw5ICsyMzAsMTIgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlTlNVUkxDb25u ZWN0aQogICAgIGlmIChzeW5jaHJvbm91c1dpbGxTZW5kUmVxdWVzdEVuYWJsZWQoKSkKICAgICAg ICAgQ0ZVUkxSZXF1ZXN0U2V0U2hvdWxkU3RhcnRTeW5jaHJvbm91c2x5KFtuc1JlcXVlc3QgX0NG VVJMUmVxdWVzdF0sIDEpOwogI2Vsc2UKLSAgICBOU0RpY3Rpb25hcnkgKnByb3BlcnR5RGljdGlv bmFyeSA9IFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3Q6c3RyZWFtUHJvcGVydGll cyBmb3JLZXk6QCJrQ0ZVUkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcyJdOworICAg IE5TTXV0YWJsZURpY3Rpb25hcnkgKnByb3BlcnR5RGljdGlvbmFyeSA9IFtOU011dGFibGVEaWN0 aW9uYXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0OnN0cmVhbVByb3BlcnRpZXMgZm9yS2V5OkAia0NG VVJMQ29ubmVjdGlvblNvY2tldFN0cmVhbVByb3BlcnRpZXMiXTsKICAgICBjb25zdCBib29sIHVz ZXNDYWNoZSA9IHRydWU7CiAjZW5kaWYKKyNpZiBIQVZFX1RJTUlOR0RBVEFPUFRJT05TCisgICAg W3Byb3BlcnR5RGljdGlvbmFyeSBzZXRPYmplY3Q6QHtAIl9rQ0ZVUkxDb25uZWN0aW9uUHJvcGVy dHlUaW1pbmdEYXRhT3B0aW9ucyI6IEAoX1RpbWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdh dGlvblRpbWluZyl9IGZvcktleTpAImtDRlVSTENvbm5lY3Rpb25VUkxDb25uZWN0aW9uUHJvcGVy dGllcyJdOworI2VuZGlmCiAgICAgZC0+bV9jb25uZWN0aW9uID0gYWRvcHROUyhbW05TVVJMQ29u bmVjdGlvbiBhbGxvY10gX2luaXRXaXRoUmVxdWVzdDpuc1JlcXVlc3QgZGVsZWdhdGU6ZGVsZWdh dGUgdXNlc0NhY2hlOnVzZXNDYWNoZSBtYXhDb250ZW50TGVuZ3RoOjAgc3RhcnRJbW1lZGlhdGVs eTpOTyBjb25uZWN0aW9uUHJvcGVydGllczpwcm9wZXJ0eURpY3Rpb25hcnldKTsKIH0KIApAQCAt NzQ2LDEwICs3NjIsMTIgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Z2V0Q29ubmVjdGlvblRpbWlu ZwogCiB2b2lkIFJlc291cmNlSGFuZGxlOjpzZXRDb2xsZWN0c1RpbWluZ0RhdGEoKQogeworI2lm ICFIQVZFX1RJTUlOR0RBVEFPUFRJT05TCiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBvbmNl VG9rZW47CiAgICAgZGlzcGF0Y2hfb25jZSgmb25jZVRva2VuLCBeewogICAgICAgICBbTlNVUkxD b25uZWN0aW9uIF9zZXRDb2xsZWN0c1RpbWluZ0RhdGE6WUVTXTsKICAgICB9KTsKKyNlbmRpZgog fQogCiAjaWYgVVNFKENGTkVUV09SSykK 254321 2015-06-04 17:46:53 -0700 2015-06-05 14:12:18 -0700 Patch bug-145650-20150604174631.patch text/plain 5142 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTIyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA2LTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYiBUaW1p bmddIFVzZSBuZXcgU1BJIHRvIGVuYWJsZSBkYXRhIGNvbGxlY3Rpb24uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2NTAKKyAgICAgICAgcmRhcjov L3Byb2JsZW0vMjEyMDMzNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlQ0ZVUkxDb25uZWN0aW9u KToKKyAgICAgICAgR2F0aGVyIHdlYiB0aW1pbmcgZGF0YSBvbiBpT1MuCisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW06CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlTlNVUkxDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlSGFuZGxlOjpzZXRDb2xsZWN0c1RpbWluZ0RhdGEpOgorICAgICAgICBHYXRo ZXIgd2ViIHRpbWluZyBkYXRhIG9uIE1hYy4KKwogMjAxNS0wNi0wNCAgTWF0dCBSYWpjYSAgPG1y YWpjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIE1lZGlhU2Vzc2lvbk1hbmFnZXIgdG8g UGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyIGZvciBjb25zaXN0ZW5jeSB3aXRoIFBsYXRmb3Jt TWVkaWFTZXNzaW9uLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9S ZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCShyZXZpc2lvbiAxODUxNzgp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZO ZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Miw2ICs2MiwxMiBAQAogI2VuZGlmCiAjZW5kaWYK IAorI2lmIFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gOTAwMDAKKyNkZWZpbmUgSEFWRV9USU1JTkdEQVRBT1BUSU9OUyAxCisjZWxzZQorI2RlZmlu ZSBIQVZFX1RJTUlOR0RBVEFPUFRJT05TIDAKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oV0lOKQog I2luY2x1ZGUgPFdlYktpdFN5c3RlbUludGVyZmFjZS9XZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4K ICNpbmNsdWRlIDxwcm9jZXNzLmg+CkBAIC0yMDYsNiArMjEyLDEyIEBAIHZvaWQgUmVzb3VyY2VI YW5kbGU6OmNyZWF0ZUNGVVJMQ29ubmVjdGkKICAgICAgICAgcHJvcGVydGllc0RpY3Rpb25hcnkg PSBhZG9wdENGKENGRGljdGlvbmFyeUNyZWF0ZU11dGFibGVDb3B5KGtDRkFsbG9jYXRvckRlZmF1 bHQsIDAsIGNsaWVudFByb3BlcnRpZXMpKTsKICAgICBlbHNlCiAgICAgICAgIHByb3BlcnRpZXNE aWN0aW9uYXJ5ID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRv ckRlZmF1bHQsIDAsICZrQ0ZUeXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0 aW9uYXJ5VmFsdWVDYWxsQmFja3MpKTsKKyNpZiBIQVZFX1RJTUlOR0RBVEFPUFRJT05TCisgICAg YXV0byB0aW1pbmdEYXRhT3B0aW9uc0RpY3Rpb25hcnkgPSBhZG9wdENGKENGRGljdGlvbmFyeUNy ZWF0ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgJmtDRlR5cGVEaWN0aW9uYXJ5S2V5 Q2FsbEJhY2tzLCAma0NGVHlwZURpY3Rpb25hcnlWYWx1ZUNhbGxCYWNrcykpOworICAgIGNvbnN0 IGludDY0X3QgVGltaW5nRGF0YU9wdGlvbnNFbmFibGVXM0NOYXZpZ2F0aW9uVGltaW5nID0gKDEg PDwgMCk7CisgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUocHJvcGVydGllc0RpY3Rpb25hcnkuZ2V0 KCksIENGU1RSKCJrQ0ZVUkxDb25uZWN0aW9uVVJMQ29ubmVjdGlvblByb3BlcnRpZXMiKSwgJlRp bWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdhdGlvblRpbWluZyk7CisgICAgQ0ZEaWN0aW9u YXJ5QWRkVmFsdWUocHJvcGVydGllc0RpY3Rpb25hcnkuZ2V0KCksIENGU1RSKCJfa0NGVVJMQ29u bmVjdGlvblByb3BlcnR5VGltaW5nRGF0YU9wdGlvbnMiKSwgdGltaW5nRGF0YU9wdGlvbnNEaWN0 aW9uYXJ5LmdldCgpKTsKKyNlbmRpZgogCiAgICAgLy8gRklYTUU6IFRoaXMgY29kZSBpcyBkaWZm ZXJlbnQgZnJvbSBpT1MgY29kZSBpbiBSZXNvdXJjZUhhbmRsZU1hYy5tbSBpbiB0aGF0IGhlcmUg d2UgaWdub3JlIHN0cmVhbSBwcm9wZXJ0aWVzIHRoYXQgd2VyZSBwcmVzZW50IGluIGNsaWVudCBw cm9wZXJ0aWVzLgogICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKHByb3BlcnRpZXNEaWN0aW9uYXJ5 LmdldCgpLCBrQ0ZVUkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcywgc3RyZWFtUHJv cGVydGllcyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNv dXJjZUhhbmRsZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQkocmV2aXNpb24gMTg1MTc4KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0JKHdv cmtpbmcgY29weSkKQEAgLTY1LDEzICs2NSwyNiBAQCBDRkRpY3Rpb25hcnlSZWYgX0NGVVJMQ29u bmVjdGlvbkNvcHlUaW1pCiB9CiAjZW5kaWYgLy8gVVNFKENGTkVUV09SSykKIAorI2lmIChQTEFU Rk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMTAwKSB8 fCAoVEFSR0VUX09TX0lQSE9ORSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+ PSA5MDAwMCkKKyNkZWZpbmUgSEFWRV9USU1JTkdEQVRBT1BUSU9OUyAxCisjZWxzZQorI2RlZmlu ZSBIQVZFX1RJTUlOR0RBVEFPUFRJT05TIDAKKyNlbmRpZgorCisvLyBGSVhNRTogTW92ZSB0aGlz IHRvIENGTmV0d29ya1NQSS5oLgogI2lmIF9faGFzX2luY2x1ZGUoPEZvdW5kYXRpb24vTlNVUkxD b25uZWN0aW9uUHJpdmF0ZS5oPikKICNpbXBvcnQgPEZvdW5kYXRpb24vTlNVUkxDb25uZWN0aW9u UHJpdmF0ZS5oPgogI2Vsc2UKIEBpbnRlcmZhY2UgTlNVUkxDb25uZWN0aW9uIChUaW1pbmdEYXRh KQorI2lmICFIQVZFX1RJTUlOR0RBVEFPUFRJT05TCiArICh2b2lkKV9zZXRDb2xsZWN0c1RpbWlu Z0RhdGE6KEJPT0wpY29sbGVjdDsKKyNlbmRpZgogLSAoTlNEaWN0aW9uYXJ5ICopX3RpbWluZ0Rh dGE7CiBAZW5kCisjaWYgSEFWRV9USU1JTkdEQVRBT1BUSU9OUworZXh0ZXJuIGNvbnN0IENGU3Ry aW5nUmVmIF9rQ0ZVUkxDb25uZWN0aW9uUHJvcGVydHlUaW1pbmdEYXRhT3B0aW9uczsKK2NvbnN0 IGludDY0X3QgX1RpbWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdhdGlvblRpbWluZyA9ICgx IDw8IDApOworI2VuZGlmCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKQEAgLTIxNyw5ICsy MzAsMTIgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlTlNVUkxDb25uZWN0aQogICAgIGlm IChzeW5jaHJvbm91c1dpbGxTZW5kUmVxdWVzdEVuYWJsZWQoKSkKICAgICAgICAgQ0ZVUkxSZXF1 ZXN0U2V0U2hvdWxkU3RhcnRTeW5jaHJvbm91c2x5KFtuc1JlcXVlc3QgX0NGVVJMUmVxdWVzdF0s IDEpOwogI2Vsc2UKLSAgICBOU0RpY3Rpb25hcnkgKnByb3BlcnR5RGljdGlvbmFyeSA9IFtOU0Rp Y3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3Q6c3RyZWFtUHJvcGVydGllcyBmb3JLZXk6QCJr Q0ZVUkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcyJdOworICAgIE5TTXV0YWJsZURp Y3Rpb25hcnkgKnByb3BlcnR5RGljdGlvbmFyeSA9IFtOU011dGFibGVEaWN0aW9uYXJ5IGRpY3Rp b25hcnlXaXRoT2JqZWN0OnN0cmVhbVByb3BlcnRpZXMgZm9yS2V5OkAia0NGVVJMQ29ubmVjdGlv blNvY2tldFN0cmVhbVByb3BlcnRpZXMiXTsKICAgICBjb25zdCBib29sIHVzZXNDYWNoZSA9IHRy dWU7CiAjZW5kaWYKKyNpZiBIQVZFX1RJTUlOR0RBVEFPUFRJT05TCisgICAgW3Byb3BlcnR5RGlj dGlvbmFyeSBzZXRPYmplY3Q6QHtAIl9rQ0ZVUkxDb25uZWN0aW9uUHJvcGVydHlUaW1pbmdEYXRh T3B0aW9ucyI6IEAoX1RpbWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdhdGlvblRpbWluZyl9 IGZvcktleTpAImtDRlVSTENvbm5lY3Rpb25VUkxDb25uZWN0aW9uUHJvcGVydGllcyJdOworI2Vu ZGlmCiAgICAgZC0+bV9jb25uZWN0aW9uID0gYWRvcHROUyhbW05TVVJMQ29ubmVjdGlvbiBhbGxv Y10gX2luaXRXaXRoUmVxdWVzdDpuc1JlcXVlc3QgZGVsZWdhdGU6ZGVsZWdhdGUgdXNlc0NhY2hl OnVzZXNDYWNoZSBtYXhDb250ZW50TGVuZ3RoOjAgc3RhcnRJbW1lZGlhdGVseTpOTyBjb25uZWN0 aW9uUHJvcGVydGllczpwcm9wZXJ0eURpY3Rpb25hcnldKTsKIH0KIApAQCAtNzQ2LDEwICs3NjIs MTIgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Z2V0Q29ubmVjdGlvblRpbWluZwogCiB2b2lkIFJl c291cmNlSGFuZGxlOjpzZXRDb2xsZWN0c1RpbWluZ0RhdGEoKQogeworI2lmICFIQVZFX1RJTUlO R0RBVEFPUFRJT05TCiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CiAgICAg ZGlzcGF0Y2hfb25jZSgmb25jZVRva2VuLCBeewogICAgICAgICBbTlNVUkxDb25uZWN0aW9uIF9z ZXRDb2xsZWN0c1RpbWluZ0RhdGE6WUVTXTsKICAgICB9KTsKKyNlbmRpZgogfQogCiAjaWYgVVNF KENGTkVUV09SSykK 254381 2015-06-05 14:12:22 -0700 2015-06-05 14:26:18 -0700 Patch bug-145650-20150605141159.patch text/plain 5748 achristensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxODUyNjEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA2LTA1ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYiBUaW1pbmddIFVzZSBuZXcg U1BJIHRvIGVuYWJsZSBkYXRhIGNvbGxlY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2NTAKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjEy MDMzNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHd0Zi9QbGF0Zm9ybS5oOgorICAgICAgICBBZGRlZCBIQVZFX1RJTUlOR0RBVEFPUFRJT05TIGZv ciBwbGF0Zm9ybSBhbmQgdmVyc2lvbiBkZXBlbmRlbnQgZmVhdHVyZS4KKwogMjAxNS0wNi0wNSAg WGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPiBhbmQgWW91ZW5u IEZhYmxldCA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgW1N0cmVhbXMg QVBJXSBSZWFkYWJsZVN0cmVhbSBzaG91bGQgc3RvcmUgY2FsbGJhY2tzIGFzIGEgRGVxdWUKSW5k ZXg6IFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93 dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gMTg1MjUzKQorKysgU291cmNlL1dURi93dGYvUGxhdGZv cm0uaAkod29ya2luZyBjb3B5KQpAQCAtMTA3Nyw2ICsxMDc3LDEwIEBACiAjZGVmaW5lIFVTRV9J TlNFUlRJT05fVU5ET19HUk9VUElORyAxCiAjZW5kaWYKIAorI2lmIChQTEFURk9STShNQUMpICYm IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMTAwKSB8fCAoUExBVEZPUk0o SU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSA5MDAwMCkKKyNkZWZp bmUgSEFWRV9USU1JTkdEQVRBT1BUSU9OUyAxCisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKElPUykK ICNkZWZpbmUgVVNFX1BMQVRGT1JNX1RFWFRfVFJBQ0tfTUVOVSAxCiAjZW5kaWYKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cJKHJldmlzaW9uIDE4NTI1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA2LTA1ICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYiBUaW1pbmddIFVzZSBu ZXcgU1BJIHRvIGVuYWJsZSBkYXRhIGNvbGxlY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2NTAKKyAgICAgICAgcmRhcjovL3Byb2JsZW0v MjEyMDMzNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlQ0ZVUkxDb25uZWN0aW9uKToKKyAgICAg ICAgR2F0aGVyIHdlYiB0aW1pbmcgZGF0YSBvbiBpT1MuCisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJj ZUhhbmRsZTo6Y3JlYXRlTlNVUkxDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlSGFuZGxlOjpzZXRDb2xsZWN0c1RpbWluZ0RhdGEpOgorICAgICAgICBHYXRoZXIgd2ViIHRp bWluZyBkYXRhIG9uIE1hYy4KKwogMjAxNS0wNi0wNSAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVy ZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBbV2F5bGFuZF0gVGhlIE1p bmlCcm93c2VyIGNyYXNoZXMgaW5zaWRlIFdlc3Rvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUhhbmRsZUNGTmV0LmNw cAkocmV2aXNpb24gMTg1MjUzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j Zi9SZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA2LDYgKzIwNiwx MyBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpjcmVhdGVDRlVSTENvbm5lY3RpCiAgICAgICAgIHBy b3BlcnRpZXNEaWN0aW9uYXJ5ID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlQ29w eShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAwLCBjbGllbnRQcm9wZXJ0aWVzKSk7CiAgICAgZWxzZQog ICAgICAgICBwcm9wZXJ0aWVzRGljdGlvbmFyeSA9IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5Q3JlYXRl TXV0YWJsZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAwLCAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxs QmFja3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKSk7CisjaWYgSEFWRShUSU1J TkdEQVRBT1BUSU9OUykKKyAgICBjb25zdCBpbnQ2NF90IFRpbWluZ0RhdGFPcHRpb25zRW5hYmxl VzNDTmF2aWdhdGlvblRpbWluZyA9ICgxIDw8IDApOworICAgIGF1dG8gZW5hYmxlVzNDTmF2aWdh dGlvblRpbWluZyA9IGFkb3B0Q0YoQ0ZOdW1iZXJDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwg a0NGTnVtYmVyU0ludDY0VHlwZSwgJlRpbWluZ0RhdGFPcHRpb25zRW5hYmxlVzNDTmF2aWdhdGlv blRpbWluZykpOworICAgIGF1dG8gdGltaW5nRGF0YU9wdGlvbnNEaWN0aW9uYXJ5ID0gYWRvcHRD RihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDAsICZrQ0ZU eXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFj a3MpKTsKKyAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZSh0aW1pbmdEYXRhT3B0aW9uc0RpY3Rpb25h cnkuZ2V0KCksIENGU1RSKCJfa0NGVVJMQ29ubmVjdGlvblByb3BlcnR5VGltaW5nRGF0YU9wdGlv bnMiKSwgZW5hYmxlVzNDTmF2aWdhdGlvblRpbWluZy5nZXQoKSk7CisgICAgQ0ZEaWN0aW9uYXJ5 QWRkVmFsdWUocHJvcGVydGllc0RpY3Rpb25hcnkuZ2V0KCksIENGU1RSKCJrQ0ZVUkxDb25uZWN0 aW9uVVJMQ29ubmVjdGlvblByb3BlcnRpZXMiKSwgdGltaW5nRGF0YU9wdGlvbnNEaWN0aW9uYXJ5 LmdldCgpKTsKKyNlbmRpZgogCiAgICAgLy8gRklYTUU6IFRoaXMgY29kZSBpcyBkaWZmZXJlbnQg ZnJvbSBpT1MgY29kZSBpbiBSZXNvdXJjZUhhbmRsZU1hYy5tbSBpbiB0aGF0IGhlcmUgd2UgaWdu b3JlIHN0cmVhbSBwcm9wZXJ0aWVzIHRoYXQgd2VyZSBwcmVzZW50IGluIGNsaWVudCBwcm9wZXJ0 aWVzLgogICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKHByb3BlcnRpZXNEaWN0aW9uYXJ5LmdldCgp LCBrQ0ZVUkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcywgc3RyZWFtUHJvcGVydGll cyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhh bmRsZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQkocmV2aXNpb24gMTg1MjUzKQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0JKHdvcmtpbmcg Y29weSkKQEAgLTY5LDcgKzY5LDkgQEAgQ0ZEaWN0aW9uYXJ5UmVmIF9DRlVSTENvbm5lY3Rpb25D b3B5VGltaQogI2ltcG9ydCA8Rm91bmRhdGlvbi9OU1VSTENvbm5lY3Rpb25Qcml2YXRlLmg+CiAj ZWxzZQogQGludGVyZmFjZSBOU1VSTENvbm5lY3Rpb24gKFRpbWluZ0RhdGEpCisjaWYgIUhBVkUo VElNSU5HREFUQU9QVElPTlMpCiArICh2b2lkKV9zZXRDb2xsZWN0c1RpbWluZ0RhdGE6KEJPT0wp Y29sbGVjdDsKKyNlbmRpZgogLSAoTlNEaWN0aW9uYXJ5ICopX3RpbWluZ0RhdGE7CiBAZW5kCiAj ZW5kaWYKQEAgLTIxNyw5ICsyMTksMTMgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlTlNV UkxDb25uZWN0aQogICAgIGlmIChzeW5jaHJvbm91c1dpbGxTZW5kUmVxdWVzdEVuYWJsZWQoKSkK ICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0U2hvdWxkU3RhcnRTeW5jaHJvbm91c2x5KFtuc1JlcXVl c3QgX0NGVVJMUmVxdWVzdF0sIDEpOwogI2Vsc2UKLSAgICBOU0RpY3Rpb25hcnkgKnByb3BlcnR5 RGljdGlvbmFyeSA9IFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3Q6c3RyZWFtUHJv cGVydGllcyBmb3JLZXk6QCJrQ0ZVUkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcyJd OworICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKnByb3BlcnR5RGljdGlvbmFyeSA9IFtOU011dGFi bGVEaWN0aW9uYXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0OnN0cmVhbVByb3BlcnRpZXMgZm9yS2V5 OkAia0NGVVJMQ29ubmVjdGlvblNvY2tldFN0cmVhbVByb3BlcnRpZXMiXTsKICAgICBjb25zdCBi b29sIHVzZXNDYWNoZSA9IHRydWU7CiAjZW5kaWYKKyNpZiBIQVZFKFRJTUlOR0RBVEFPUFRJT05T KQorICAgIGNvbnN0IGludDY0X3QgVGltaW5nRGF0YU9wdGlvbnNFbmFibGVXM0NOYXZpZ2F0aW9u VGltaW5nID0gKDEgPDwgMCk7CisgICAgW3Byb3BlcnR5RGljdGlvbmFyeSBzZXRPYmplY3Q6QHtA Il9rQ0ZVUkxDb25uZWN0aW9uUHJvcGVydHlUaW1pbmdEYXRhT3B0aW9ucyI6IEAoVGltaW5nRGF0 YU9wdGlvbnNFbmFibGVXM0NOYXZpZ2F0aW9uVGltaW5nKX0gZm9yS2V5OkAia0NGVVJMQ29ubmVj dGlvblVSTENvbm5lY3Rpb25Qcm9wZXJ0aWVzIl07CisjZW5kaWYKICAgICBkLT5tX2Nvbm5lY3Rp b24gPSBhZG9wdE5TKFtbTlNVUkxDb25uZWN0aW9uIGFsbG9jXSBfaW5pdFdpdGhSZXF1ZXN0Om5z UmVxdWVzdCBkZWxlZ2F0ZTpkZWxlZ2F0ZSB1c2VzQ2FjaGU6dXNlc0NhY2hlIG1heENvbnRlbnRM ZW5ndGg6MCBzdGFydEltbWVkaWF0ZWx5Ok5PIGNvbm5lY3Rpb25Qcm9wZXJ0aWVzOnByb3BlcnR5 RGljdGlvbmFyeV0pOwogfQogCkBAIC03NDYsMTAgKzc1MiwxMiBAQCB2b2lkIFJlc291cmNlSGFu ZGxlOjpnZXRDb25uZWN0aW9uVGltaW5nCiAKIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnNldENvbGxl Y3RzVGltaW5nRGF0YSgpCiB7CisjaWYgIUhBVkUoVElNSU5HREFUQU9QVElPTlMpCiAgICAgc3Rh dGljIGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CiAgICAgZGlzcGF0Y2hfb25jZSgmb25jZVRv a2VuLCBeewogICAgICAgICBbTlNVUkxDb25uZWN0aW9uIF9zZXRDb2xsZWN0c1RpbWluZ0RhdGE6 WUVTXTsKICAgICB9KTsKKyNlbmRpZgogfQogCiAjaWYgVVNFKENGTkVUV09SSykK