184289 2018-04-03 21:29:07 -0700 Fix the print formatter build 2018-04-04 11:30:22 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned bdakin jer.noble mitz thorton webkit-bug-importer oldest_to_newest 1411644 0 bdakin 2018-04-03 21:29:07 -0700 Fix the print formatter build rdar://problem/39164641 1411646 1 337143 bdakin 2018-04-03 21:31:22 -0700 Created attachment 337143 Patch 1411650 2 337143 mitz 2018-04-03 21:44:10 -0700 Comment on attachment 337143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337143&action=review > Source/WebKit/UIProcess/_WKWebViewPrintFormatter.h:37 > +#if ENABLE(MINIMAL_SIMULATOR) > +UIViewPrintFormatter > +#else We don’t use our internal ENABLE() macro in modern WebKit SPI headers. > Source/WebKit/UIProcess/_WKWebViewPrintFormatter.h:41 > +#if !ENABLE(MINIMAL_SIMULATOR) Ditto. 1411763 3 337182 bdakin 2018-04-04 10:05:17 -0700 Created attachment 337182 Patch that addresses Dan's comments 1411791 4 337189 bdakin 2018-04-04 10:46:48 -0700 Created attachment 337189 Patch, rebased 1411802 5 337194 bdakin 2018-04-04 11:07:30 -0700 Created attachment 337194 Patch, rebased 1411810 6 bdakin 2018-04-04 11:29:21 -0700 Thanks Dan! https://trac.webkit.org/changeset/230268/webkit 1411813 7 webkit-bug-importer 2018-04-04 11:30:22 -0700 <rdar://problem/39181570> 337143 2018-04-03 21:31:22 -0700 2018-04-04 10:05:17 -0700 Patch for-review.txt text/plain 5862 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzAyNDIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA0LTAzICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdGhlIHByaW50IGZvcm1hdHRlciBi dWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0 Mjg5CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0v MzkxNjQ2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZp ZXcgX3dlYlZpZXdQcmludEZvcm1hdHRlcl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1By aW50Rm9ybWF0dGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1h dHRlci5tbToKKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50 ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisKIDIwMTgtMDQtMDMgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgTmV0d29ya1Byb2Nlc3Mg Z2V0IENvbnRlbnRCbG9ja2VyIGluZm9ybWF0aW9uIGZyb20gVUlQcm9jZXNzCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIuaAko cmV2aXNpb24gMjMwMjAzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvX1dLV2ViVmlld1By aW50Rm9ybWF0dGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDEwICszMSwxNyBAQAogQGNsYXNz IF9XS0ZyYW1lSGFuZGxlOwogCiBXS19DTEFTU19BVkFJTEFCTEUoaW9zKDguMCkpCi1AaW50ZXJm YWNlIF9XS1dlYlZpZXdQcmludEZvcm1hdHRlciA6IFVJVmlld1ByaW50Rm9ybWF0dGVyCitAaW50 ZXJmYWNlIF9XS1dlYlZpZXdQcmludEZvcm1hdHRlciA6CisjaWYgRU5BQkxFKE1JTklNQUxfU0lN VUxBVE9SKQorVUlWaWV3UHJpbnRGb3JtYXR0ZXIKKyNlbHNlCitOU09iamVjdAorI2VuZGlmCiAK KyNpZiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogQHByb3BlcnR5IChub25hdG9taWMsIHN0 cm9uZykgX1dLRnJhbWVIYW5kbGUgKmZyYW1lVG9QcmludDsKIEBwcm9wZXJ0eSAobm9uYXRvbWlj KSBCT09MIHNuYXBzaG90Rmlyc3RQYWdlIFdLX0FQSV9BVkFJTEFCTEUoaW9zKDExLjApKTsKKyNl bmRpZgogCiBAZW5kCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL19XS1dlYlZpZXdQ cmludEZvcm1hdHRlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9f V0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIubW0JKHJldmlzaW9uIDIzMDIwMykKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1hdHRlci5tbQkod29ya2luZyBjb3B5 KQpAQCAtMjYsNyArMjYsNyBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJfV0tXZWJW aWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5oIgogCi0jaWYgUExBVEZPUk0oSU9TKQorI2lmIFBM QVRGT1JNKElPUykgJiYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKIAogI2ltcG9ydCAiV0tX ZWJWaWV3SW50ZXJuYWwuaCIKICNpbXBvcnQgIl9XS0ZyYW1lSGFuZGxlLmgiCkBAIC0xMTYsNCAr MTE2LDQgQEAgLSAodm9pZClkcmF3SW5SZWN0OihDR1JlY3QpcmVjdCBmb3JQYWdlQQogCiBAZW5k CiAKLSNlbmRpZiAvLyBQTEFURk9STShJT1MpCisjZW5kaWYgLy8gUExBVEZPUk0oSU9TKSAmJiAh RU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv X1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5oCShyZXZp c2lvbiAyMzAyMDMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRG b3JtYXR0ZXJJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw3ICsyNSw3IEBACiAKICNp bXBvcnQgIl9XS1dlYlZpZXdQcmludEZvcm1hdHRlci5oIgogCi0jaWYgUExBVEZPUk0oSU9TKQor I2lmIFBMQVRGT1JNKElPUykgJiYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKIAogQGludGVy ZmFjZSBVSVByaW50Rm9ybWF0dGVyICgpCiAtIChDR1JlY3QpX3BhZ2VDb250ZW50UmVjdDooQk9P TClmaXJzdFBhZ2U7CkBAIC00MSw0ICs0MSw0IEBACiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVh ZG9ubHkpIENHUERGRG9jdW1lbnRSZWYgX3drX3ByaW50ZWREb2N1bWVudDsKIEBlbmQKIAotI2Vu ZGlmIC8vIFBMQVRGT1JNKElPUykKKyNlbmRpZiAvLyBQTEFURk9STShJT1MpICYmICFFTkFCTEUo TUlOSU1BTF9TSU1VTEFUT1IpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9uIDIzMDIwMykKKysrIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTU0ODQs OSArNTQ4NCwxMyBAQCAtIChOU1N0cmluZyAqKV9zdWdnZXN0ZWRGaWxlbmFtZUZvckRpc3BsCiAK IC0gKF9XS1dlYlZpZXdQcmludEZvcm1hdHRlciAqKV93ZWJWaWV3UHJpbnRGb3JtYXR0ZXIKIHsK KyNpZiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogICAgIFVJVmlld1ByaW50Rm9ybWF0dGVy ICp2aWV3UHJpbnRGb3JtYXR0ZXIgPSBzZWxmLnZpZXdQcmludEZvcm1hdHRlcjsKICAgICBBU1NF UlQoW3ZpZXdQcmludEZvcm1hdHRlciBpc0tpbmRPZkNsYXNzOltfV0tXZWJWaWV3UHJpbnRGb3Jt YXR0ZXIgY2xhc3NdXSk7CiAgICAgcmV0dXJuIChfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIgKil2 aWV3UHJpbnRGb3JtYXR0ZXI7CisjZWxzZQorICAgIHJldHVybiBuaWw7CisjZW5kaWYgLy8gRU5B QkxFKE1JTklNQUxfU0lNVUxBVE9SKQogfQogCiBzdGF0aWMgV2ViQ29yZTo6VXNlckludGVyZmFj ZUxheW91dERpcmVjdGlvbiB0b1VzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24oVUlTZW1hbnRp Y0NvbnRlbnRBdHRyaWJ1dGUgY29udGVudEF0dHJpYnV0ZSkKQEAgLTY0MzUsNyArNjQzOSw3IEBA IC0gKElCQWN0aW9uKXN0b3BMb2FkaW5nOihpZClzZW5kZXIKIAogI2VuZGlmIC8vIFBMQVRGT1JN KE1BQykKIAotI2lmIFBMQVRGT1JNKElPUykKKyNpZiBQTEFURk9STShJT1MpICYmICFFTkFCTEUo TUlOSU1BTF9TSU1VTEFUT1IpCiBAaW1wbGVtZW50YXRpb24gV0tXZWJWaWV3IChfV0tXZWJWaWV3 UHJpbnRGb3JtYXR0ZXIpCiAKIC0gKENsYXNzKV9wcmludEZvcm1hdHRlckNsYXNzCkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50 ZXJuYWwuaAkocmV2aXNpb24gMjMwMjAzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3MCw3ICsxNzAs NyBAQCBXS1dlYlZpZXcqIGZyb21XZWJQYWdlUHJveHkoV2ViS2l0OjpXZWJQCiBAZW5kCiAjZW5k aWYgLy8gRU5BQkxFKEZVTExTQ1JFRU5fQVBJKSAmJiBQTEFURk9STShJT1MpCiAKLSNpZiBQTEFU Rk9STShJT1MpCisjaWYgUExBVEZPUk0oSU9TKSAmJiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9S KQogQGludGVyZmFjZSBXS1dlYlZpZXcgKF9XS1dlYlZpZXdQcmludEZvcm1hdHRlcikKIEBwcm9w ZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgaWQgPF9XS1dlYlZpZXdQcmludFByb3ZpZGVyPiBf cHJpbnRQcm92aWRlcjsKIEBlbmQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3Lm1tCShyZXZpc2lvbiAyMzAyMDMpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjc2LDYgKzY3 Niw3IEBAIC0gKHZvaWQpX2FwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlOihOU04KIAogI3ByYWdt YSBtYXJrIFByaW50aW5nCiAKKyNpZiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogQGludGVy ZmFjZSBXS0NvbnRlbnRWaWV3IChfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIpIDxfV0tXZWJWaWV3 UHJpbnRQcm92aWRlcj4KIEBlbmQKIApAQCAtNzQyLDQgKzc0Myw2IEBAIC0gKENHUERGRG9jdW1l bnRSZWYpX3drX3ByaW50ZWREb2N1bWVudAogCiBAZW5kCiAKKyNlbmRpZiAvLyAhRU5BQkxFKE1J TklNQUxfU0lNVUxBVE9SKQorCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TKQpJbmRleDogU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCShyZXZpc2lvbiAyMzAyMDMpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC04NjUsNiArODY1LDggQEAgLSAodm9pZClfYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5k CiAKICNwcmFnbWEgbWFyayBQcmludGluZwogCisjaWYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRP UikKKwogQGludGVyZmFjZSBXS1BERlZpZXcgKF9XS1dlYlZpZXdQcmludEZvcm1hdHRlcikgPF9X S1dlYlZpZXdQcmludFByb3ZpZGVyPgogQGVuZAogCkBAIC04OTAsNiArODkyLDggQEAgLSAoQ0dQ REZEb2N1bWVudFJlZilfd2tfcHJpbnRlZERvY3VtZW50CiAKIEBlbmQKIAorI2VuZGlmIC8vICFF TkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AK IAogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykgJiYgRU5BQkxFKFdLUERGVklFVykK 337182 2018-04-04 10:05:17 -0700 2018-04-04 10:46:48 -0700 Patch that addresses Dan's comments for-review-2.txt text/plain 5152 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzAyNDIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA0LTAzICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdGhlIHByaW50IGZvcm1hdHRlciBi dWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0 Mjg5CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0v MzkxNjQ2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZp ZXcgX3dlYlZpZXdQcmludEZvcm1hdHRlcl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1By aW50Rm9ybWF0dGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1h dHRlci5tbToKKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50 ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisKIDIwMTgtMDQtMDMgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgTmV0d29ya1Byb2Nlc3Mg Z2V0IENvbnRlbnRCbG9ja2VyIGluZm9ybWF0aW9uIGZyb20gVUlQcm9jZXNzCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyLm1t CShyZXZpc2lvbiAyMzAyMDMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3 UHJpbnRGb3JtYXR0ZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDcgQEAKICNpbXBv cnQgImNvbmZpZy5oIgogI2ltcG9ydCAiX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwu aCIKIAotI2lmIFBMQVRGT1JNKElPUykKKyNpZiBQTEFURk9STShJT1MpICYmICFFTkFCTEUoTUlO SU1BTF9TSU1VTEFUT1IpCiAKICNpbXBvcnQgIldLV2ViVmlld0ludGVybmFsLmgiCiAjaW1wb3J0 ICJfV0tGcmFtZUhhbmRsZS5oIgpAQCAtMTE2LDQgKzExNiw0IEBAIC0gKHZvaWQpZHJhd0luUmVj dDooQ0dSZWN0KXJlY3QgZm9yUGFnZUEKIAogQGVuZAogCi0jZW5kaWYgLy8gUExBVEZPUk0oSU9T KQorI2VuZGlmIC8vIFBMQVRGT1JNKElPUykgJiYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1hdHRlcklu dGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvX1dLV2ViVmll d1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaAkocmV2aXNpb24gMjMwMjAzKQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjUsNyArMjUsNyBAQAogCiAjaW1wb3J0ICJfV0tXZWJWaWV3UHJpbnRGb3Jt YXR0ZXIuaCIKIAotI2lmIFBMQVRGT1JNKElPUykKKyNpZiBQTEFURk9STShJT1MpICYmICFFTkFC TEUoTUlOSU1BTF9TSU1VTEFUT1IpCiAKIEBpbnRlcmZhY2UgVUlQcmludEZvcm1hdHRlciAoKQog LSAoQ0dSZWN0KV9wYWdlQ29udGVudFJlY3Q6KEJPT0wpZmlyc3RQYWdlOwpAQCAtNDEsNCArNDEs NCBAQAogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBDR1BERkRvY3VtZW50UmVmIF93 a19wcmludGVkRG9jdW1lbnQ7CiBAZW5kCiAKLSNlbmRpZiAvLyBQTEFURk9STShJT1MpCisjZW5k aWYgLy8gUExBVEZPUk0oSU9TKSAmJiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQpJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCShyZXZp c2lvbiAyMzAyMDMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01NDg0LDkgKzU0ODQsMTMgQEAgLSAoTlNTdHJpbmcg Kilfc3VnZ2VzdGVkRmlsZW5hbWVGb3JEaXNwbAogCiAtIChfV0tXZWJWaWV3UHJpbnRGb3JtYXR0 ZXIgKilfd2ViVmlld1ByaW50Rm9ybWF0dGVyCiB7CisjaWYgIUVOQUJMRShNSU5JTUFMX1NJTVVM QVRPUikKICAgICBVSVZpZXdQcmludEZvcm1hdHRlciAqdmlld1ByaW50Rm9ybWF0dGVyID0gc2Vs Zi52aWV3UHJpbnRGb3JtYXR0ZXI7CiAgICAgQVNTRVJUKFt2aWV3UHJpbnRGb3JtYXR0ZXIgaXNL aW5kT2ZDbGFzczpbX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyIGNsYXNzXV0pOwogICAgIHJldHVy biAoX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyICopdmlld1ByaW50Rm9ybWF0dGVyOworI2Vsc2UK KyAgICByZXR1cm4gbmlsOworI2VuZGlmIC8vIEVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKIH0K IAogc3RhdGljIFdlYkNvcmU6OlVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24gdG9Vc2VySW50 ZXJmYWNlTGF5b3V0RGlyZWN0aW9uKFVJU2VtYW50aWNDb250ZW50QXR0cmlidXRlIGNvbnRlbnRB dHRyaWJ1dGUpCkBAIC02NDM1LDcgKzY0MzksNyBAQCAtIChJQkFjdGlvbilzdG9wTG9hZGluZzoo aWQpc2VuZGVyCiAKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCiAKLSNpZiBQTEFURk9STShJT1Mp CisjaWYgUExBVEZPUk0oSU9TKSAmJiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogQGltcGxl bWVudGF0aW9uIFdLV2ViVmlldyAoX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyKQogCiAtIChDbGFz cylfcHJpbnRGb3JtYXR0ZXJDbGFzcwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgJKHJldmlzaW9uIDIzMDIwMykK KysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xNzAsNyArMTcwLDcgQEAgV0tXZWJWaWV3KiBmcm9tV2ViUGFn ZVByb3h5KFdlYktpdDo6V2ViUAogQGVuZAogI2VuZGlmIC8vIEVOQUJMRShGVUxMU0NSRUVOX0FQ SSkgJiYgUExBVEZPUk0oSU9TKQogCi0jaWYgUExBVEZPUk0oSU9TKQorI2lmIFBMQVRGT1JNKElP UykgJiYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKIEBpbnRlcmZhY2UgV0tXZWJWaWV3IChf V0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIpCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkp IGlkIDxfV0tXZWJWaWV3UHJpbnRQcm92aWRlcj4gX3ByaW50UHJvdmlkZXI7CiBAZW5kCkluZGV4 OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQkocmV2aXNp b24gMjMwMjAzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcu bW0JKHdvcmtpbmcgY29weSkKQEAgLTY3Niw2ICs2NzYsNyBAQCAtICh2b2lkKV9hcHBsaWNhdGlv bkRpZEJlY29tZUFjdGl2ZTooTlNOCiAKICNwcmFnbWEgbWFyayBQcmludGluZwogCisjaWYgIUVO QUJMRShNSU5JTUFMX1NJTVVMQVRPUikKIEBpbnRlcmZhY2UgV0tDb250ZW50VmlldyAoX1dLV2Vi Vmlld1ByaW50Rm9ybWF0dGVyKSA8X1dLV2ViVmlld1ByaW50UHJvdmlkZXI+CiBAZW5kCiAKQEAg LTc0Miw0ICs3NDMsNiBAQCAtIChDR1BERkRvY3VtZW50UmVmKV93a19wcmludGVkRG9jdW1lbnQK IAogQGVuZAogCisjZW5kaWYgLy8gIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKKwogI2VuZGlm IC8vIFBMQVRGT1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BE RlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERG Vmlldy5tbQkocmV2aXNpb24gMjMwMjAzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLUERGVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtODY1LDYgKzg2NSw4IEBAIC0gKHZvaWQp X2FwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZAogCiAjcHJhZ21hIG1hcmsgUHJpbnRpbmcK IAorI2lmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisKIEBpbnRlcmZhY2UgV0tQREZWaWV3 IChfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIpIDxfV0tXZWJWaWV3UHJpbnRQcm92aWRlcj4KIEBl bmQKIApAQCAtODkwLDYgKzg5Miw4IEBAIC0gKENHUERGRG9jdW1lbnRSZWYpX3drX3ByaW50ZWRE b2N1bWVudAogCiBAZW5kCiAKKyNlbmRpZiAvLyAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQor CiAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9wCiAKICNlbmRpZiAvLyBQTEFURk9STShJT1Mp ICYmIEVOQUJMRShXS1BERlZJRVcpCg== 337189 2018-04-04 10:46:48 -0700 2018-04-04 11:07:30 -0700 Patch, rebased for-review-3.txt text/plain 5199 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzAyNjApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA0LTAzICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdGhlIHByaW50IGZvcm1hdHRlciBi dWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0 Mjg5CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0v MzkxNjQ2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZp ZXcgX3dlYlZpZXdQcmludEZvcm1hdHRlcl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1By aW50Rm9ybWF0dGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1h dHRlci5tbToKKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50 ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisKIDIwMTgtMDQtMDQgIFlvdXN1a2Ug S2ltb3RvICA8eW91c3VrZS5raW1vdG9Ac29ueS5jb20+IGFuZCBGdWppaSBIaXJvbm9yaSAgPEhp cm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gQWRkIFdlYktpdCBT aGFyZWQvd2luIGZpbGVzIGZvciB3aW5jYWlybyB3ZWJraXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1hdHRlci5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIubW0JKHJldmlzaW9u IDIzMDI2MCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1h dHRlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNyBAQAogI2ltcG9ydCAiY29uZmln LmgiCiAjaW1wb3J0ICJfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5oIgogCi0jaWYg UExBVEZPUk0oSU9TKQorI2lmIFBMQVRGT1JNKElPUykgJiYgIUVOQUJMRShNSU5JTUFMX1NJTVVM QVRPUikKIAogI2ltcG9ydCAiV0tXZWJWaWV3SW50ZXJuYWwuaCIKICNpbXBvcnQgIl9XS0ZyYW1l SGFuZGxlLmgiCkBAIC0xMTYsNCArMTE2LDQgQEAgLSAodm9pZClkcmF3SW5SZWN0OihDR1JlY3Qp cmVjdCBmb3JQYWdlQQogCiBAZW5kCiAKLSNlbmRpZiAvLyBQTEFURk9STShJT1MpCisjZW5kaWYg Ly8gUExBVEZPUk0oSU9TKSAmJiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQpJbmRleDogU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3Jt YXR0ZXJJbnRlcm5hbC5oCShyZXZpc2lvbiAyMzAyNjApCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBA IC0yNSw3ICsyNSw3IEBACiAKICNpbXBvcnQgIl9XS1dlYlZpZXdQcmludEZvcm1hdHRlci5oIgog Ci0jaWYgUExBVEZPUk0oSU9TKQorI2lmIFBMQVRGT1JNKElPUykgJiYgIUVOQUJMRShNSU5JTUFM X1NJTVVMQVRPUikKIAogQGludGVyZmFjZSBVSVByaW50Rm9ybWF0dGVyICgpCiAtIChDR1JlY3Qp X3BhZ2VDb250ZW50UmVjdDooQk9PTClmaXJzdFBhZ2U7CkBAIC00MSw0ICs0MSw0IEBACiBAcHJv cGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENHUERGRG9jdW1lbnRSZWYgX3drX3ByaW50ZWRE b2N1bWVudDsKIEBlbmQKIAotI2VuZGlmIC8vIFBMQVRGT1JNKElPUykKKyNlbmRpZiAvLyBQTEFU Rk9STShJT1MpICYmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCkluZGV4OiBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9uIDIzMDI2 MCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdv cmtpbmcgY29weSkKQEAgLTU0NzMsOSArNTQ3MywxMyBAQCAtIChOU1N0cmluZyAqKV9zdWdnZXN0 ZWRGaWxlbmFtZUZvckRpc3BsCiAKIC0gKF9XS1dlYlZpZXdQcmludEZvcm1hdHRlciAqKV93ZWJW aWV3UHJpbnRGb3JtYXR0ZXIKIHsKKyNpZiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogICAg IFVJVmlld1ByaW50Rm9ybWF0dGVyICp2aWV3UHJpbnRGb3JtYXR0ZXIgPSBzZWxmLnZpZXdQcmlu dEZvcm1hdHRlcjsKICAgICBBU1NFUlQoW3ZpZXdQcmludEZvcm1hdHRlciBpc0tpbmRPZkNsYXNz OltfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIgY2xhc3NdXSk7CiAgICAgcmV0dXJuIChfV0tXZWJW aWV3UHJpbnRGb3JtYXR0ZXIgKil2aWV3UHJpbnRGb3JtYXR0ZXI7CisjZWxzZQorICAgIHJldHVy biBuaWw7CisjZW5kaWYgLy8gRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogfQogCiBzdGF0aWMg V2ViQ29yZTo6VXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbiB0b1VzZXJJbnRlcmZhY2VMYXlv dXREaXJlY3Rpb24oVUlTZW1hbnRpY0NvbnRlbnRBdHRyaWJ1dGUgY29udGVudEF0dHJpYnV0ZSkK QEAgLTY0MjQsNyArNjQyOCw3IEBAIC0gKElCQWN0aW9uKXN0b3BMb2FkaW5nOihpZClzZW5kZXIK IAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAotI2lmIFBMQVRGT1JNKElPUykKKyNpZiBQTEFU Rk9STShJT1MpICYmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCiBAaW1wbGVtZW50YXRpb24g V0tXZWJWaWV3IChfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIpCiAKIC0gKENsYXNzKV9wcmludEZv cm1hdHRlckNsYXNzCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAkocmV2aXNpb24gMjMwMjYwKQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE3MCw3ICsxNzAsNyBAQCBXS1dlYlZpZXcqIGZyb21XZWJQYWdlUHJveHkoV2Vi S2l0OjpXZWJQCiBAZW5kCiAjZW5kaWYgLy8gRU5BQkxFKEZVTExTQ1JFRU5fQVBJKSAmJiBQTEFU Rk9STShJT1MpCiAKLSNpZiBQTEFURk9STShJT1MpCisjaWYgUExBVEZPUk0oSU9TKSAmJiAhRU5B QkxFKE1JTklNQUxfU0lNVUxBVE9SKQogQGludGVyZmFjZSBXS1dlYlZpZXcgKF9XS1dlYlZpZXdQ cmludEZvcm1hdHRlcikKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgaWQgPF9XS1dl YlZpZXdQcmludFByb3ZpZGVyPiBfcHJpbnRQcm92aWRlcjsKIEBlbmQKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCShyZXZpc2lvbiAyMzAyNjAp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNjc2LDYgKzY3Niw3IEBAIC0gKHZvaWQpX2FwcGxpY2F0aW9uRGlkQmVjb21l QWN0aXZlOihOU04KIAogI3ByYWdtYSBtYXJrIFByaW50aW5nCiAKKyNpZiAhRU5BQkxFKE1JTklN QUxfU0lNVUxBVE9SKQogQGludGVyZmFjZSBXS0NvbnRlbnRWaWV3IChfV0tXZWJWaWV3UHJpbnRG b3JtYXR0ZXIpIDxfV0tXZWJWaWV3UHJpbnRQcm92aWRlcj4KIEBlbmQKIApAQCAtNzQyLDQgKzc0 Myw2IEBAIC0gKENHUERGRG9jdW1lbnRSZWYpX3drX3ByaW50ZWREb2N1bWVudAogCiBAZW5kCiAK KyNlbmRpZiAvLyAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQorCiAjZW5kaWYgLy8gUExBVEZP Uk0oSU9TKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCShy ZXZpc2lvbiAyMzAyNjApCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3 Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04NjYsNiArODY2LDggQEAgLSAodm9pZClfYXBwbGljYXRp b25XaWxsRW50ZXJGb3JlZ3JvdW5kCiAKICNwcmFnbWEgbWFyayBQcmludGluZwogCisjaWYgIUVO QUJMRShNSU5JTUFMX1NJTVVMQVRPUikKKwogQGludGVyZmFjZSBXS1BERlZpZXcgKF9XS1dlYlZp ZXdQcmludEZvcm1hdHRlcikgPF9XS1dlYlZpZXdQcmludFByb3ZpZGVyPgogQGVuZAogCkBAIC04 OTEsNiArODkzLDggQEAgLSAoQ0dQREZEb2N1bWVudFJlZilfd2tfcHJpbnRlZERvY3VtZW50CiAK IEBlbmQKIAorI2VuZGlmIC8vICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisKICNwcmFnbWEg Y2xhbmcgZGlhZ25vc3RpYyBwb3AKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykgJiYgRU5BQkxF KFdLUERGVklFVykK 337194 2018-04-04 11:07:30 -0700 2018-04-04 11:26:22 -0700 Patch, rebased for-review-4.txt text/plain 5151 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzAyNjUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA0LTAzICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdGhlIHByaW50IGZvcm1hdHRlciBi dWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0 Mjg5CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0v MzkxNjQ2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZp ZXcgX3dlYlZpZXdQcmludEZvcm1hdHRlcl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1By aW50Rm9ybWF0dGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1h dHRlci5tbToKKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50 ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisKIDIwMTgtMDQtMDQgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFJlbmFtZSBXS1BERlZpZXcg dG8gV0tMZWdhY3lQREZWaWV3CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJW aWV3UHJpbnRGb3JtYXR0ZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl c3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyLm1tCShyZXZpc2lvbiAyMzAyNjUpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIubW0JKHdvcmtpbmcg Y29weSkKQEAgLTI2LDcgKzI2LDcgQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiX1dL V2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaCIKIAotI2lmIFBMQVRGT1JNKElPUykKKyNp ZiBQTEFURk9STShJT1MpICYmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCiAKICNpbXBvcnQg IldLV2ViVmlld0ludGVybmFsLmgiCiAjaW1wb3J0ICJfV0tGcmFtZUhhbmRsZS5oIgpAQCAtMTE2 LDQgKzExNiw0IEBAIC0gKHZvaWQpZHJhd0luUmVjdDooQ0dSZWN0KXJlY3QgZm9yUGFnZUEKIAog QGVuZAogCi0jZW5kaWYgLy8gUExBVEZPUk0oSU9TKQorI2VuZGlmIC8vIFBMQVRGT1JNKElPUykg JiYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL19XS1dlYlZpZXdQcmludEZvcm1hdHRlckludGVybmFsLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaAko cmV2aXNpb24gMjMwMjY1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvX1dLV2ViVmlld1By aW50Rm9ybWF0dGVySW50ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAtMjUsNyArMjUsNyBAQAog CiAjaW1wb3J0ICJfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIuaCIKIAotI2lmIFBMQVRGT1JNKElP UykKKyNpZiBQTEFURk9STShJT1MpICYmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCiAKIEBp bnRlcmZhY2UgVUlQcmludEZvcm1hdHRlciAoKQogLSAoQ0dSZWN0KV9wYWdlQ29udGVudFJlY3Q6 KEJPT0wpZmlyc3RQYWdlOwpAQCAtNDEsNCArNDEsNCBAQAogQHByb3BlcnR5IChub25hdG9taWMs IHJlYWRvbmx5KSBDR1BERkRvY3VtZW50UmVmIF93a19wcmludGVkRG9jdW1lbnQ7CiBAZW5kCiAK LSNlbmRpZiAvLyBQTEFURk9STShJT1MpCisjZW5kaWYgLy8gUExBVEZPUk0oSU9TKSAmJiAhRU5B QkxFKE1JTklNQUxfU0lNVUxBVE9SKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCShyZXZpc2lvbiAyMzAyNjUpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01 NDczLDkgKzU0NzMsMTMgQEAgLSAoTlNTdHJpbmcgKilfc3VnZ2VzdGVkRmlsZW5hbWVGb3JEaXNw bAogCiAtIChfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIgKilfd2ViVmlld1ByaW50Rm9ybWF0dGVy CiB7CisjaWYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKICAgICBVSVZpZXdQcmludEZvcm1h dHRlciAqdmlld1ByaW50Rm9ybWF0dGVyID0gc2VsZi52aWV3UHJpbnRGb3JtYXR0ZXI7CiAgICAg QVNTRVJUKFt2aWV3UHJpbnRGb3JtYXR0ZXIgaXNLaW5kT2ZDbGFzczpbX1dLV2ViVmlld1ByaW50 Rm9ybWF0dGVyIGNsYXNzXV0pOwogICAgIHJldHVybiAoX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVy ICopdmlld1ByaW50Rm9ybWF0dGVyOworI2Vsc2UKKyAgICByZXR1cm4gbmlsOworI2VuZGlmIC8v IEVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKIH0KIAogc3RhdGljIFdlYkNvcmU6OlVzZXJJbnRl cmZhY2VMYXlvdXREaXJlY3Rpb24gdG9Vc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uKFVJU2Vt YW50aWNDb250ZW50QXR0cmlidXRlIGNvbnRlbnRBdHRyaWJ1dGUpCkBAIC02NDI0LDcgKzY0Mjgs NyBAQCAtIChJQkFjdGlvbilzdG9wTG9hZGluZzooaWQpc2VuZGVyCiAKICNlbmRpZiAvLyBQTEFU Rk9STShNQUMpCiAKLSNpZiBQTEFURk9STShJT1MpCisjaWYgUExBVEZPUk0oSU9TKSAmJiAhRU5B QkxFKE1JTklNQUxfU0lNVUxBVE9SKQogQGltcGxlbWVudGF0aW9uIFdLV2ViVmlldyAoX1dLV2Vi Vmlld1ByaW50Rm9ybWF0dGVyKQogCiAtIChDbGFzcylfcHJpbnRGb3JtYXR0ZXJDbGFzcwpJbmRl eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll d0ludGVybmFsLmgJKHJldmlzaW9uIDIzMDI2NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzAsNyAr MTcwLDcgQEAgV0tXZWJWaWV3KiBmcm9tV2ViUGFnZVByb3h5KFdlYktpdDo6V2ViUAogQGVuZAog I2VuZGlmIC8vIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkgJiYgUExBVEZPUk0oSU9TKQogCi0jaWYg UExBVEZPUk0oSU9TKQorI2lmIFBMQVRGT1JNKElPUykgJiYgIUVOQUJMRShNSU5JTUFMX1NJTVVM QVRPUikKIEBpbnRlcmZhY2UgV0tXZWJWaWV3IChfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIpCiBA cHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIGlkIDxfV0tXZWJWaWV3UHJpbnRQcm92aWRl cj4gX3ByaW50UHJvdmlkZXI7CiBAZW5kCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlldy5tbQkocmV2aXNpb24gMjMwMjY1KQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTY3Niw2 ICs2NzYsOCBAQCAtICh2b2lkKV9hcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZTooTlNOCiAKICNw cmFnbWEgbWFyayBQcmludGluZwogCisjaWYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKKwog QGludGVyZmFjZSBXS0NvbnRlbnRWaWV3IChfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIpIDxfV0tX ZWJWaWV3UHJpbnRQcm92aWRlcj4KIEBlbmQKIApAQCAtNzQyLDQgKzc0NCw2IEBAIC0gKENHUERG RG9jdW1lbnRSZWYpX3drX3ByaW50ZWREb2N1bWVudAogCiBAZW5kCiAKKyNlbmRpZiAvLyAhRU5B QkxFKE1JTklNQUxfU0lNVUxBVE9SKQorCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TKQpJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLTGVnYWN5UERGVmlldy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tMZWdhY3lQREZWaWV3Lm1tCShyZXZp c2lvbiAyMzAyNjUpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tMZWdhY3lQREZW aWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04NjYsNiArODY2LDggQEAgLSAodm9pZClfYXBwbGlj YXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kCiAKICNwcmFnbWEgbWFyayBQcmludGluZwogCisjaWYg IUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKKwogQGludGVyZmFjZSBXS0xlZ2FjeVBERlZpZXcg KF9XS1dlYlZpZXdQcmludEZvcm1hdHRlcikgPF9XS1dlYlZpZXdQcmludFByb3ZpZGVyPgogQGVu ZAogCkBAIC04OTEsNiArODkzLDggQEAgLSAoQ0dQREZEb2N1bWVudFJlZilfd2tfcHJpbnRlZERv Y3VtZW50CiAKIEBlbmQKIAorI2VuZGlmIC8vICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisK ICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykg JiYgRU5BQkxFKFdLUERGVklFVykK