137967 2014-10-22 10:59:22 -0700 Use constants from wtf/MathExtras.h 2014-10-28 11:00:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137488 1 mcrha webkit-unassigned ap benjamin cmarcelo commit-queue dbarton esprehn+autocc fred.wang glenn kondapallykalyan mmaxfield mrobinson oldest_to_newest 1043491 0 mcrha 2014-10-22 10:59:22 -0700 I'm building webkit under mingw/msys and the standard defines like M_PI_2 and others are not provided there directly, but it seems WebKit thinks of it and provides its own definitions of the constants in wtf/MathExtras.h if necessary, thus use these "proxies" instead. 1043493 1 240278 mcrha 2014-10-22 11:00:28 -0700 Created attachment 240278 proposed wk patch 1043494 2 commit-queue 2014-10-22 11:03:28 -0700 Attachment 240278 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:35: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1043495 3 240278 mrobinson 2014-10-22 11:04:31 -0700 Comment on attachment 240278 proposed wk patch Looks good, but please fix the style issue. Thanks! 1043496 4 240279 mcrha 2014-10-22 11:06:18 -0700 Created attachment 240279 proposed patch ][ Oops, I missed one chunk in the previous patch. 1043497 5 commit-queue 2014-10-22 11:08:44 -0700 Attachment 240279 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:35: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1043500 6 mrobinson 2014-10-22 11:14:00 -0700 If you use the webkit-patch tool to upload the patch it should point out style errors before the patch hits the bug tracker. You can also use check-webkit-style. 1043652 7 ap 2014-10-22 19:59:33 -0700 It seems like it could be a significant cost to the project if we are going to support a toolchain that violates such basic conventions. It's probably best to announce your intention at webkit-dev mailing list first to see if there is support for this. The purpose of the existing definitions is to avoid 64-32 bit conversion errors that some compilers complain about. 1043691 8 240279 cgarcia 2014-10-22 23:12:47 -0700 Comment on attachment 240279 proposed patch ][ View in context: https://bugs.webkit.org/attachment.cgi?id=240279&action=review > Source/WTF/ChangeLog:3 > + Add sqrtOfTwoDouble for M_SQRT2. Please, use the same bug title in all changelogs. See Tools/Scripts/prepare-ChangeLog, it's recommended to use that tools to generate the changelog entries, it's not only easier for you, but also ensures consistency. 1043703 9 mmaxfield 2014-10-22 23:56:05 -0700 I agree with Alexey; I don't see much value to redefining constants with different names that, in general, are defined in a standard way. If it were up to me I would get rid of all of these duplicate macros in favor of the standard ones. 1043757 10 240348 mcrha 2014-10-23 08:41:49 -0700 Created attachment 240348 proposed patch ]I[ Updated patch with the style fix. (In reply to comment #8) > Please, use the same bug title in all changelogs. See > Tools/Scripts/prepare-ChangeLog, it's recommended to use that tools to > generate the changelog entries, it's not only easier for you, but also > ensures consistency. I did use the tool, but not with all its features. I regenerated the ChangeLogs with it with used --bug now. I agree it's much simpler than hand-editing all touched ChangeLogs. (In reply to comment #6) > If you use the webkit-patch tool to upload the patch it should point out > style errors before the patch hits the bug tracker. You can also use > check-webkit-style. I do not use the webkit-patch, I use only the prepare-ChangeLogs. Looking into its --help it states it also checks the style > --[no-]style Run check-webkit-style script when done (default: style) but I did not get any style error when the prepare-ChangeLog finished. (In reply to comment #9) > I agree with Alexey; I don't see much value to redefining constants with > different names that, in general, are defined in a standard way. If it were > up to me I would get rid of all of these duplicate macros in favor of the > standard ones. I do not know why mingw/msys doesn't see those constants from math.h or cmath, but it might be similar like bug #137966, some compilers were fine with isnan (probably 'using namespace std;' being "inherited" from another source file) while others require std::isnan(), like the mingw/msys for me. Please do not drop those constants. 1044046 11 240348 darin 2014-10-24 13:21:44 -0700 Comment on attachment 240348 proposed patch ]I[ View in context: https://bugs.webkit.org/attachment.cgi?id=240348&action=review > Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp:76 > + m_minPreferredLogicalWidth = minPreferredLogicalWidth() * float(sqrtOfTwoDouble); > + m_maxPreferredLogicalWidth = maxPreferredLogicalWidth() * float(sqrtOfTwoDouble); This should be sqrtOfTwoFloat, not float(sqrtOfTwoDouble). 1044490 12 240544 mcrha 2014-10-28 09:12:08 -0700 Created attachment 240544 proposed patch IV 1044491 13 240545 mcrha 2014-10-28 09:13:00 -0700 Created attachment 240545 proposed patch V Oops, there was a typo in the previous patch. 1044501 14 240545 darin 2014-10-28 09:26:19 -0700 Comment on attachment 240545 proposed patch V It’s OK to do this; it does follow the style already used in MathExtras.h. Longer term, it would be better to change our approach so that MathExtras.h fills in holes in the implementations of platforms that lack constants like M_SQRT2; I think that it’s better for us to use the standard or de-factor standard names and have MathExtras.h make that work cross-platform rather than adding new new names of our own. I’m wondering how this is best done in C++. Maybe std::sqrt(2.0) and std::sqrt(2.0f) are intended to be used as constexpr in C++? 1044549 15 240545 commit-queue 2014-10-28 11:00:11 -0700 Comment on attachment 240545 proposed patch V Clearing flags on attachment: 240545 Committed r175261: <http://trac.webkit.org/changeset/175261> 1044550 16 commit-queue 2014-10-28 11:00:16 -0700 All reviewed patches have been landed. Closing bug. 240278 2014-10-22 11:00:28 -0700 2014-10-22 11:06:18 -0700 proposed wk patch wk.patch text/plain 4427 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNmM0MjExLi5mZjhlNGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTQtMTAtMjIgIE1pbGFuIENyaGEgIDxtY3JoYUByZWRoYXQuY29tPgorCisgICAgICAg IFVzZSBjb25zdGFudHMgZnJvbSB3dGYvTWF0aEV4dHJhcy5oLgorICAgICAgICA8aHR0cHM6Ly93 ZWJraXQub3JnL2IvMTM3OTY3Pi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURh dGFGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyb3RhdGVDYWlyb01hdHJpeEZvclZl cnRpY2FsT3JpZW50YXRpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0 aE1MTWVuY2xvc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MTWVuY2xvc2U6 OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck1hdGhNTE1lbmNsb3NlOjp1cGRhdGVMb2dpY2FsSGVpZ2h0KToKKyAgICAgICAgKiByZW5kZXJp bmcvbWF0aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlck1hdGhNTE9wZXJhdG9yOjpnZXREaXNwbGF5U3R5bGVMYXJnZU9wZXJhdG9yKToKKwogMjAx NC0xMC0yMiAgU2hpdmFrdW1hciBKTSAgPHNoaXZhLmptQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFhNTEh0dHBSZXF1ZXN0IHNob3VsZCBzdXBwb3J0IGF0dHJpYnV0ZSByZXNwb25zZVVSTCBhcyBw ZXIgbGF0ZXN0IFhIUiBzcGVjLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlw ZS5jcHAKaW5kZXggMWQ0ZjI0ZC4uMWY1NzhlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZv cm1EYXRhRnJlZVR5cGUuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSA8ZnQyYnVpbGQu aD4KICNpbmNsdWRlIEZUX1RSVUVUWVBFX1RBQkxFU19ICiAjaW5jbHVkZSA8d3RmL3RleHQvV1RG U3RyaW5nLmg+CisjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KIAogI2lmICFQTEFURk9STShF RkwpCiAjaW5jbHVkZSA8Z2RrL2dkay5oPgpAQCAtMTIwLDcgKzEyMSw3IEBAIHN0YXRpYyB2b2lk IHJvdGF0ZUNhaXJvTWF0cml4Rm9yVmVydGljYWxPcmllbnRhdGlvbihjYWlyb19tYXRyaXhfdCog bWF0cml4KQogICAgIC8vIGNvbWJpbmF0aW9uIG9mIHJvdGF0aW9uIChSKSBhbmQgdHJhbnNsYXRp b24gKFQpIGFwcGxpZWQgb24gdGhlCiAgICAgLy8gaG9yaXpvbnRhbCBtYXRyaXggKEgpLiBWID0g SCAuIFIgLiBULCB3aGVyZSBSIHJvdGF0ZXMgYnkgLTkwIGRlZ3JlZXMKICAgICAvLyBhbmQgVCB0 cmFuc2xhdGVzIGJ5IGZvbnQgc2l6ZSB0b3dhcmRzIHkgYXhpcy4KLSAgICBjYWlyb19tYXRyaXhf cm90YXRlKG1hdHJpeCwgLU1fUElfMik7CisgICAgY2Fpcm9fbWF0cml4X3JvdGF0ZShtYXRyaXgs IC1waU92ZXJUd29Eb3VibGUpOwogICAgIGNhaXJvX21hdHJpeF90cmFuc2xhdGUobWF0cml4LCAw LjAsIDEuMCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRo bWwvUmVuZGVyTWF0aE1MTWVuY2xvc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21h dGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHAKaW5kZXggZjVjYWFlNy4uZTM1MWY0MyAxMDA3 NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxNZW5j bG9zZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRo TUxNZW5jbG9zZS5jcHAKQEAgLTcyLDggKzcyLDggQEAgdm9pZCBSZW5kZXJNYXRoTUxNZW5jbG9z ZTo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIHNpemVfdCBub3RhdGlvbmFs VmFsdWVTaXplID0gbm90YXRpb25WYWx1ZXMuc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgbm90YXRpb25hbFZhbHVlU2l6ZTsgaSsrKSB7CiAgICAgICAgIGlmIChub3RhdGlvblZh bHVlc1tpXSA9PSAiY2lyY2xlIikgewotICAgICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2Fs V2lkdGggPSBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAqIGZsb2F0KE1fU1FSVDIpOwotICAg ICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtYXhQcmVmZXJyZWRMb2dpY2Fs V2lkdGgoKSAqIGZsb2F0KE1fU1FSVDIpOworICAgICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dp Y2FsV2lkdGggPSBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAqIGZsb2F0KHNxcnRPZlR3b0Rv dWJsZSk7CisgICAgICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZl cnJlZExvZ2ljYWxXaWR0aCgpICogZmxvYXQoc3FydE9mVHdvRG91YmxlKTsKICAgICAgICAgfQog ICAgIH0KIApAQCAtOTEsNyArOTEsNyBAQCB2b2lkIFJlbmRlck1hdGhNTE1lbmNsb3NlOjp1cGRh dGVMb2dpY2FsSGVpZ2h0KCkKICAgICBzaXplX3Qgbm90YXRpb25hbFZhbHVlU2l6ZSA9IG5vdGF0 aW9uVmFsdWVzLnNpemUoKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG5vdGF0aW9uYWxW YWx1ZVNpemU7IGkrKykKICAgICAgICAgaWYgKG5vdGF0aW9uVmFsdWVzW2ldID09ICJjaXJjbGUi KQotICAgICAgICAgICAgc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KCkgKiBmbG9hdChN X1NRUlQyKSk7CisgICAgICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSAq IGZsb2F0KHNxcnRPZlR3b0RvdWJsZSkpOwogfQogCiB2b2lkIFJlbmRlck1hdGhNTE1lbmNsb3Nl OjpwYWludChQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1M T3BlcmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRo TUxPcGVyYXRvci5jcHAKaW5kZXggOWRhMjMwOC4uMzE5YmUwZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAK QEAgLTE1NDgsNyArMTU0OCw3IEBAIFJlbmRlck1hdGhNTE9wZXJhdG9yOjpTdHJldGNoeURhdGEg UmVuZGVyTWF0aE1MT3BlcmF0b3I6OmdldERpc3BsYXlTdHlsZUxhcmdlT3BlCiAgICAgVmVjdG9y PE9wZW5UeXBlTWF0aERhdGE6OkFzc2VtYmx5UGFydD4gYXNzZW1ibHlQYXJ0czsKIAogICAgIC8v IFRoZSB2YWx1ZSBvZiBkaXNwbGF5T3BlcmF0b3JNaW5IZWlnaHQgaXMgc29tZXRpbWVzIHRvbyBz bWFsbCwgc28gd2UgZW5zdXJlIHRoYXQgaXQgaXMgYXQgbGVhc3QgXHNxcnR7Mn0gdGltZXMgdGhl IHNpemUgb2YgdGhlIGJhc2UgZ2x5cGguCi0gICAgZmxvYXQgZGlzcGxheU9wZXJhdG9yTWluSGVp Z2h0ID0gc3RkOjptYXgoYmFzZUdseXBoLmZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChiYXNlR2x5 cGguZ2x5cGgpLmhlaWdodCgpICogZmxvYXQoTV9TUVJUMiksIHByaW1hcnlGb250RGF0YS0+bWF0 aERhdGEoKS0+Z2V0TWF0aENvbnN0YW50KHByaW1hcnlGb250RGF0YSwgT3BlblR5cGVNYXRoRGF0 YTo6RGlzcGxheU9wZXJhdG9yTWluSGVpZ2h0KSk7CisgICAgZmxvYXQgZGlzcGxheU9wZXJhdG9y TWluSGVpZ2h0ID0gc3RkOjptYXgoYmFzZUdseXBoLmZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChi YXNlR2x5cGguZ2x5cGgpLmhlaWdodCgpICogZmxvYXQoc3FydE9mVHdvRG91YmxlKSwgcHJpbWFy eUZvbnREYXRhLT5tYXRoRGF0YSgpLT5nZXRNYXRoQ29uc3RhbnQocHJpbWFyeUZvbnREYXRhLCBP cGVuVHlwZU1hdGhEYXRhOjpEaXNwbGF5T3BlcmF0b3JNaW5IZWlnaHQpKTsKIAogICAgIHByaW1h cnlGb250RGF0YS0+bWF0aERhdGEoKS0+Z2V0TWF0aFZhcmlhbnRzKGJhc2VHbHlwaC5nbHlwaCwg dHJ1ZSwgc2l6ZVZhcmlhbnRzLCBhc3NlbWJseVBhcnRzKTsKIAo= 240279 2014-10-22 11:06:18 -0700 2014-10-23 08:41:49 -0700 proposed patch ][ wk.patch text/plain 5414 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggOWE5MjkzYy4uNGU4NjEwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0xMC0yMiAg TWlsYW4gQ3JoYSAgPG1jcmhhQHJlZGhhdC5jb20+CisKKyAgICAgICAgQWRkIHNxcnRPZlR3b0Rv dWJsZSBmb3IgTV9TUVJUMi4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEzNzk2Nz4u CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYv TWF0aEV4dHJhcy5oOgorCiAyMDE0LTEwLTIxICBEw6FuaWVsIELDoXR5YWkgIDxkYmF0eWFpLnUt c3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAgRml4IEZUTCBOYXRpdmUgSW5s aW5pbmcgZm9yIEVGTApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWF0aEV4dHJhcy5oIGIv U291cmNlL1dURi93dGYvTWF0aEV4dHJhcy5oCmluZGV4IDk3NjI5MjguLmVjMDllYTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01hdGhFeHRyYXMuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9N YXRoRXh0cmFzLmgKQEAgLTY3LDYgKzY3LDEyIEBAIGNvbnN0IGRvdWJsZSBwaU92ZXJGb3VyRG91 YmxlID0gTV9QSV80OwogY29uc3QgZmxvYXQgcGlPdmVyRm91ckZsb2F0ID0gc3RhdGljX2Nhc3Q8 ZmxvYXQ+KE1fUElfNCk7CiAjZW5kaWYKIAorI2lmbmRlZiBNX1NRUlQyCitjb25zdCBkb3VibGUg c3FydE9mVHdvRG91YmxlID0gMS40MTQyMTM1NjIzNzMwOTUwNDg4MDsKKyNlbHNlCitjb25zdCBk b3VibGUgc3FydE9mVHdvRG91YmxlID0gTV9TUVJUMjsKKyNlbmRpZgorCiAjaWYgT1MoREFSV0lO KQogCiAvLyBXb3JrIGFyb3VuZCBhIGJ1ZyBpbiB0aGUgTWFjIE9TIFggbGliYyB3aGVyZSBjZWls KC0wLjEpIHJldHVybiArMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjNmM0MjExLi5jMTQ0NGUyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTQtMTAtMjIgIE1pbGFuIENyaGEgIDxtY3JoYUByZWRo YXQuY29tPgorCisgICAgICAgIFVzZSBjb25zdGFudHMgZnJvbSB3dGYvTWF0aEV4dHJhcy5oLgor ICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTM3OTY3Pi4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0 eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyb3Rh dGVDYWlyb01hdHJpeEZvclZlcnRpY2FsT3JpZW50YXRpb24pOgorICAgICAgICAqIHJlbmRlcmlu Zy9tYXRobWwvUmVuZGVyTWF0aE1MTWVuY2xvc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTWF0aE1MTWVuY2xvc2U6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlck1hdGhNTE1lbmNsb3NlOjp1cGRhdGVMb2dpY2FsSGVpZ2h0KToK KyAgICAgICAgKiByZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhNTE9wZXJhdG9yOjpnZXREaXNwbGF5U3R5bGVMYXJn ZU9wZXJhdG9yKToKKwogMjAxNC0xMC0yMiAgU2hpdmFrdW1hciBKTSAgPHNoaXZhLmptQHNhbXN1 bmcuY29tPgogCiAgICAgICAgIFhNTEh0dHBSZXF1ZXN0IHNob3VsZCBzdXBwb3J0IGF0dHJpYnV0 ZSByZXNwb25zZVVSTCBhcyBwZXIgbGF0ZXN0IFhIUiBzcGVjLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVU eXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQ bGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKaW5kZXggMWQ0ZjI0ZC4uMWY1NzhlMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3Jt RGF0YUZyZWVUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m cmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAj aW5jbHVkZSA8ZnQyYnVpbGQuaD4KICNpbmNsdWRlIEZUX1RSVUVUWVBFX1RBQkxFU19ICiAjaW5j bHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CisjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4K IAogI2lmICFQTEFURk9STShFRkwpCiAjaW5jbHVkZSA8Z2RrL2dkay5oPgpAQCAtMTIwLDcgKzEy MSw3IEBAIHN0YXRpYyB2b2lkIHJvdGF0ZUNhaXJvTWF0cml4Rm9yVmVydGljYWxPcmllbnRhdGlv bihjYWlyb19tYXRyaXhfdCogbWF0cml4KQogICAgIC8vIGNvbWJpbmF0aW9uIG9mIHJvdGF0aW9u IChSKSBhbmQgdHJhbnNsYXRpb24gKFQpIGFwcGxpZWQgb24gdGhlCiAgICAgLy8gaG9yaXpvbnRh bCBtYXRyaXggKEgpLiBWID0gSCAuIFIgLiBULCB3aGVyZSBSIHJvdGF0ZXMgYnkgLTkwIGRlZ3Jl ZXMKICAgICAvLyBhbmQgVCB0cmFuc2xhdGVzIGJ5IGZvbnQgc2l6ZSB0b3dhcmRzIHkgYXhpcy4K LSAgICBjYWlyb19tYXRyaXhfcm90YXRlKG1hdHJpeCwgLU1fUElfMik7CisgICAgY2Fpcm9fbWF0 cml4X3JvdGF0ZShtYXRyaXgsIC1waU92ZXJUd29Eb3VibGUpOwogICAgIGNhaXJvX21hdHJpeF90 cmFuc2xhdGUobWF0cml4LCAwLjAsIDEuMCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MTWVuY2xvc2UuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHAKaW5kZXggZjVj YWFlNy4uZTM1MWY0MyAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGht bC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L21hdGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHAKQEAgLTcyLDggKzcyLDggQEAgdm9pZCBS ZW5kZXJNYXRoTUxNZW5jbG9zZTo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAg IHNpemVfdCBub3RhdGlvbmFsVmFsdWVTaXplID0gbm90YXRpb25WYWx1ZXMuc2l6ZSgpOwogICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbm90YXRpb25hbFZhbHVlU2l6ZTsgaSsrKSB7CiAgICAg ICAgIGlmIChub3RhdGlvblZhbHVlc1tpXSA9PSAiY2lyY2xlIikgewotICAgICAgICAgICAgbV9t aW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAqIGZs b2F0KE1fU1FSVDIpOwotICAgICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBt YXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAqIGZsb2F0KE1fU1FSVDIpOworICAgICAgICAgICAg bV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAq IGZsb2F0KHNxcnRPZlR3b0RvdWJsZSk7CisgICAgICAgICAgICBtX21heFByZWZlcnJlZExvZ2lj YWxXaWR0aCA9IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICogZmxvYXQoc3FydE9mVHdvRG91 YmxlKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtOTEsNyArOTEsNyBAQCB2b2lkIFJlbmRlck1h dGhNTE1lbmNsb3NlOjp1cGRhdGVMb2dpY2FsSGVpZ2h0KCkKICAgICBzaXplX3Qgbm90YXRpb25h bFZhbHVlU2l6ZSA9IG5vdGF0aW9uVmFsdWVzLnNpemUoKTsKICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IG5vdGF0aW9uYWxWYWx1ZVNpemU7IGkrKykKICAgICAgICAgaWYgKG5vdGF0aW9uVmFs dWVzW2ldID09ICJjaXJjbGUiKQotICAgICAgICAgICAgc2V0TG9naWNhbEhlaWdodChsb2dpY2Fs SGVpZ2h0KCkgKiBmbG9hdChNX1NRUlQyKSk7CisgICAgICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0 KGxvZ2ljYWxIZWlnaHQoKSAqIGZsb2F0KHNxcnRPZlR3b0RvdWJsZSkpOwogfQogCiB2b2lkIFJl bmRlck1hdGhNTE1lbmNsb3NlOjpwYWludChQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFBv aW50JiBwYWludE9mZnNldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9t YXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L21hdGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAKaW5kZXggOWRhMjMwOC4uMzE5YmUwZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxP cGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJN YXRoTUxPcGVyYXRvci5jcHAKQEAgLTE1NDgsNyArMTU0OCw3IEBAIFJlbmRlck1hdGhNTE9wZXJh dG9yOjpTdHJldGNoeURhdGEgUmVuZGVyTWF0aE1MT3BlcmF0b3I6OmdldERpc3BsYXlTdHlsZUxh cmdlT3BlCiAgICAgVmVjdG9yPE9wZW5UeXBlTWF0aERhdGE6OkFzc2VtYmx5UGFydD4gYXNzZW1i bHlQYXJ0czsKIAogICAgIC8vIFRoZSB2YWx1ZSBvZiBkaXNwbGF5T3BlcmF0b3JNaW5IZWlnaHQg aXMgc29tZXRpbWVzIHRvbyBzbWFsbCwgc28gd2UgZW5zdXJlIHRoYXQgaXQgaXMgYXQgbGVhc3Qg XHNxcnR7Mn0gdGltZXMgdGhlIHNpemUgb2YgdGhlIGJhc2UgZ2x5cGguCi0gICAgZmxvYXQgZGlz cGxheU9wZXJhdG9yTWluSGVpZ2h0ID0gc3RkOjptYXgoYmFzZUdseXBoLmZvbnREYXRhLT5ib3Vu ZHNGb3JHbHlwaChiYXNlR2x5cGguZ2x5cGgpLmhlaWdodCgpICogZmxvYXQoTV9TUVJUMiksIHBy aW1hcnlGb250RGF0YS0+bWF0aERhdGEoKS0+Z2V0TWF0aENvbnN0YW50KHByaW1hcnlGb250RGF0 YSwgT3BlblR5cGVNYXRoRGF0YTo6RGlzcGxheU9wZXJhdG9yTWluSGVpZ2h0KSk7CisgICAgZmxv YXQgZGlzcGxheU9wZXJhdG9yTWluSGVpZ2h0ID0gc3RkOjptYXgoYmFzZUdseXBoLmZvbnREYXRh LT5ib3VuZHNGb3JHbHlwaChiYXNlR2x5cGguZ2x5cGgpLmhlaWdodCgpICogZmxvYXQoc3FydE9m VHdvRG91YmxlKSwgcHJpbWFyeUZvbnREYXRhLT5tYXRoRGF0YSgpLT5nZXRNYXRoQ29uc3RhbnQo cHJpbWFyeUZvbnREYXRhLCBPcGVuVHlwZU1hdGhEYXRhOjpEaXNwbGF5T3BlcmF0b3JNaW5IZWln aHQpKTsKIAogICAgIHByaW1hcnlGb250RGF0YS0+bWF0aERhdGEoKS0+Z2V0TWF0aFZhcmlhbnRz KGJhc2VHbHlwaC5nbHlwaCwgdHJ1ZSwgc2l6ZVZhcmlhbnRzLCBhc3NlbWJseVBhcnRzKTsKIAo= 240348 2014-10-23 08:41:49 -0700 2014-10-28 09:12:08 -0700 proposed patch ]I[ wk.patch text/plain 5426 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggODAwOWYxMC4uZjYzOWE2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0xMC0yMyAg TWlsYW4gQ3JoYSAgPG1jcmhhQHJlZGhhdC5jb20+CisKKyAgICAgICAgVXNlIGNvbnN0YW50cyBm cm9tIHd0Zi9NYXRoRXh0cmFzLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNzk2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogd3RmL01hdGhFeHRyYXMuaDoKKwogMjAxNC0xMC0yMyAgQWxiZXJ0byBH YXJjaWEgIDxiZXJ0b0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEZpeCBidWlsZCBvbiBI dXJkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NYXRoRXh0cmFzLmggYi9Tb3VyY2UvV1RG L3d0Zi9NYXRoRXh0cmFzLmgKaW5kZXggOTc2MjkyOC4uZWMwOWVhOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dURi93dGYvTWF0aEV4dHJhcy5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01hdGhFeHRyYXMu aApAQCAtNjcsNiArNjcsMTIgQEAgY29uc3QgZG91YmxlIHBpT3ZlckZvdXJEb3VibGUgPSBNX1BJ XzQ7CiBjb25zdCBmbG9hdCBwaU92ZXJGb3VyRmxvYXQgPSBzdGF0aWNfY2FzdDxmbG9hdD4oTV9Q SV80KTsKICNlbmRpZgogCisjaWZuZGVmIE1fU1FSVDIKK2NvbnN0IGRvdWJsZSBzcXJ0T2ZUd29E b3VibGUgPSAxLjQxNDIxMzU2MjM3MzA5NTA0ODgwOworI2Vsc2UKK2NvbnN0IGRvdWJsZSBzcXJ0 T2ZUd29Eb3VibGUgPSBNX1NRUlQyOworI2VuZGlmCisKICNpZiBPUyhEQVJXSU4pCiAKIC8vIFdv cmsgYXJvdW5kIGEgYnVnIGluIHRoZSBNYWMgT1MgWCBsaWJjIHdoZXJlIGNlaWwoLTAuMSkgcmV0 dXJuICswLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY3ZjA1YTMuLjUwN2NkODYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNC0xMC0yMyAgTWlsYW4gQ3JoYSAgPG1jcmhhQHJlZGhhdC5jb20+CisK KyAgICAgICAgVXNlIGNvbnN0YW50cyBmcm9tIHd0Zi9NYXRoRXh0cmFzLmgKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzk2NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv ZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnJvdGF0ZUNhaXJvTWF0cml4Rm9yVmVydGljYWxPcmllbnRhdGlvbik6CisgICAgICAgICogcmVu ZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJNYXRoTUxNZW5jbG9zZTo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MTWVuY2xvc2U6OnVwZGF0ZUxvZ2ljYWxIZWln aHQpOgorICAgICAgICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MT3BlcmF0b3I6OmdldERpc3BsYXlTdHls ZUxhcmdlT3BlcmF0b3IpOgorCiAyMDE0LTEwLTIzICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtA aWdhbGlhLmNvbT4KIAogICAgICAgICBDb25zdC1pZnkgc3RhdGljIHNfcmVzb3VyY2VUeXBlIG1l bWJlcnMgaW4gUmVuZGVyU1ZHUmVzb3VyY2UqIGNsYXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlw ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxh dGZvcm1EYXRhRnJlZVR5cGUuY3BwCmluZGV4IDFkNGYyNGQuLjZmNjliMDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURh dGFGcmVlVHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJl ZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2lu Y2x1ZGUgPGZvbnRjb25maWcvZmNmcmVldHlwZS5oPgogI2luY2x1ZGUgPGZ0MmJ1aWxkLmg+CiAj aW5jbHVkZSBGVF9UUlVFVFlQRV9UQUJMRVNfSAorI2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+ CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKICNpZiAhUExBVEZPUk0oRUZMKQpA QCAtMTIwLDcgKzEyMSw3IEBAIHN0YXRpYyB2b2lkIHJvdGF0ZUNhaXJvTWF0cml4Rm9yVmVydGlj YWxPcmllbnRhdGlvbihjYWlyb19tYXRyaXhfdCogbWF0cml4KQogICAgIC8vIGNvbWJpbmF0aW9u IG9mIHJvdGF0aW9uIChSKSBhbmQgdHJhbnNsYXRpb24gKFQpIGFwcGxpZWQgb24gdGhlCiAgICAg Ly8gaG9yaXpvbnRhbCBtYXRyaXggKEgpLiBWID0gSCAuIFIgLiBULCB3aGVyZSBSIHJvdGF0ZXMg YnkgLTkwIGRlZ3JlZXMKICAgICAvLyBhbmQgVCB0cmFuc2xhdGVzIGJ5IGZvbnQgc2l6ZSB0b3dh cmRzIHkgYXhpcy4KLSAgICBjYWlyb19tYXRyaXhfcm90YXRlKG1hdHJpeCwgLU1fUElfMik7Cisg ICAgY2Fpcm9fbWF0cml4X3JvdGF0ZShtYXRyaXgsIC1waU92ZXJUd29Eb3VibGUpOwogICAgIGNh aXJvX21hdHJpeF90cmFuc2xhdGUobWF0cml4LCAwLjAsIDEuMCk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MTWVuY2xvc2UuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5j cHAKaW5kZXggZjVjYWFlNy4uZTM1MWY0MyAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHAKQEAgLTcyLDggKzcy LDggQEAgdm9pZCBSZW5kZXJNYXRoTUxNZW5jbG9zZTo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxX aWR0aHMoKQogICAgIHNpemVfdCBub3RhdGlvbmFsVmFsdWVTaXplID0gbm90YXRpb25WYWx1ZXMu c2l6ZSgpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbm90YXRpb25hbFZhbHVlU2l6ZTsg aSsrKSB7CiAgICAgICAgIGlmIChub3RhdGlvblZhbHVlc1tpXSA9PSAiY2lyY2xlIikgewotICAg ICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtaW5QcmVmZXJyZWRMb2dpY2Fs V2lkdGgoKSAqIGZsb2F0KE1fU1FSVDIpOwotICAgICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGggPSBtYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAqIGZsb2F0KE1fU1FSVDIpOwor ICAgICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtaW5QcmVmZXJyZWRMb2dp Y2FsV2lkdGgoKSAqIGZsb2F0KHNxcnRPZlR3b0RvdWJsZSk7CisgICAgICAgICAgICBtX21heFBy ZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICogZmxvYXQo c3FydE9mVHdvRG91YmxlKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtOTEsNyArOTEsNyBAQCB2 b2lkIFJlbmRlck1hdGhNTE1lbmNsb3NlOjp1cGRhdGVMb2dpY2FsSGVpZ2h0KCkKICAgICBzaXpl X3Qgbm90YXRpb25hbFZhbHVlU2l6ZSA9IG5vdGF0aW9uVmFsdWVzLnNpemUoKTsKICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IG5vdGF0aW9uYWxWYWx1ZVNpemU7IGkrKykKICAgICAgICAgaWYg KG5vdGF0aW9uVmFsdWVzW2ldID09ICJjaXJjbGUiKQotICAgICAgICAgICAgc2V0TG9naWNhbEhl aWdodChsb2dpY2FsSGVpZ2h0KCkgKiBmbG9hdChNX1NRUlQyKSk7CisgICAgICAgICAgICBzZXRM b2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSAqIGZsb2F0KHNxcnRPZlR3b0RvdWJsZSkpOwog fQogCiB2b2lkIFJlbmRlck1hdGhNTE1lbmNsb3NlOjpwYWludChQYWludEluZm8mIGluZm8sIGNv bnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAKaW5kZXggOWRhMjMw OC4uMzE5YmUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9S ZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21h dGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAKQEAgLTE1NDgsNyArMTU0OCw3IEBAIFJlbmRl ck1hdGhNTE9wZXJhdG9yOjpTdHJldGNoeURhdGEgUmVuZGVyTWF0aE1MT3BlcmF0b3I6OmdldERp c3BsYXlTdHlsZUxhcmdlT3BlCiAgICAgVmVjdG9yPE9wZW5UeXBlTWF0aERhdGE6OkFzc2VtYmx5 UGFydD4gYXNzZW1ibHlQYXJ0czsKIAogICAgIC8vIFRoZSB2YWx1ZSBvZiBkaXNwbGF5T3BlcmF0 b3JNaW5IZWlnaHQgaXMgc29tZXRpbWVzIHRvbyBzbWFsbCwgc28gd2UgZW5zdXJlIHRoYXQgaXQg aXMgYXQgbGVhc3QgXHNxcnR7Mn0gdGltZXMgdGhlIHNpemUgb2YgdGhlIGJhc2UgZ2x5cGguCi0g ICAgZmxvYXQgZGlzcGxheU9wZXJhdG9yTWluSGVpZ2h0ID0gc3RkOjptYXgoYmFzZUdseXBoLmZv bnREYXRhLT5ib3VuZHNGb3JHbHlwaChiYXNlR2x5cGguZ2x5cGgpLmhlaWdodCgpICogZmxvYXQo TV9TUVJUMiksIHByaW1hcnlGb250RGF0YS0+bWF0aERhdGEoKS0+Z2V0TWF0aENvbnN0YW50KHBy aW1hcnlGb250RGF0YSwgT3BlblR5cGVNYXRoRGF0YTo6RGlzcGxheU9wZXJhdG9yTWluSGVpZ2h0 KSk7CisgICAgZmxvYXQgZGlzcGxheU9wZXJhdG9yTWluSGVpZ2h0ID0gc3RkOjptYXgoYmFzZUds eXBoLmZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChiYXNlR2x5cGguZ2x5cGgpLmhlaWdodCgpICog ZmxvYXQoc3FydE9mVHdvRG91YmxlKSwgcHJpbWFyeUZvbnREYXRhLT5tYXRoRGF0YSgpLT5nZXRN YXRoQ29uc3RhbnQocHJpbWFyeUZvbnREYXRhLCBPcGVuVHlwZU1hdGhEYXRhOjpEaXNwbGF5T3Bl cmF0b3JNaW5IZWlnaHQpKTsKIAogICAgIHByaW1hcnlGb250RGF0YS0+bWF0aERhdGEoKS0+Z2V0 TWF0aFZhcmlhbnRzKGJhc2VHbHlwaC5nbHlwaCwgdHJ1ZSwgc2l6ZVZhcmlhbnRzLCBhc3NlbWJs eVBhcnRzKTsKIAo= 240544 2014-10-28 09:12:08 -0700 2014-10-28 09:13:00 -0700 proposed patch IV wk.patch text/plain 5538 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZGE4YmFkMi4uYjdkNjE3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0xMC0yOCAg TWlsYW4gQ3JoYSAgPG1jcmhhQHJlZGhhdC5jb20+CisKKyAgICAgICAgVXNlIGNvbnN0YW50cyBm cm9tIHd0Zi9NYXRoRXh0cmFzLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNzk2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogd3RmL01hdGhFeHRyYXMuaDoKKwogMjAxNC0xMC0yNyAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBzZXBhcmF0ZSBIYXNoTWFwcyBm b3IgY29tbW9uIGFuZCB1bmNvbW1vbiBoZWFkZXJzIGluIEhUVFBIZWFkZXJNYXAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XVEYvd3RmL01hdGhFeHRyYXMuaCBiL1NvdXJjZS9XVEYvd3RmL01hdGhFeHRy YXMuaAppbmRleCA5NzYyOTI4Li5kZGVlNDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9N YXRoRXh0cmFzLmgKKysrIGIvU291cmNlL1dURi93dGYvTWF0aEV4dHJhcy5oCkBAIC02Nyw2ICs2 NywxNCBAQCBjb25zdCBkb3VibGUgcGlPdmVyRm91ckRvdWJsZSA9IE1fUElfNDsKIGNvbnN0IGZs b2F0IHBpT3ZlckZvdXJGbG9hdCA9IHN0YXRpY19jYXN0PGZsb2F0PihNX1BJXzQpOwogI2VuZGlm CiAKKyNpZm5kZWYgTV9TUVJUMgorY29uc3QgZG91YmxlIHNxcnRPZlR3b0RvdWJsZSA9IDEuNDE0 MjEzNTYyMzczMDk1MDQ4ODA7Citjb25zdCBmbG9hdCBzcXJ0T2ZUd29GbG9hdCA9IDEuNDE0MjEz NTYyMzczMDk1MDQ4ODBmOworI2Vsc2UKK2NvbnN0IGRvdWJsZSBzcXJ0T2ZUd29Eb3VibGUgPSBN X1NRUlQyOworY29uc3QgZG91YmxlIHNxcnRPZlR3b0Zsb2F0ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+ KE1fU1FSVDIpOworI2VuZGlmCisKICNpZiBPUyhEQVJXSU4pCiAKIC8vIFdvcmsgYXJvdW5kIGEg YnVnIGluIHRoZSBNYWMgT1MgWCBsaWJjIHdoZXJlIGNlaWwoLTAuMSkgcmV0dXJuICswLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGJiMTdmODUuLmRiMTdmNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAor MjAxNC0xMC0yOCAgTWlsYW4gQ3JoYSAgPG1jcmhhQHJlZGhhdC5jb20+CisKKyAgICAgICAgVXNl IGNvbnN0YW50cyBmcm9tIHd0Zi9NYXRoRXh0cmFzLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzk2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9u dFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJvdGF0ZUNhaXJv TWF0cml4Rm9yVmVydGljYWxPcmllbnRhdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL21hdGht bC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRo TUxNZW5jbG9zZTo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTWF0aE1MTWVuY2xvc2U6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQpOgorICAgICAg ICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTWF0aE1MT3BlcmF0b3I6OmdldERpc3BsYXlTdHlsZUxhcmdlT3BlcmF0 b3IpOgorCiAyMDE0LTEwLTI4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgTW92ZSB0ZXh0IGRlY29yYXRpb24gQ1NTIHByb3BlcnRpZXMgdG8gdGhlIG5ldyBTdHls ZUJ1aWxkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCmluZGV4 IDFkNGYyNGQuLjZmNjliMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVU eXBlLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgPGZvbnRjb25maWcvZmNmcmVldHlw ZS5oPgogI2luY2x1ZGUgPGZ0MmJ1aWxkLmg+CiAjaW5jbHVkZSBGVF9UUlVFVFlQRV9UQUJMRVNf SAorI2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3Ry aW5nLmg+CiAKICNpZiAhUExBVEZPUk0oRUZMKQpAQCAtMTIwLDcgKzEyMSw3IEBAIHN0YXRpYyB2 b2lkIHJvdGF0ZUNhaXJvTWF0cml4Rm9yVmVydGljYWxPcmllbnRhdGlvbihjYWlyb19tYXRyaXhf dCogbWF0cml4KQogICAgIC8vIGNvbWJpbmF0aW9uIG9mIHJvdGF0aW9uIChSKSBhbmQgdHJhbnNs YXRpb24gKFQpIGFwcGxpZWQgb24gdGhlCiAgICAgLy8gaG9yaXpvbnRhbCBtYXRyaXggKEgpLiBW ID0gSCAuIFIgLiBULCB3aGVyZSBSIHJvdGF0ZXMgYnkgLTkwIGRlZ3JlZXMKICAgICAvLyBhbmQg VCB0cmFuc2xhdGVzIGJ5IGZvbnQgc2l6ZSB0b3dhcmRzIHkgYXhpcy4KLSAgICBjYWlyb19tYXRy aXhfcm90YXRlKG1hdHJpeCwgLU1fUElfMik7CisgICAgY2Fpcm9fbWF0cml4X3JvdGF0ZShtYXRy aXgsIC1waU92ZXJUd29Eb3VibGUpOwogICAgIGNhaXJvX21hdHJpeF90cmFuc2xhdGUobWF0cml4 LCAwLjAsIDEuMCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9t YXRobWwvUmVuZGVyTWF0aE1MTWVuY2xvc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L21hdGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHAKaW5kZXggZjVjYWFlNy4uNmZhZDIyZSAx MDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxN ZW5jbG9zZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJN YXRoTUxNZW5jbG9zZS5jcHAKQEAgLTcyLDggKzcyLDggQEAgdm9pZCBSZW5kZXJNYXRoTUxNZW5j bG9zZTo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIHNpemVfdCBub3RhdGlv bmFsVmFsdWVTaXplID0gbm90YXRpb25WYWx1ZXMuc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgbm90YXRpb25hbFZhbHVlU2l6ZTsgaSsrKSB7CiAgICAgICAgIGlmIChub3RhdGlv blZhbHVlc1tpXSA9PSAiY2lyY2xlIikgewotICAgICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dp Y2FsV2lkdGggPSBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAqIGZsb2F0KE1fU1FSVDIpOwot ICAgICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGgoKSAqIGZsb2F0KE1fU1FSVDIpOworICAgICAgICAgICAgbV9taW5QcmVmZXJyZWRM b2dpY2FsV2lkdGggPSBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAqIHNxcnRPZlR3b0Zsb2F0 OworICAgICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGgoKSAqIHNxcnRPZlR3b0Zsb2F0OwogICAgICAgICB9CiAgICAgfQogCkBAIC05 MSw3ICs5MSw3IEBAIHZvaWQgUmVuZGVyTWF0aE1MTWVuY2xvc2U6OnVwZGF0ZUxvZ2ljYWxIZWln aHQoKQogICAgIHNpemVfdCBub3RhdGlvbmFsVmFsdWVTaXplID0gbm90YXRpb25WYWx1ZXMuc2l6 ZSgpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbm90YXRpb25hbFZhbHVlU2l6ZTsgaSsr KQogICAgICAgICBpZiAobm90YXRpb25WYWx1ZXNbaV0gPT0gImNpcmNsZSIpCi0gICAgICAgICAg ICBzZXRMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSAqIGZsb2F0KE1fU1FSVDIpKTsKKyAg ICAgICAgICAgIHNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgpICogc3FydE9mVHdvRmxv YXQpOwogfQogCiB2b2lkIFJlbmRlck1hdGhNTE1lbmNsb3NlOjpwYWludChQYWludEluZm8mIGlu Zm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAKaW5kZXgg M2YzOWQwZS4uODVlMWVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21h dGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL21hdGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAKQEAgLTE1NDgsNyArMTU0OCw3IEBA IFJlbmRlck1hdGhNTE9wZXJhdG9yOjpTdHJldGNoeURhdGEgUmVuZGVyTWF0aE1MT3BlcmF0b3I6 OmdldERpc3BsYXlTdHlsZUxhcmdlT3BlCiAgICAgVmVjdG9yPE9wZW5UeXBlTWF0aERhdGE6OkFz c2VtYmx5UGFydD4gYXNzZW1ibHlQYXJ0czsKIAogICAgIC8vIFRoZSB2YWx1ZSBvZiBkaXNwbGF5 T3BlcmF0b3JNaW5IZWlnaHQgaXMgc29tZXRpbWVzIHRvbyBzbWFsbCwgc28gd2UgZW5zdXJlIHRo YXQgaXQgaXMgYXQgbGVhc3QgXHNxcnR7Mn0gdGltZXMgdGhlIHNpemUgb2YgdGhlIGJhc2UgZ2x5 cGguCi0gICAgZmxvYXQgZGlzcGxheU9wZXJhdG9yTWluSGVpZ2h0ID0gc3RkOjptYXgoYmFzZUds eXBoLmZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChiYXNlR2x5cGguZ2x5cGgpLmhlaWdodCgpICog ZmxvYXQoTV9TUVJUMiksIHByaW1hcnlGb250RGF0YS0+bWF0aERhdGEoKS0+Z2V0TWF0aENvbnN0 YW50KHByaW1hcnlGb250RGF0YSwgT3BlblR5cGVNYXRoRGF0YTo6RGlzcGxheU9wZXJhdG9yTWlu SGVpZ2h0KSk7CisgICAgZmxvYXQgZGlzcGxheU9wZXJhdG9yTWluSGVpZ2h0ID0gc3RkOjptYXgo YmFzZUdseXBoLmZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChiYXNlR2x5cGguZ2x5cGgpLmhlaWdo dCgpICogc3FydE9mVHdvRmxvYXQsIHByaW1hcnlGb250RGF0YS0+bWF0aERhdGEoKS0+Z2V0TWF0 aENvbnN0YW50KHByaW1hcnlGb250RGF0YSwgT3BlblR5cGVNYXRoRGF0YTo6RGlzcGxheU9wZXJh dG9yTWluSGVpZ2h0KSk7CiAKICAgICBwcmltYXJ5Rm9udERhdGEtPm1hdGhEYXRhKCktPmdldE1h dGhWYXJpYW50cyhiYXNlR2x5cGguZ2x5cGgsIHRydWUsIHNpemVWYXJpYW50cywgYXNzZW1ibHlQ YXJ0cyk7CiAK 240545 2014-10-28 09:13:00 -0700 2014-10-28 11:00:11 -0700 proposed patch V wk.patch text/plain 5537 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZGE4YmFkMi4uYjdkNjE3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0xMC0yOCAg TWlsYW4gQ3JoYSAgPG1jcmhhQHJlZGhhdC5jb20+CisKKyAgICAgICAgVXNlIGNvbnN0YW50cyBm cm9tIHd0Zi9NYXRoRXh0cmFzLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNzk2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogd3RmL01hdGhFeHRyYXMuaDoKKwogMjAxNC0xMC0yNyAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBzZXBhcmF0ZSBIYXNoTWFwcyBm b3IgY29tbW9uIGFuZCB1bmNvbW1vbiBoZWFkZXJzIGluIEhUVFBIZWFkZXJNYXAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XVEYvd3RmL01hdGhFeHRyYXMuaCBiL1NvdXJjZS9XVEYvd3RmL01hdGhFeHRy YXMuaAppbmRleCA5NzYyOTI4Li5kZGVlNDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9N YXRoRXh0cmFzLmgKKysrIGIvU291cmNlL1dURi93dGYvTWF0aEV4dHJhcy5oCkBAIC02Nyw2ICs2 NywxNCBAQCBjb25zdCBkb3VibGUgcGlPdmVyRm91ckRvdWJsZSA9IE1fUElfNDsKIGNvbnN0IGZs b2F0IHBpT3ZlckZvdXJGbG9hdCA9IHN0YXRpY19jYXN0PGZsb2F0PihNX1BJXzQpOwogI2VuZGlm CiAKKyNpZm5kZWYgTV9TUVJUMgorY29uc3QgZG91YmxlIHNxcnRPZlR3b0RvdWJsZSA9IDEuNDE0 MjEzNTYyMzczMDk1MDQ4ODA7Citjb25zdCBmbG9hdCBzcXJ0T2ZUd29GbG9hdCA9IDEuNDE0MjEz NTYyMzczMDk1MDQ4ODBmOworI2Vsc2UKK2NvbnN0IGRvdWJsZSBzcXJ0T2ZUd29Eb3VibGUgPSBN X1NRUlQyOworY29uc3QgZmxvYXQgc3FydE9mVHdvRmxvYXQgPSBzdGF0aWNfY2FzdDxmbG9hdD4o TV9TUVJUMik7CisjZW5kaWYKKwogI2lmIE9TKERBUldJTikKIAogLy8gV29yayBhcm91bmQgYSBi dWcgaW4gdGhlIE1hYyBPUyBYIGxpYmMgd2hlcmUgY2VpbCgtMC4xKSByZXR1cm4gKzAuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggYmIxN2Y4NS4uZGIxN2Y1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisy MDE0LTEwLTI4ICBNaWxhbiBDcmhhICA8bWNyaGFAcmVkaGF0LmNvbT4KKworICAgICAgICBVc2Ug Y29uc3RhbnRzIGZyb20gd3RmL01hdGhFeHRyYXMuaAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3OTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250 UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cm90YXRlQ2Fpcm9N YXRyaXhGb3JWZXJ0aWNhbE9yaWVudGF0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvbWF0aG1s L1JlbmRlck1hdGhNTE1lbmNsb3NlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhN TE1lbmNsb3NlOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJNYXRoTUxNZW5jbG9zZTo6dXBkYXRlTG9naWNhbEhlaWdodCk6CisgICAgICAg ICogcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJNYXRoTUxPcGVyYXRvcjo6Z2V0RGlzcGxheVN0eWxlTGFyZ2VPcGVyYXRv cik6CisKIDIwMTQtMTAtMjggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg ICAgICBNb3ZlIHRleHQgZGVjb3JhdGlvbiBDU1MgcHJvcGVydGllcyB0byB0aGUgbmV3IFN0eWxl QnVpbGRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJl ZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKaW5kZXgg MWQ0ZjI0ZC4uNmY2OWIwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5 cGUuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSA8Zm9udGNvbmZpZy9mY2ZyZWV0eXBl Lmg+CiAjaW5jbHVkZSA8ZnQyYnVpbGQuaD4KICNpbmNsdWRlIEZUX1RSVUVUWVBFX1RBQkxFU19I CisjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJp bmcuaD4KIAogI2lmICFQTEFURk9STShFRkwpCkBAIC0xMjAsNyArMTIxLDcgQEAgc3RhdGljIHZv aWQgcm90YXRlQ2Fpcm9NYXRyaXhGb3JWZXJ0aWNhbE9yaWVudGF0aW9uKGNhaXJvX21hdHJpeF90 KiBtYXRyaXgpCiAgICAgLy8gY29tYmluYXRpb24gb2Ygcm90YXRpb24gKFIpIGFuZCB0cmFuc2xh dGlvbiAoVCkgYXBwbGllZCBvbiB0aGUKICAgICAvLyBob3Jpem9udGFsIG1hdHJpeCAoSCkuIFYg PSBIIC4gUiAuIFQsIHdoZXJlIFIgcm90YXRlcyBieSAtOTAgZGVncmVlcwogICAgIC8vIGFuZCBU IHRyYW5zbGF0ZXMgYnkgZm9udCBzaXplIHRvd2FyZHMgeSBheGlzLgotICAgIGNhaXJvX21hdHJp eF9yb3RhdGUobWF0cml4LCAtTV9QSV8yKTsKKyAgICBjYWlyb19tYXRyaXhfcm90YXRlKG1hdHJp eCwgLXBpT3ZlclR3b0RvdWJsZSk7CiAgICAgY2Fpcm9fbWF0cml4X3RyYW5zbGF0ZShtYXRyaXgs IDAuMCwgMS4wKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21h dGhtbC9SZW5kZXJNYXRoTUxNZW5jbG9zZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv bWF0aG1sL1JlbmRlck1hdGhNTE1lbmNsb3NlLmNwcAppbmRleCBmNWNhYWU3Li42ZmFkMjJlIDEw MDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTE1l bmNsb3NlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1h dGhNTE1lbmNsb3NlLmNwcApAQCAtNzIsOCArNzIsOCBAQCB2b2lkIFJlbmRlck1hdGhNTE1lbmNs b3NlOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAgICAgc2l6ZV90IG5vdGF0aW9u YWxWYWx1ZVNpemUgPSBub3RhdGlvblZhbHVlcy5zaXplKCk7CiAgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBub3RhdGlvbmFsVmFsdWVTaXplOyBpKyspIHsKICAgICAgICAgaWYgKG5vdGF0aW9u VmFsdWVzW2ldID09ICJjaXJjbGUiKSB7Ci0gICAgICAgICAgICBtX21pblByZWZlcnJlZExvZ2lj YWxXaWR0aCA9IG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICogZmxvYXQoTV9TUVJUMik7Ci0g ICAgICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZlcnJlZExvZ2lj YWxXaWR0aCgpICogZmxvYXQoTV9TUVJUMik7CisgICAgICAgICAgICBtX21pblByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICogc3FydE9mVHdvRmxvYXQ7 CisgICAgICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZlcnJlZExv Z2ljYWxXaWR0aCgpICogc3FydE9mVHdvRmxvYXQ7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTkx LDcgKzkxLDcgQEAgdm9pZCBSZW5kZXJNYXRoTUxNZW5jbG9zZTo6dXBkYXRlTG9naWNhbEhlaWdo dCgpCiAgICAgc2l6ZV90IG5vdGF0aW9uYWxWYWx1ZVNpemUgPSBub3RhdGlvblZhbHVlcy5zaXpl KCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBub3RhdGlvbmFsVmFsdWVTaXplOyBpKysp CiAgICAgICAgIGlmIChub3RhdGlvblZhbHVlc1tpXSA9PSAiY2lyY2xlIikKLSAgICAgICAgICAg IHNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgpICogZmxvYXQoTV9TUVJUMikpOworICAg ICAgICAgICAgc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KCkgKiBzcXJ0T2ZUd29GbG9h dCk7CiB9CiAKIHZvaWQgUmVuZGVyTWF0aE1MTWVuY2xvc2U6OnBhaW50KFBhaW50SW5mbyYgaW5m bywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxPcGVyYXRvci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcAppbmRleCAz ZjM5ZDBlLi44NWUxZWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0 aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvbWF0aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcApAQCAtMTU0OCw3ICsxNTQ4LDcgQEAg UmVuZGVyTWF0aE1MT3BlcmF0b3I6OlN0cmV0Y2h5RGF0YSBSZW5kZXJNYXRoTUxPcGVyYXRvcjo6 Z2V0RGlzcGxheVN0eWxlTGFyZ2VPcGUKICAgICBWZWN0b3I8T3BlblR5cGVNYXRoRGF0YTo6QXNz ZW1ibHlQYXJ0PiBhc3NlbWJseVBhcnRzOwogCiAgICAgLy8gVGhlIHZhbHVlIG9mIGRpc3BsYXlP cGVyYXRvck1pbkhlaWdodCBpcyBzb21ldGltZXMgdG9vIHNtYWxsLCBzbyB3ZSBlbnN1cmUgdGhh dCBpdCBpcyBhdCBsZWFzdCBcc3FydHsyfSB0aW1lcyB0aGUgc2l6ZSBvZiB0aGUgYmFzZSBnbHlw aC4KLSAgICBmbG9hdCBkaXNwbGF5T3BlcmF0b3JNaW5IZWlnaHQgPSBzdGQ6Om1heChiYXNlR2x5 cGguZm9udERhdGEtPmJvdW5kc0ZvckdseXBoKGJhc2VHbHlwaC5nbHlwaCkuaGVpZ2h0KCkgKiBm bG9hdChNX1NRUlQyKSwgcHJpbWFyeUZvbnREYXRhLT5tYXRoRGF0YSgpLT5nZXRNYXRoQ29uc3Rh bnQocHJpbWFyeUZvbnREYXRhLCBPcGVuVHlwZU1hdGhEYXRhOjpEaXNwbGF5T3BlcmF0b3JNaW5I ZWlnaHQpKTsKKyAgICBmbG9hdCBkaXNwbGF5T3BlcmF0b3JNaW5IZWlnaHQgPSBzdGQ6Om1heChi YXNlR2x5cGguZm9udERhdGEtPmJvdW5kc0ZvckdseXBoKGJhc2VHbHlwaC5nbHlwaCkuaGVpZ2h0 KCkgKiBzcXJ0T2ZUd29GbG9hdCwgcHJpbWFyeUZvbnREYXRhLT5tYXRoRGF0YSgpLT5nZXRNYXRo Q29uc3RhbnQocHJpbWFyeUZvbnREYXRhLCBPcGVuVHlwZU1hdGhEYXRhOjpEaXNwbGF5T3BlcmF0 b3JNaW5IZWlnaHQpKTsKIAogICAgIHByaW1hcnlGb250RGF0YS0+bWF0aERhdGEoKS0+Z2V0TWF0 aFZhcmlhbnRzKGJhc2VHbHlwaC5nbHlwaCwgdHJ1ZSwgc2l6ZVZhcmlhbnRzLCBhc3NlbWJseVBh cnRzKTsKIAo=