162704 2016-09-28 15:59:57 -0700 [Coordinated Graphics] Debug Visuals don't hide 2017-05-09 05:38:48 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yoshiaki.jitsukawa webkit-unassigned bfulgham commit-queue don.olmstead jh718.park mcatanzaro simon.fraser yoon zan oldest_to_newest 1234586 0 yoshiaki.jitsukawa 2016-09-28 15:59:57 -0700 In the EFL mini browser, the debug visuals (borders and repaint counters) show when the "show compositing borders" button on the inspector is pressed. However the visuals don't hide when the button is pressed again. 1234619 1 290144 yoshiaki.jitsukawa 2016-09-28 16:59:27 -0700 Created attachment 290144 Patch 1304036 2 290144 yoon 2017-05-03 09:04:45 -0700 Comment on attachment 290144 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290144&action=review > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:478 > + m_layerState.debugVisuals.showDebugBorders = show; Nice finding! But I think it is enough to remove this line: m_layerState.showDebugBorders = true; Because CoordinatedGraphicsLayer::syncLayerState will set the proper value to the m_layerState.showDebugBorder > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:490 > + m_layerState.debugVisuals.showRepaintCounter = show; Same here. > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:79 > + float debugBorderWidth; Nowadays, we initialize members like this: float debugBorderWidth { 0 }; > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:87 > +}; BTW, do you have any other reason to make a new structure for debug visual? Even in current implementation, we sent these changes to the compositing thread with a single commit. 1305754 3 yoshiaki.jitsukawa 2017-05-07 16:06:23 -0700 (In reply to Gwang Yoon Hwang from comment #2) > Comment on attachment 290144 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=290144&action=review > > > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:478 > > + m_layerState.debugVisuals.showDebugBorders = show; > > Nice finding! But I think it is enough to remove this line: > m_layerState.showDebugBorders = true; > > Because CoordinatedGraphicsLayer::syncLayerState will set the proper value > to the m_layerState.showDebugBorder > Thanks for reviewing. Yes, actually the minimum fix is like: - m_layerState.showDebugBorders = true; + m_layerState.debugBorderColorChanged = true; // This forces the debug visuals update Without setting the debugBorderColorChanged flag the debug visuals are not updated because the code to change the visuals refers to only the "debugBorderColorChanged" and "debugBorderWidthChanged" flags if (layerState.debugBorderColorChanged || layerState.debugBorderWidthChanged) layer->setDebugVisuals(layerState.showDebugBorders, layerState.debugBorderColor, layerState.debugBorderWidth, layerState.showRepaintCounter); > BTW, do you have any other reason to make a new structure for debug visual? > Even in current implementation, we sent these changes to the compositing > thread with a single commit. So, at least, with the current implementation, we need to add two update flags for the "showDebugBorders" and "showRepaintCounter" state. But instead, I made a new structure for debug visuals and an update flag for it. 1305755 4 mcatanzaro 2017-05-07 16:08:36 -0700 Yoon, what do you think? 1305825 5 yoon 2017-05-08 00:57:47 -0700 (In reply to Yoshiaki Jitsukawa from comment #3) > (In reply to Gwang Yoon Hwang from comment #2) > > Comment on attachment 290144 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=290144&action=review > > > > Without setting the debugBorderColorChanged flag the debug visuals are not > updated because the code to change the visuals refers to only the > "debugBorderColorChanged" and "debugBorderWidthChanged" flags > Oh, nice. Than I agree with your change. If you update the initialize code, I like the patch. :) 1306286 6 309477 yoshiaki.jitsukawa 2017-05-09 00:04:10 -0700 Created attachment 309477 Patch 1306289 7 yoshiaki.jitsukawa 2017-05-09 00:07:39 -0700 (In reply to Gwang Yoon Hwang from comment #5) > Oh, nice. Than I agree with your change. > If you update the initialize code, I like the patch. :) Thank you! The init code updated. 1306342 8 309477 commit-queue 2017-05-09 05:38:46 -0700 Comment on attachment 309477 Patch Clearing flags on attachment: 309477 Committed r216502: <http://trac.webkit.org/changeset/216502> 1306343 9 commit-queue 2017-05-09 05:38:48 -0700 All reviewed patches have been landed. Closing bug. 290144 2016-09-28 16:59:27 -0700 2017-05-09 00:04:06 -0700 Patch bug-162704-20160929085625.patch text/plain 14056 yoshiaki.jitsukawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjQ5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE2LTA5LTI4ICBZb3NoaWFr aSBKaXRzdWthd2EgIDxZb3NoaWFraS5KaXRzdWthd2FAc29ueS5jb20+CisKKyAgICAgICAgW0Nv b3JkaW5hdGVkIEdyYXBoaWNzXSBEZWJ1ZyBWaXN1YWxzIGRvbid0IGhpZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjcwNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldFNob3dEZWJ1Z0JvcmRlcik6 CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldFNob3dSZXBh aW50Q291bnRlcik6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6 OnN5bmNMYXllclN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NM YXllcjo6c2V0RGVidWdCb3JkZXIpOgorICAgICAgICBzaG93RGVidWdCb3JkZXJzKCkgYW5kIHNo b3dSZXBhaW50Q291bnRlcigpIG9mIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciBzaG91bGQgcmVm bGVjdAorICAgICAgICB0aGUgInNob3ciIGFyZ3VtZW50IHRvIHRoZSBsYXllciBzdGF0ZS4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRl ZEdyYXBoaWNzU3RhdGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRlYnVnVmlzdWFsczo6RGVidWdW aXN1YWxzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllclN0YXRl OjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXJTdGF0ZSk6CisgICAgICAgIFRvIHNldCB0aGUgZGVi dWcgdmlzdWFscyBvZiBhIGxheWVyLCB0aGUgdmlzaWJpbGl0eSBmbGFncyBvZiB0aGUgYm9yZGVy cyBhbmQgdGhlIHJlcGFpbnQKKyAgICAgICAgY291bnRlcnMgYXMgd2VsbCBhcyB0aGUgYm9yZGVy IHdpZHRoIGFuZCBjb2xvciBhcmUgbmVlZGVkLiBUaHVzIGEgbmV3IGJ1bmRsZSBzdHJ1Y3QKKyAg ICAgICAgRGVidWdWaXN1YWxzIGFuZCBpdHMgY2hhbmdlIGZsYWcgZGVidWdWaXN1YWxzQ2hhbmdl ZCBoYXZlIGJlZW4gaW50cm9kdWNlZCBpbiBvcmRlciB0bworICAgICAgICBzZW5kIHRoZSBpbmZv cm1hdGlvbiBhdCBvbmNlLgorCiAyMDE2LTA5LTI3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW5saW5lIGNyaXRpY2FsIGZ1bmN0aW9ucyBp biBVUkxQYXJzZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29y ZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCShyZXZpc2lvbiAyMDY0OTIpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFw aGljc0xheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMyw2ICszLDcgQEAKICBDb3B5cmlnaHQg KEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIENvcHlyaWdodCAoQykg MjAxMiBDb21wYW55IDEwMCwgSW5jLgogIENvcHlyaWdodCAoQykgMjAxMiBJbnRlbCBDb3Jwb3Jh dGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyBDb3B5cmlnaHQgKEMpIDIwMTYgU29ueSBJbnRl cmFjdGl2ZSBFbnRlcnRhaW5tZW50IEluYy4KIAogIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3 YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICBtb2RpZnkgaXQgdW5kZXIgdGhl IHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNDc0LDggKzQ3NSw4 IEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpzZXRTaG93RGUKICAgICAgICAgcmV0 dXJuOwogCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0U2hvd0RlYnVnQm9yZGVyKHNob3cpOwotICAg IG1fbGF5ZXJTdGF0ZS5zaG93RGVidWdCb3JkZXJzID0gdHJ1ZTsKLSAgICBtX2xheWVyU3RhdGUu ZmxhZ3NDaGFuZ2VkID0gdHJ1ZTsKKyAgICBtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxzLnNob3dE ZWJ1Z0JvcmRlcnMgPSBzaG93OworICAgIG1fbGF5ZXJTdGF0ZS5kZWJ1Z1Zpc3VhbHNDaGFuZ2Vk ID0gdHJ1ZTsKIAogICAgIGRpZENoYW5nZUxheWVyU3RhdGUoKTsKIH0KQEAgLTQ4Niw4ICs0ODcs OCBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6c2V0U2hvd1JlCiAgICAgICAgIHJl dHVybjsKIAogICAgIEdyYXBoaWNzTGF5ZXI6OnNldFNob3dSZXBhaW50Q291bnRlcihzaG93KTsK LSAgICBtX2xheWVyU3RhdGUuc2hvd1JlcGFpbnRDb3VudGVyID0gdHJ1ZTsKLSAgICBtX2xheWVy U3RhdGUuZmxhZ3NDaGFuZ2VkID0gdHJ1ZTsKKyAgICBtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxz LnNob3dSZXBhaW50Q291bnRlciA9IHNob3c7CisgICAgbV9sYXllclN0YXRlLmRlYnVnVmlzdWFs c0NoYW5nZWQgPSB0cnVlOwogCiAgICAgZGlkQ2hhbmdlTGF5ZXJTdGF0ZSgpOwogfQpAQCAtNjg4 LDI2ICs2ODksMjkgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnN5bmNMYXllcgog ICAgICAgICBtX2xheWVyU3RhdGUubWFza3NUb0JvdW5kcyA9IG1hc2tzVG9Cb3VuZHMoKTsKICAg ICAgICAgbV9sYXllclN0YXRlLnByZXNlcnZlczNEID0gcHJlc2VydmVzM0QoKTsKICAgICAgICAg bV9sYXllclN0YXRlLmZpeGVkVG9WaWV3cG9ydCA9IGZpeGVkVG9WaWV3cG9ydCgpOwotICAgICAg ICBtX2xheWVyU3RhdGUuc2hvd0RlYnVnQm9yZGVycyA9IGlzU2hvd2luZ0RlYnVnQm9yZGVyKCk7 Ci0gICAgICAgIG1fbGF5ZXJTdGF0ZS5zaG93UmVwYWludENvdW50ZXIgPSBpc1Nob3dpbmdSZXBh aW50Q291bnRlcigpOwogICAgICAgICBtX2xheWVyU3RhdGUuaXNTY3JvbGxhYmxlID0gaXNTY3Jv bGxhYmxlKCk7CiAgICAgfQogCi0gICAgaWYgKG1fbGF5ZXJTdGF0ZS5zaG93RGVidWdCb3JkZXJz KQorICAgIGlmIChtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxzQ2hhbmdlZCkgeworICAgICAgICBt X2xheWVyU3RhdGUuZGVidWdWaXN1YWxzLnNob3dEZWJ1Z0JvcmRlcnMgPSBpc1Nob3dpbmdEZWJ1 Z0JvcmRlcigpOworICAgICAgICBtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxzLnNob3dSZXBhaW50 Q291bnRlciA9IGlzU2hvd2luZ1JlcGFpbnRDb3VudGVyKCk7CisgICAgfQorCisgICAgaWYgKG1f bGF5ZXJTdGF0ZS5kZWJ1Z1Zpc3VhbHMuc2hvd0RlYnVnQm9yZGVycykKICAgICAgICAgdXBkYXRl RGVidWdJbmRpY2F0b3JzKCk7CiB9CiAKIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpz ZXREZWJ1Z0JvcmRlcihjb25zdCBDb2xvciYgY29sb3IsIGZsb2F0IHdpZHRoKQogewotICAgIEFT U0VSVChtX2xheWVyU3RhdGUuc2hvd0RlYnVnQm9yZGVycyk7Ci0gICAgaWYgKG1fbGF5ZXJTdGF0 ZS5kZWJ1Z0JvcmRlckNvbG9yICE9IGNvbG9yKSB7Ci0gICAgICAgIG1fbGF5ZXJTdGF0ZS5kZWJ1 Z0JvcmRlckNvbG9yID0gY29sb3I7Ci0gICAgICAgIG1fbGF5ZXJTdGF0ZS5kZWJ1Z0JvcmRlckNv bG9yQ2hhbmdlZCA9IHRydWU7CisgICAgQVNTRVJUKG1fbGF5ZXJTdGF0ZS5kZWJ1Z1Zpc3VhbHMu c2hvd0RlYnVnQm9yZGVycyk7CisgICAgaWYgKG1fbGF5ZXJTdGF0ZS5kZWJ1Z1Zpc3VhbHMuZGVi dWdCb3JkZXJDb2xvciAhPSBjb2xvcikgeworICAgICAgICBtX2xheWVyU3RhdGUuZGVidWdWaXN1 YWxzLmRlYnVnQm9yZGVyQ29sb3IgPSBjb2xvcjsKKyAgICAgICAgbV9sYXllclN0YXRlLmRlYnVn VmlzdWFsc0NoYW5nZWQgPSB0cnVlOwogICAgIH0KIAotICAgIGlmIChtX2xheWVyU3RhdGUuZGVi dWdCb3JkZXJXaWR0aCAhPSB3aWR0aCkgewotICAgICAgICBtX2xheWVyU3RhdGUuZGVidWdCb3Jk ZXJXaWR0aCA9IHdpZHRoOwotICAgICAgICBtX2xheWVyU3RhdGUuZGVidWdCb3JkZXJXaWR0aENo YW5nZWQgPSB0cnVlOworICAgIGlmIChtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxzLmRlYnVnQm9y ZGVyV2lkdGggIT0gd2lkdGgpIHsKKyAgICAgICAgbV9sYXllclN0YXRlLmRlYnVnVmlzdWFscy5k ZWJ1Z0JvcmRlcldpZHRoID0gd2lkdGg7CisgICAgICAgIG1fbGF5ZXJTdGF0ZS5kZWJ1Z1Zpc3Vh bHNDaGFuZ2VkID0gdHJ1ZTsKICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzU3RhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv Y29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlLmgJKHJldmlzaW9uIDIwNjQ5MikK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9D b29yZGluYXRlZEdyYXBoaWNzU3RhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDcgQEAK IC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBz dWJzaWRpYXJ5KC1pZXMpCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTMgQ29tcGFueSAxMDAsIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNiBTb255IEludGVyYWN0 aXZlIEVudGVydGFpbm1lbnQgSW5jLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC02OSw2ICs3MCwyMiBAQCBzdHJ1Y3QgVGlsZUNyZWF0aW9uSW5mbyB7CiAgICAgZmxvYXQgc2Nh bGU7CiB9OwogCitzdHJ1Y3QgRGVidWdWaXN1YWxzIHsKKyAgICBEZWJ1Z1Zpc3VhbHMoKQorICAg ICAgICA6IGRlYnVnQm9yZGVyV2lkdGgoMCkKKyAgICAgICAgLCBzaG93RGVidWdCb3JkZXJzKGZh bHNlKQorICAgICAgICAsIHNob3dSZXBhaW50Q291bnRlcihmYWxzZSkgeyB9CisgICAgQ29sb3Ig ZGVidWdCb3JkZXJDb2xvcjsKKyAgICBmbG9hdCBkZWJ1Z0JvcmRlcldpZHRoOworICAgIHVuaW9u IHsKKyAgICAgICAgc3RydWN0IHsKKyAgICAgICAgICAgIGJvb2wgc2hvd0RlYnVnQm9yZGVycyA6 IDE7CisgICAgICAgICAgICBib29sIHNob3dSZXBhaW50Q291bnRlciA6IDE7CisgICAgICAgIH07 CisgICAgICAgIHVuc2lnbmVkIGZsYWdzOworICAgIH07Cit9OworCiBzdHJ1Y3QgQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyU3RhdGUgewogICAgIHVuaW9uIHsKICAgICAgICAgc3RydWN0IHsKQEAg LTgwLDggKzk3LDcgQEAgc3RydWN0IENvb3JkaW5hdGVkR3JhcGhpY3NMYXllclN0YXRlIHsKICAg ICAgICAgICAgIGJvb2wgY29udGVudHNSZWN0Q2hhbmdlZDogMTsKICAgICAgICAgICAgIGJvb2wg b3BhY2l0eUNoYW5nZWQ6IDE7CiAgICAgICAgICAgICBib29sIHNvbGlkQ29sb3JDaGFuZ2VkOiAx OwotICAgICAgICAgICAgYm9vbCBkZWJ1Z0JvcmRlckNvbG9yQ2hhbmdlZDogMTsKLSAgICAgICAg ICAgIGJvb2wgZGVidWdCb3JkZXJXaWR0aENoYW5nZWQ6IDE7CisgICAgICAgICAgICBib29sIGRl YnVnVmlzdWFsc0NoYW5nZWQ6IDE7CiAgICAgICAgICAgICBib29sIHJlcGxpY2FDaGFuZ2VkOiAx OwogICAgICAgICAgICAgYm9vbCBtYXNrQ2hhbmdlZDogMTsKICAgICAgICAgICAgIGJvb2wgaW1h Z2VDaGFuZ2VkOiAxOwpAQCAtMTA3LDggKzEyMyw2IEBAIHN0cnVjdCBDb29yZGluYXRlZEdyYXBo aWNzTGF5ZXJTdGF0ZSB7CiAgICAgICAgICAgICBib29sIG1hc2tzVG9Cb3VuZHMgOiAxOwogICAg ICAgICAgICAgYm9vbCBwcmVzZXJ2ZXMzRCA6IDE7CiAgICAgICAgICAgICBib29sIGZpeGVkVG9W aWV3cG9ydCA6IDE7Ci0gICAgICAgICAgICBib29sIHNob3dEZWJ1Z0JvcmRlcnMgOiAxOwotICAg ICAgICAgICAgYm9vbCBzaG93UmVwYWludENvdW50ZXIgOiAxOwogICAgICAgICAgICAgYm9vbCBp c1Njcm9sbGFibGU6IDE7CiAgICAgICAgIH07CiAgICAgICAgIHVuc2lnbmVkIGZsYWdzOwpAQCAt MTIzLDExICsxMzcsOCBAQCBzdHJ1Y3QgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyU3RhdGUgewog ICAgICAgICAsIG1hc2tzVG9Cb3VuZHMoZmFsc2UpCiAgICAgICAgICwgcHJlc2VydmVzM0QoZmFs c2UpCiAgICAgICAgICwgZml4ZWRUb1ZpZXdwb3J0KGZhbHNlKQotICAgICAgICAsIHNob3dEZWJ1 Z0JvcmRlcnMoZmFsc2UpCi0gICAgICAgICwgc2hvd1JlcGFpbnRDb3VudGVyKGZhbHNlKQogICAg ICAgICAsIGlzU2Nyb2xsYWJsZShmYWxzZSkKICAgICAgICAgLCBvcGFjaXR5KDApCi0gICAgICAg ICwgZGVidWdCb3JkZXJXaWR0aCgwKQogICAgICAgICAsIHJlcGxpY2EoSW52YWxpZENvb3JkaW5h dGVkTGF5ZXJJRCkKICAgICAgICAgLCBtYXNrKEludmFsaWRDb29yZGluYXRlZExheWVySUQpCiAg ICAgICAgICwgaW1hZ2VJRChJbnZhbGlkQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmdJRCkKQEAgLTE1 MCw4ICsxNjEsNiBAQCBzdHJ1Y3QgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyU3RhdGUgewogICAg IEZsb2F0U2l6ZSBjb250ZW50c1RpbGVTaXplOwogICAgIGZsb2F0IG9wYWNpdHk7CiAgICAgQ29s b3Igc29saWRDb2xvcjsKLSAgICBDb2xvciBkZWJ1Z0JvcmRlckNvbG9yOwotICAgIGZsb2F0IGRl YnVnQm9yZGVyV2lkdGg7CiAgICAgRmlsdGVyT3BlcmF0aW9ucyBmaWx0ZXJzOwogICAgIFRleHR1 cmVNYXBwZXJBbmltYXRpb25zIGFuaW1hdGlvbnM7CiAgICAgVmVjdG9yPHVpbnQzMl90PiBjaGls ZHJlbjsKQEAgLTE2MCw2ICsxNjksNyBAQCBzdHJ1Y3QgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVy U3RhdGUgewogICAgIENvb3JkaW5hdGVkTGF5ZXJJRCByZXBsaWNhOwogICAgIENvb3JkaW5hdGVk TGF5ZXJJRCBtYXNrOwogICAgIENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nSUQgaW1hZ2VJRDsKKyAg ICBEZWJ1Z1Zpc3VhbHMgZGVidWdWaXN1YWxzOwogCiAgICAgdW5zaWduZWQgcmVwYWludENvdW50 OwogICAgIFZlY3RvcjxUaWxlVXBkYXRlSW5mbz4gdGlsZXNUb1VwZGF0ZTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cJKHJldmlzaW9uIDIwNjU1OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA5LTI4ICBZb3NoaWFraSBKaXRzdWthd2Eg IDxZb3NoaWFraS5KaXRzdWthd2FAc29ueS5jb20+CisKKyAgICAgICAgW0Nvb3JkaW5hdGVkIEdy YXBoaWNzXSBEZWJ1ZyBWaXN1YWxzIGRvbid0IGhpZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjcwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29v cmRpbmF0ZWRHcmFwaGljc0FyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1l bnRDb2RlcjxDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXJTdGF0ZT46OmVuY29kZSk6CisgICAgICAg IChJUEM6OkFyZ3VtZW50Q29kZXI8Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyU3RhdGU+OjpkZWNv ZGUpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPENvb3JkaW5hdGVkR3JhcGhpY3NTdGF0 ZT46OmRlY29kZSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8RGVidWdWaXN1YWxzPjo6 ZW5jb2RlKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxEZWJ1Z1Zpc3VhbHM+OjpkZWNv ZGUpOgorICAgICAgICAqIFNoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3Jh cGhpY3NBcmd1bWVudENvZGVycy5oOgorICAgICAgICBUaGUgZW5jb2RlciBhbmQgZGVjb2RlciBm b3IgRGVidWdWaXN1YWxzIGhhdmUgYmVlbiBhZGRlZC4KKworICAgICAgICAqIFNoYXJlZC9Db29y ZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6c2V0TGF5ZXJTdGF0ZSk6CisgICAgICAg IFVwZGF0ZSB0aGUgZGVidWcgdmlzdWFscyBvZiBhIGxheWVyIGFjY29yZGluZyB0byB0aGUgRGVi dWdWaXN1YWxzIGluZm9ybWF0aW9uCisgICAgICAgIGlmIHRoZSBkZWJ1Z1Zpc3VhbHNDaGFuZ2Vk IGZsYWcgaXMgc2V0IHRvIHRydWUuCisKIDIwMTYtMDktMjggIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXS1NoYXJlZEFQSUNhc3Qgc2hvdWxkIG5vdCB3 YXJuIGFib3V0IGFjY2VwdGFibGUgY3VzdG9tIGNvbnRleHQgbWVudSB0YWcgdmFsdWVzCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdy YXBoaWNzQXJndW1lbnRDb2RlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NBcmd1bWVudENvZGVy cy5jcHAJKHJldmlzaW9uIDIwNjQ5MikKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGlu YXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NBcmd1bWVudENvZGVycy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTIsNiArMiw3IEBACiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEyIE5va2lhIENvcnBv cmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQogICogQ29weXJpZ2h0IChDKSAyMDEy IENvbXBhbnkgMTAwLCBJbmMuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTYgU29ueSBJbnRlcmFjdGl2 ZSBFbnRlcnRhaW5tZW50IEluYy4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt NjYwLDExICs2NjEsOCBAQCB2b2lkIEFyZ3VtZW50Q29kZXI8Q29vcmRpbmF0ZWRHcmFwaGljc0xh CiAgICAgaWYgKHN0YXRlLnNvbGlkQ29sb3JDaGFuZ2VkKQogICAgICAgICBlbmNvZGVyIDw8IHN0 YXRlLnNvbGlkQ29sb3I7CiAKLSAgICBpZiAoc3RhdGUuZGVidWdCb3JkZXJDb2xvckNoYW5nZWQp Ci0gICAgICAgIGVuY29kZXIgPDwgc3RhdGUuZGVidWdCb3JkZXJDb2xvcjsKLQotICAgIGlmIChz dGF0ZS5kZWJ1Z0JvcmRlcldpZHRoQ2hhbmdlZCkKLSAgICAgICAgZW5jb2RlciA8PCBzdGF0ZS5k ZWJ1Z0JvcmRlcldpZHRoOworICAgIGlmIChzdGF0ZS5kZWJ1Z1Zpc3VhbHNDaGFuZ2VkKQorICAg ICAgICBlbmNvZGVyIDw8IHN0YXRlLmRlYnVnVmlzdWFsczsKIAogICAgIGlmIChzdGF0ZS5maWx0 ZXJzQ2hhbmdlZCkKICAgICAgICAgZW5jb2RlciA8PCBzdGF0ZS5maWx0ZXJzOwpAQCAtNzQ0LDEw ICs3NDIsNyBAQCBib29sIEFyZ3VtZW50Q29kZXI8Q29vcmRpbmF0ZWRHcmFwaGljc0xhCiAgICAg aWYgKHN0YXRlLnNvbGlkQ29sb3JDaGFuZ2VkICYmICFkZWNvZGVyLmRlY29kZShzdGF0ZS5zb2xp ZENvbG9yKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKHN0YXRlLmRlYnVnQm9y ZGVyQ29sb3JDaGFuZ2VkICYmICFkZWNvZGVyLmRlY29kZShzdGF0ZS5kZWJ1Z0JvcmRlckNvbG9y KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKHN0YXRlLmRlYnVnQm9yZGVyV2lk dGhDaGFuZ2VkICYmICFkZWNvZGVyLmRlY29kZShzdGF0ZS5kZWJ1Z0JvcmRlcldpZHRoKSkKKyAg ICBpZiAoc3RhdGUuZGVidWdWaXN1YWxzQ2hhbmdlZCAmJiAhZGVjb2Rlci5kZWNvZGUoc3RhdGUu ZGVidWdWaXN1YWxzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKHN0YXRlLmZp bHRlcnNDaGFuZ2VkICYmICFkZWNvZGVyLmRlY29kZShzdGF0ZS5maWx0ZXJzKSkKQEAgLTk1Nyw2 ICs5NTIsMjcgQEAgYm9vbCBBcmd1bWVudENvZGVyPENvb3JkaW5hdGVkR3JhcGhpY3NTdAogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9pZCBBcmd1bWVu dENvZGVyPERlYnVnVmlzdWFscz46OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBEZWJ1 Z1Zpc3VhbHMmIGRlYnVnVmlzdWFscykKK3sKKyAgICBlbmNvZGVyIDw8IGRlYnVnVmlzdWFscy5k ZWJ1Z0JvcmRlckNvbG9yOworICAgIGVuY29kZXIgPDwgZGVidWdWaXN1YWxzLmRlYnVnQm9yZGVy V2lkdGg7CisgICAgZW5jb2RlciA8PCBkZWJ1Z1Zpc3VhbHMuZmxhZ3M7Cit9CisKK2Jvb2wgQXJn dW1lbnRDb2RlcjxEZWJ1Z1Zpc3VhbHM+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwgRGVidWdW aXN1YWxzJiBkZWJ1Z1Zpc3VhbHMpCit7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShkZWJ1Z1Zp c3VhbHMuZGVidWdCb3JkZXJDb2xvcikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlm ICghZGVjb2Rlci5kZWNvZGUoZGVidWdWaXN1YWxzLmRlYnVnQm9yZGVyV2lkdGgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGRlYnVnVmlzdWFscy5m bGFncykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiB0cnVlOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBJUEMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRl ZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NBcmd1bWVudENvZGVycy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVk R3JhcGhpY3NBcmd1bWVudENvZGVycy5oCShyZXZpc2lvbiAyMDY0OTIpCisrKyBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzQXJndW1l bnRDb2RlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMiw2ICsyLDcgQEAKICAqIENvcHlyaWdodCAo QykgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmln aHQgKEMpIDIwMTIgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMp CiAgKiBDb3B5cmlnaHQgKEMpIDIwMTIgQ29tcGFueSAxMDAsIEluYy4KKyAqIENvcHlyaWdodCAo QykgMjAxNiBTb255IEludGVyYWN0aXZlIEVudGVydGFpbm1lbnQgSW5jLgogICoKICAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCkBAIC00Myw2ICs0NCw3IEBAIHN0cnVjdCBUaWxlVXBkYXRlSW5m bzsKIGNsYXNzIFRyYW5zZm9ybWF0aW9uTWF0cml4OwogY2xhc3MgVHJhbnNmb3JtT3BlcmF0aW9u czsKIHN0cnVjdCBMZW5ndGg7CitzdHJ1Y3QgRGVidWdWaXN1YWxzOwogCiBjbGFzcyBGaWx0ZXJP cGVyYXRpb25zOwogCkBAIC0xMDUsNiArMTA3LDExIEBAIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3Vt ZW50Q29kZXI8V2ViQ29yZToKICAgICBzdGF0aWMgYm9vbCBkZWNvZGUoRGVjb2RlciYsIFdlYkNv cmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZSYpOwogfTsKIAordGVtcGxhdGU8PiBzdHJ1Y3Qg QXJndW1lbnRDb2RlcjxXZWJDb3JlOjpEZWJ1Z1Zpc3VhbHM+IHsKKyAgICBzdGF0aWMgdm9pZCBl bmNvZGUoRW5jb2RlciYsIGNvbnN0IFdlYkNvcmU6OkRlYnVnVmlzdWFscyYpOworICAgIHN0YXRp YyBib29sIGRlY29kZShEZWNvZGVyJiwgV2ViQ29yZTo6RGVidWdWaXN1YWxzJik7Cit9OworCiB9 IC8vIG5hbWVzcGFjZSBJUEMKIAogI2VuZGlmIC8vIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5h dGVkR3JhcGhpY3NTY2VuZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVk L0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcAkocmV2aXNp b24gMjA2NDkyKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDcg QEAKIC8qCiAgICAgQ29weXJpZ2h0IChDKSAyMDEyIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBp dHMgc3Vic2lkaWFyeSgtaWVzKQogICAgIENvcHlyaWdodCAoQykgMjAxMiBDb21wYW55IDEwMCwg SW5jLgorICAgIENvcHlyaWdodCAoQykgMjAxNiBTb255IEludGVyYWN0aXZlIEVudGVydGFpbm1l bnQgSW5jLgogCiAgICAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVk aXN0cmlidXRlIGl0IGFuZC9vcgogICAgIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhl IEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC0yOTgsOCArMjk5LDggQEAgdm9pZCBDb29y ZGluYXRlZEdyYXBoaWNzU2NlbmU6OnNldExheWVyUwogICAgIGlmIChsYXllclN0YXRlLnNvbGlk Q29sb3JDaGFuZ2VkKQogICAgICAgICBsYXllci0+c2V0U29saWRDb2xvcihsYXllclN0YXRlLnNv bGlkQ29sb3IpOwogCi0gICAgaWYgKGxheWVyU3RhdGUuZGVidWdCb3JkZXJDb2xvckNoYW5nZWQg fHwgbGF5ZXJTdGF0ZS5kZWJ1Z0JvcmRlcldpZHRoQ2hhbmdlZCkKLSAgICAgICAgbGF5ZXItPnNl dERlYnVnVmlzdWFscyhsYXllclN0YXRlLnNob3dEZWJ1Z0JvcmRlcnMsIGxheWVyU3RhdGUuZGVi dWdCb3JkZXJDb2xvciwgbGF5ZXJTdGF0ZS5kZWJ1Z0JvcmRlcldpZHRoLCBsYXllclN0YXRlLnNo b3dSZXBhaW50Q291bnRlcik7CisgICAgaWYgKGxheWVyU3RhdGUuZGVidWdWaXN1YWxzQ2hhbmdl ZCkKKyAgICAgICAgbGF5ZXItPnNldERlYnVnVmlzdWFscyhsYXllclN0YXRlLmRlYnVnVmlzdWFs cy5zaG93RGVidWdCb3JkZXJzLCBsYXllclN0YXRlLmRlYnVnVmlzdWFscy5kZWJ1Z0JvcmRlckNv bG9yLCBsYXllclN0YXRlLmRlYnVnVmlzdWFscy5kZWJ1Z0JvcmRlcldpZHRoLCBsYXllclN0YXRl LmRlYnVnVmlzdWFscy5zaG93UmVwYWludENvdW50ZXIpOwogCiAgICAgaWYgKGxheWVyU3RhdGUu cmVwbGljYUNoYW5nZWQpCiAgICAgICAgIGxheWVyLT5zZXRSZXBsaWNhTGF5ZXIoZ2V0TGF5ZXJC eUlESWZFeGlzdHMobGF5ZXJTdGF0ZS5yZXBsaWNhKSk7Cg== 309477 2017-05-09 00:04:10 -0700 2017-05-09 05:38:46 -0700 Patch bug-162704-20170509160409.patch text/plain 14787 yoshiaki.jitsukawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc2OGU5ODZiY2U1NjQ5 N2E0YjZiYjg2OTk1MWJhZTdhNGY2ODg1YS4uNjQzYWY2M2M3NjFkOWUyNWE0Yzc5ZjIzMDM0NTFm NTcyM2NlOTAxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTA1LTA4ICBZb3No aWFraSBKaXRzdWthd2EgIDxZb3NoaWFraS5KaXRzdWthd2FAc29ueS5jb20+CisKKyAgICAgICAg W0Nvb3JkaW5hdGVkIEdyYXBoaWNzXSBEZWJ1ZyBWaXN1YWxzIGRvbid0IGhpZGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjcwNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldFNob3dEZWJ1Z0JvcmRl cik6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldFNob3dS ZXBhaW50Q291bnRlcik6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5 ZXI6OnN5bmNMYXllclN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhp Y3NMYXllcjo6c2V0RGVidWdCb3JkZXIpOgorICAgICAgICBzaG93RGVidWdCb3JkZXJzKCkgYW5k IHNob3dSZXBhaW50Q291bnRlcigpIG9mIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciBzaG91bGQg cmVmbGVjdAorICAgICAgICB0aGUgInNob3ciIGFyZ3VtZW50IHRvIHRoZSBsYXllciBzdGF0ZS4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGlu YXRlZEdyYXBoaWNzU3RhdGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRlYnVnVmlzdWFsczo6RGVi dWdWaXN1YWxzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllclN0 YXRlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXJTdGF0ZSk6CisgICAgICAgIFRvIHNldCB0aGUg ZGVidWcgdmlzdWFscyBvZiBhIGxheWVyLCB0aGUgdmlzaWJpbGl0eSBmbGFncyBvZiB0aGUgYm9y ZGVycyBhbmQgdGhlIHJlcGFpbnQKKyAgICAgICAgY291bnRlcnMgYXMgd2VsbCBhcyB0aGUgYm9y ZGVyIHdpZHRoIGFuZCBjb2xvciBhcmUgbmVlZGVkLiBUaHVzIGEgbmV3IGJ1bmRsZSBzdHJ1Y3QK KyAgICAgICAgRGVidWdWaXN1YWxzIGFuZCBpdHMgY2hhbmdlIGZsYWcgZGVidWdWaXN1YWxzQ2hh bmdlZCBoYXZlIGJlZW4gaW50cm9kdWNlZCBpbiBvcmRlciB0bworICAgICAgICBzZW5kIHRoZSBp bmZvcm1hdGlvbiBhdCBvbmNlLgorCiAyMDE3LTA1LTA3ICBCZW4gS2VsbHkgIDxiZW5Ad2FuZGVy dmlldy5jb20+CiAKICAgICAgICAgU2V0IHRoZSBSZXNwb25zZS5ibG9iKCkgdHlwZSBiYXNlZCBv biB0aGUgY29udGVudC10eXBlIGhlYWRlciB2YWx1ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0ZGUzZjY1Yjc3 MmEyZTA0NjRkODhmNGQ4M2I0MDJkMWE0ZWZiMTljLi5jNDM5OTkxZjQwZTk5MDNmMDRjZTZlNTFk YmVmMTg3MTZkMWQ3MDQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTctMDUtMDgg IFlvc2hpYWtpIEppdHN1a2F3YSAgPFlvc2hpYWtpLkppdHN1a2F3YUBzb255LmNvbT4KKworICAg ICAgICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIERlYnVnIFZpc3VhbHMgZG9uJ3QgaGlkZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYyNzA0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvQ29v cmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzQXJndW1lbnRDb2RlcnMuY3BwOgor ICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPENvb3JkaW5hdGVkR3JhcGhpY3NMYXllclN0YXRl Pjo6ZW5jb2RlKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxDb29yZGluYXRlZEdyYXBo aWNzTGF5ZXJTdGF0ZT46OmRlY29kZSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8RGVi dWdWaXN1YWxzPjo6ZW5jb2RlKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxEZWJ1Z1Zp c3VhbHM+OjpkZWNvZGUpOgorICAgICAgICBUaGUgZW5jb2RlciBhbmQgZGVjb2RlciBmb3IgRGVi dWdWaXN1YWxzIGhhdmUgYmVlbiBhZGRlZC4KKworICAgICAgICAqIFNoYXJlZC9Db29yZGluYXRl ZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NBcmd1bWVudENvZGVycy5oOgorICAgICAgICAq IFNoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6c2V0TGF5ZXJTdGF0 ZSk6CisgICAgICAgIFVwZGF0ZSB0aGUgZGVidWcgdmlzdWFscyBvZiBhIGxheWVyIGFjY29yZGlu ZyB0byB0aGUgRGVidWdWaXN1YWxzIGluZm9ybWF0aW9uCisgICAgICAgIGlmIHRoZSBkZWJ1Z1Zp c3VhbHNDaGFuZ2VkIGZsYWcgaXMgc2V0IHRvIHRydWUuCisKIDIwMTctMDUtMDcgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gUkVHUkVTU0lP TiAocjIwOTQwOSk6IGdldEJvdW5kaW5nQ2xpZW50UmVjdCBpcyB3cm9uZyBmb3IgZml4ZWQtcG9z aXRpb24gZWxlbWVudHMgaW4gcmVzaXplL29yaWVudGF0aW9uY2hhbmdlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRp bmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IDRm ZGZmYjAzNjdhNjM2ZDkxMDBhODg2NzhmZmU5YTUyMjNiNmQyYzIuLmY4OTcxNDg5YWZkOGU1OGU1 N2I0MzM5NjViYTBkMmZjYmU0OTQ3NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGlu YXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCkBAIC0zLDYgKzMsNyBAQAogIENvcHly aWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgQ29weXJpZ2h0 IChDKSAyMDEyIENvbXBhbnkgMTAwLCBJbmMuCiAgQ29weXJpZ2h0IChDKSAyMDEyIEludGVsIENv cnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIENvcHlyaWdodCAoQykgMjAxNyBTb255 IEludGVyYWN0aXZlIEVudGVydGFpbm1lbnQgSW5jLgogCiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUg c29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogIG1vZGlmeSBpdCB1bmRl ciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC00NDcsOCAr NDQ4LDggQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldFNob3dEZWJ1Z0JvcmRl cihib29sIHNob3cpCiAgICAgICAgIHJldHVybjsKIAogICAgIEdyYXBoaWNzTGF5ZXI6OnNldFNo b3dEZWJ1Z0JvcmRlcihzaG93KTsKLSAgICBtX2xheWVyU3RhdGUuc2hvd0RlYnVnQm9yZGVycyA9 IHRydWU7Ci0gICAgbV9sYXllclN0YXRlLmZsYWdzQ2hhbmdlZCA9IHRydWU7CisgICAgbV9sYXll clN0YXRlLmRlYnVnVmlzdWFscy5zaG93RGVidWdCb3JkZXJzID0gc2hvdzsKKyAgICBtX2xheWVy U3RhdGUuZGVidWdWaXN1YWxzQ2hhbmdlZCA9IHRydWU7CiAKICAgICBkaWRDaGFuZ2VMYXllclN0 YXRlKCk7CiB9CkBAIC00NTksOCArNDYwLDggQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5 ZXI6OnNldFNob3dSZXBhaW50Q291bnRlcihib29sIHNob3cpCiAgICAgICAgIHJldHVybjsKIAog ICAgIEdyYXBoaWNzTGF5ZXI6OnNldFNob3dSZXBhaW50Q291bnRlcihzaG93KTsKLSAgICBtX2xh eWVyU3RhdGUuc2hvd1JlcGFpbnRDb3VudGVyID0gdHJ1ZTsKLSAgICBtX2xheWVyU3RhdGUuZmxh Z3NDaGFuZ2VkID0gdHJ1ZTsKKyAgICBtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxzLnNob3dSZXBh aW50Q291bnRlciA9IHNob3c7CisgICAgbV9sYXllclN0YXRlLmRlYnVnVmlzdWFsc0NoYW5nZWQg PSB0cnVlOwogCiAgICAgZGlkQ2hhbmdlTGF5ZXJTdGF0ZSgpOwogfQpAQCAtNjYxLDI2ICs2NjIs MjkgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnN5bmNMYXllclN0YXRlKCkKICAg ICAgICAgbV9sYXllclN0YXRlLm1hc2tzVG9Cb3VuZHMgPSBtYXNrc1RvQm91bmRzKCk7CiAgICAg ICAgIG1fbGF5ZXJTdGF0ZS5wcmVzZXJ2ZXMzRCA9IHByZXNlcnZlczNEKCk7CiAgICAgICAgIG1f bGF5ZXJTdGF0ZS5maXhlZFRvVmlld3BvcnQgPSBmaXhlZFRvVmlld3BvcnQoKTsKLSAgICAgICAg bV9sYXllclN0YXRlLnNob3dEZWJ1Z0JvcmRlcnMgPSBpc1Nob3dpbmdEZWJ1Z0JvcmRlcigpOwot ICAgICAgICBtX2xheWVyU3RhdGUuc2hvd1JlcGFpbnRDb3VudGVyID0gaXNTaG93aW5nUmVwYWlu dENvdW50ZXIoKTsKICAgICAgICAgbV9sYXllclN0YXRlLmlzU2Nyb2xsYWJsZSA9IGlzU2Nyb2xs YWJsZSgpOwogICAgIH0KIAotICAgIGlmIChtX2xheWVyU3RhdGUuc2hvd0RlYnVnQm9yZGVycykK KyAgICBpZiAobV9sYXllclN0YXRlLmRlYnVnVmlzdWFsc0NoYW5nZWQpIHsKKyAgICAgICAgbV9s YXllclN0YXRlLmRlYnVnVmlzdWFscy5zaG93RGVidWdCb3JkZXJzID0gaXNTaG93aW5nRGVidWdC b3JkZXIoKTsKKyAgICAgICAgbV9sYXllclN0YXRlLmRlYnVnVmlzdWFscy5zaG93UmVwYWludENv dW50ZXIgPSBpc1Nob3dpbmdSZXBhaW50Q291bnRlcigpOworICAgIH0KKworICAgIGlmIChtX2xh eWVyU3RhdGUuZGVidWdWaXN1YWxzLnNob3dEZWJ1Z0JvcmRlcnMpCiAgICAgICAgIHVwZGF0ZURl YnVnSW5kaWNhdG9ycygpOwogfQogCiB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6c2V0 RGVidWdCb3JkZXIoY29uc3QgQ29sb3ImIGNvbG9yLCBmbG9hdCB3aWR0aCkKIHsKLSAgICBBU1NF UlQobV9sYXllclN0YXRlLnNob3dEZWJ1Z0JvcmRlcnMpOwotICAgIGlmIChtX2xheWVyU3RhdGUu ZGVidWdCb3JkZXJDb2xvciAhPSBjb2xvcikgewotICAgICAgICBtX2xheWVyU3RhdGUuZGVidWdC b3JkZXJDb2xvciA9IGNvbG9yOwotICAgICAgICBtX2xheWVyU3RhdGUuZGVidWdCb3JkZXJDb2xv ckNoYW5nZWQgPSB0cnVlOworICAgIEFTU0VSVChtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxzLnNo b3dEZWJ1Z0JvcmRlcnMpOworICAgIGlmIChtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxzLmRlYnVn Qm9yZGVyQ29sb3IgIT0gY29sb3IpIHsKKyAgICAgICAgbV9sYXllclN0YXRlLmRlYnVnVmlzdWFs cy5kZWJ1Z0JvcmRlckNvbG9yID0gY29sb3I7CisgICAgICAgIG1fbGF5ZXJTdGF0ZS5kZWJ1Z1Zp c3VhbHNDaGFuZ2VkID0gdHJ1ZTsKICAgICB9CiAKLSAgICBpZiAobV9sYXllclN0YXRlLmRlYnVn Qm9yZGVyV2lkdGggIT0gd2lkdGgpIHsKLSAgICAgICAgbV9sYXllclN0YXRlLmRlYnVnQm9yZGVy V2lkdGggPSB3aWR0aDsKLSAgICAgICAgbV9sYXllclN0YXRlLmRlYnVnQm9yZGVyV2lkdGhDaGFu Z2VkID0gdHJ1ZTsKKyAgICBpZiAobV9sYXllclN0YXRlLmRlYnVnVmlzdWFscy5kZWJ1Z0JvcmRl cldpZHRoICE9IHdpZHRoKSB7CisgICAgICAgIG1fbGF5ZXJTdGF0ZS5kZWJ1Z1Zpc3VhbHMuZGVi dWdCb3JkZXJXaWR0aCA9IHdpZHRoOworICAgICAgICBtX2xheWVyU3RhdGUuZGVidWdWaXN1YWxz Q2hhbmdlZCA9IHRydWU7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1N0 YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0 ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlLmgKaW5kZXggMWE0MDQ2ZDQzNmZmYzMxNmNmYjFm YzNlNjY3NGZjMjUwMTBlMzMzMS4uNzAxNDkzN2M2NGU1ZjFhZmU2OGU2OGNjMzBiYTRlNTdlZDI1 N2QyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBo aWNzU3RhdGUuaApAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTMgTm9r aWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCiAgKiBDb3B5cmlnaHQg KEMpIDIwMTMgQ29tcGFueSAxMDAsIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly aWdodCAoQykgMjAxNyBTb255IEludGVyYWN0aXZlIEVudGVydGFpbm1lbnQgSW5jLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC02NCw2ICs2NSwyMSBAQCBzdHJ1Y3QgVGlsZUNy ZWF0aW9uSW5mbyB7CiAgICAgZmxvYXQgc2NhbGU7CiB9OwogCitzdHJ1Y3QgRGVidWdWaXN1YWxz IHsKKyAgICBEZWJ1Z1Zpc3VhbHMoKQorICAgICAgICA6IHNob3dEZWJ1Z0JvcmRlcnMoZmFsc2Up CisgICAgICAgICwgc2hvd1JlcGFpbnRDb3VudGVyKGZhbHNlKSB7IH0KKyAgICBDb2xvciBkZWJ1 Z0JvcmRlckNvbG9yOworICAgIGZsb2F0IGRlYnVnQm9yZGVyV2lkdGggeyAwIH07CisgICAgdW5p b24geworICAgICAgICBzdHJ1Y3QgeworICAgICAgICAgICAgYm9vbCBzaG93RGVidWdCb3JkZXJz IDogMTsKKyAgICAgICAgICAgIGJvb2wgc2hvd1JlcGFpbnRDb3VudGVyIDogMTsKKyAgICAgICAg fTsKKyAgICAgICAgdW5zaWduZWQgZmxhZ3M7CisgICAgfTsKK307CisKIHN0cnVjdCBDb29yZGlu YXRlZEdyYXBoaWNzTGF5ZXJTdGF0ZSB7CiAgICAgdW5pb24gewogICAgICAgICBzdHJ1Y3QgewpA QCAtNzUsOCArOTEsNyBAQCBzdHJ1Y3QgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyU3RhdGUgewog ICAgICAgICAgICAgYm9vbCBjb250ZW50c1JlY3RDaGFuZ2VkOiAxOwogICAgICAgICAgICAgYm9v bCBvcGFjaXR5Q2hhbmdlZDogMTsKICAgICAgICAgICAgIGJvb2wgc29saWRDb2xvckNoYW5nZWQ6 IDE7Ci0gICAgICAgICAgICBib29sIGRlYnVnQm9yZGVyQ29sb3JDaGFuZ2VkOiAxOwotICAgICAg ICAgICAgYm9vbCBkZWJ1Z0JvcmRlcldpZHRoQ2hhbmdlZDogMTsKKyAgICAgICAgICAgIGJvb2wg ZGVidWdWaXN1YWxzQ2hhbmdlZDogMTsKICAgICAgICAgICAgIGJvb2wgcmVwbGljYUNoYW5nZWQ6 IDE7CiAgICAgICAgICAgICBib29sIG1hc2tDaGFuZ2VkOiAxOwogICAgICAgICAgICAgYm9vbCBp bWFnZUNoYW5nZWQ6IDE7CkBAIC0xMDMsOCArMTE4LDYgQEAgc3RydWN0IENvb3JkaW5hdGVkR3Jh cGhpY3NMYXllclN0YXRlIHsKICAgICAgICAgICAgIGJvb2wgbWFza3NUb0JvdW5kcyA6IDE7CiAg ICAgICAgICAgICBib29sIHByZXNlcnZlczNEIDogMTsKICAgICAgICAgICAgIGJvb2wgZml4ZWRU b1ZpZXdwb3J0IDogMTsKLSAgICAgICAgICAgIGJvb2wgc2hvd0RlYnVnQm9yZGVycyA6IDE7Ci0g ICAgICAgICAgICBib29sIHNob3dSZXBhaW50Q291bnRlciA6IDE7CiAgICAgICAgICAgICBib29s IGlzU2Nyb2xsYWJsZTogMTsKICAgICAgICAgfTsKICAgICAgICAgdW5zaWduZWQgZmxhZ3M7CkBA IC0xMTksMTEgKzEzMiw4IEBAIHN0cnVjdCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXJTdGF0ZSB7 CiAgICAgICAgICwgbWFza3NUb0JvdW5kcyhmYWxzZSkKICAgICAgICAgLCBwcmVzZXJ2ZXMzRChm YWxzZSkKICAgICAgICAgLCBmaXhlZFRvVmlld3BvcnQoZmFsc2UpCi0gICAgICAgICwgc2hvd0Rl YnVnQm9yZGVycyhmYWxzZSkKLSAgICAgICAgLCBzaG93UmVwYWludENvdW50ZXIoZmFsc2UpCiAg ICAgICAgICwgaXNTY3JvbGxhYmxlKGZhbHNlKQogICAgICAgICAsIG9wYWNpdHkoMCkKLSAgICAg ICAgLCBkZWJ1Z0JvcmRlcldpZHRoKDApCiAgICAgICAgICwgcmVwbGljYShJbnZhbGlkQ29vcmRp bmF0ZWRMYXllcklEKQogICAgICAgICAsIG1hc2soSW52YWxpZENvb3JkaW5hdGVkTGF5ZXJJRCkK ICAgICAgICAgLCBpbWFnZUlEKEludmFsaWRDb29yZGluYXRlZEltYWdlQmFja2luZ0lEKQpAQCAt MTQ0LDggKzE1NCw2IEBAIHN0cnVjdCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXJTdGF0ZSB7CiAg ICAgRmxvYXRTaXplIGNvbnRlbnRzVGlsZVNpemU7CiAgICAgZmxvYXQgb3BhY2l0eTsKICAgICBD b2xvciBzb2xpZENvbG9yOwotICAgIENvbG9yIGRlYnVnQm9yZGVyQ29sb3I7Ci0gICAgZmxvYXQg ZGVidWdCb3JkZXJXaWR0aDsKICAgICBGaWx0ZXJPcGVyYXRpb25zIGZpbHRlcnM7CiAgICAgVGV4 dHVyZU1hcHBlckFuaW1hdGlvbnMgYW5pbWF0aW9uczsKICAgICBWZWN0b3I8dWludDMyX3Q+IGNo aWxkcmVuOwpAQCAtMTU0LDYgKzE2Miw3IEBAIHN0cnVjdCBDb29yZGluYXRlZEdyYXBoaWNzTGF5 ZXJTdGF0ZSB7CiAgICAgQ29vcmRpbmF0ZWRMYXllcklEIHJlcGxpY2E7CiAgICAgQ29vcmRpbmF0 ZWRMYXllcklEIG1hc2s7CiAgICAgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmdJRCBpbWFnZUlEOwor ICAgIERlYnVnVmlzdWFscyBkZWJ1Z1Zpc3VhbHM7CiAKICAgICB1bnNpZ25lZCByZXBhaW50Q291 bnQ7CiAgICAgVmVjdG9yPFRpbGVVcGRhdGVJbmZvPiB0aWxlc1RvVXBkYXRlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRH cmFwaGljc0FyZ3VtZW50Q29kZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGlu YXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NBcmd1bWVudENvZGVycy5jcHAKaW5kZXgg ZjkyMzlkNjVmZWJkNWZiZGY4MjQwZGU0NWZhYzgzZDRiMGNmNjY3NS4uZTY4MjAyZGRhMTllNDA2 ZTYwODEwN2Q2N2YyMWMzMmYyOGYzYmUzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0FyZ3VtZW50Q29kZXJz LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29y ZGluYXRlZEdyYXBoaWNzQXJndW1lbnRDb2RlcnMuY3BwCkBAIC0yLDYgKzIsNyBAQAogICogQ29w eXJpZ2h0IChDKSAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHly aWdodCAoQykgMjAxMiBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWll cykKICAqIENvcHlyaWdodCAoQykgMjAxMiBDb21wYW55IDEwMCwgSW5jLgorICogQ29weXJpZ2h0 IChDKSAyMDE3IFNvbnkgSW50ZXJhY3RpdmUgRW50ZXJ0YWlubWVudCBJbmMuCiAgKgogICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTY0NSwxMSArNjQ2LDggQEAgdm9pZCBBcmd1bWVudENv ZGVyPENvb3JkaW5hdGVkR3JhcGhpY3NMYXllclN0YXRlPjo6ZW5jb2RlKEVuY29kZXImIGVuY29k ZXIsIGNvbnMKICAgICBpZiAoc3RhdGUuc29saWRDb2xvckNoYW5nZWQpCiAgICAgICAgIGVuY29k ZXIgPDwgc3RhdGUuc29saWRDb2xvcjsKIAotICAgIGlmIChzdGF0ZS5kZWJ1Z0JvcmRlckNvbG9y Q2hhbmdlZCkKLSAgICAgICAgZW5jb2RlciA8PCBzdGF0ZS5kZWJ1Z0JvcmRlckNvbG9yOwotCi0g ICAgaWYgKHN0YXRlLmRlYnVnQm9yZGVyV2lkdGhDaGFuZ2VkKQotICAgICAgICBlbmNvZGVyIDw8 IHN0YXRlLmRlYnVnQm9yZGVyV2lkdGg7CisgICAgaWYgKHN0YXRlLmRlYnVnVmlzdWFsc0NoYW5n ZWQpCisgICAgICAgIGVuY29kZXIgPDwgc3RhdGUuZGVidWdWaXN1YWxzOwogCiAgICAgaWYgKHN0 YXRlLmZpbHRlcnNDaGFuZ2VkKQogICAgICAgICBlbmNvZGVyIDw8IHN0YXRlLmZpbHRlcnM7CkBA IC03MjAsMTAgKzcxOCw3IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxDb29yZGluYXRlZEdyYXBoaWNz TGF5ZXJTdGF0ZT46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBDb29yCiAgICAgaWYgKHN0YXRl LnNvbGlkQ29sb3JDaGFuZ2VkICYmICFkZWNvZGVyLmRlY29kZShzdGF0ZS5zb2xpZENvbG9yKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKHN0YXRlLmRlYnVnQm9yZGVyQ29sb3JD aGFuZ2VkICYmICFkZWNvZGVyLmRlY29kZShzdGF0ZS5kZWJ1Z0JvcmRlckNvbG9yKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKHN0YXRlLmRlYnVnQm9yZGVyV2lkdGhDaGFuZ2Vk ICYmICFkZWNvZGVyLmRlY29kZShzdGF0ZS5kZWJ1Z0JvcmRlcldpZHRoKSkKKyAgICBpZiAoc3Rh dGUuZGVidWdWaXN1YWxzQ2hhbmdlZCAmJiAhZGVjb2Rlci5kZWNvZGUoc3RhdGUuZGVidWdWaXN1 YWxzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKHN0YXRlLmZpbHRlcnNDaGFu Z2VkICYmICFkZWNvZGVyLmRlY29kZShzdGF0ZS5maWx0ZXJzKSkKQEAgLTkxNSw2ICs5MTAsMjcg QEAgYm9vbCBBcmd1bWVudENvZGVyPENvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZT46OmRlY29kZShE ZWNvZGVyJiBkZWNvZGVyLCBDb29yZGluYXQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAordm9pZCBB cmd1bWVudENvZGVyPERlYnVnVmlzdWFscz46OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyLCBjb25z dCBEZWJ1Z1Zpc3VhbHMmIGRlYnVnVmlzdWFscykKK3sKKyAgICBlbmNvZGVyIDw8IGRlYnVnVmlz dWFscy5kZWJ1Z0JvcmRlckNvbG9yOworICAgIGVuY29kZXIgPDwgZGVidWdWaXN1YWxzLmRlYnVn Qm9yZGVyV2lkdGg7CisgICAgZW5jb2RlciA8PCBkZWJ1Z1Zpc3VhbHMuZmxhZ3M7Cit9CisKK2Jv b2wgQXJndW1lbnRDb2RlcjxEZWJ1Z1Zpc3VhbHM+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2Rlciwg RGVidWdWaXN1YWxzJiBkZWJ1Z1Zpc3VhbHMpCit7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShk ZWJ1Z1Zpc3VhbHMuZGVidWdCb3JkZXJDb2xvcikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIGlmICghZGVjb2Rlci5kZWNvZGUoZGVidWdWaXN1YWxzLmRlYnVnQm9yZGVyV2lkdGgpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGRlYnVnVmlz dWFscy5mbGFncykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiB0cnVlOwor fQorCiB9IC8vIG5hbWVzcGFjZSBJUEMKIAogI2VuZGlmIC8vIFVTRShDT09SRElOQVRFRF9HUkFQ SElDUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBo aWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NBcmd1bWVudENvZGVycy5oIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0FyZ3VtZW50Q29k ZXJzLmgKaW5kZXggZGQwYzEwYjU5MDZlNWFmZDA2YzdhNDY0MmQwMTlhNzZlZDhmMTdkZC4uMWE5 NjQzOWFlMjk5MGIzY2QyZTA2ZTYxZGI2NDZjZmU0ZWEwNGEzNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0Fy Z3VtZW50Q29kZXJzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3Jh cGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0FyZ3VtZW50Q29kZXJzLmgKQEAgLTIsNiArMiw3IEBA CiAgKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEyIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMg c3Vic2lkaWFyeSgtaWVzKQogICogQ29weXJpZ2h0IChDKSAyMDEyIENvbXBhbnkgMTAwLCBJbmMu CisgKiBDb3B5cmlnaHQgKEMpIDIwMTcgU29ueSBJbnRlcmFjdGl2ZSBFbnRlcnRhaW5tZW50IElu Yy4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDMsNiArNDQsNyBAQCBzdHJ1 Y3QgVGlsZVVwZGF0ZUluZm87CiBjbGFzcyBUcmFuc2Zvcm1hdGlvbk1hdHJpeDsKIGNsYXNzIFRy YW5zZm9ybU9wZXJhdGlvbnM7CiBzdHJ1Y3QgTGVuZ3RoOworc3RydWN0IERlYnVnVmlzdWFsczsK IAogY2xhc3MgRmlsdGVyT3BlcmF0aW9uczsKIH0KQEAgLTk0LDYgKzk2LDExIEBAIHRlbXBsYXRl PD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc1N0YXRl PiB7CiAgICAgc3RhdGljIGJvb2wgZGVjb2RlKERlY29kZXImLCBXZWJDb3JlOjpDb29yZGluYXRl ZEdyYXBoaWNzU3RhdGUmKTsKIH07CiAKK3RlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8 V2ViQ29yZTo6RGVidWdWaXN1YWxzPiB7CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEVuY29kZXIm LCBjb25zdCBXZWJDb3JlOjpEZWJ1Z1Zpc3VhbHMmKTsKKyAgICBzdGF0aWMgYm9vbCBkZWNvZGUo RGVjb2RlciYsIFdlYkNvcmU6OkRlYnVnVmlzdWFscyYpOworfTsKKwogfSAvLyBuYW1lc3BhY2Ug SVBDCiAKICNlbmRpZiAvLyBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBo aWNzU2NlbmUuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcAppbmRleCAzNGM3OGJjNzU2MGY3MDU0ODZmMzY5 Y2RlNTM3MDVmYjZmZmNlZWQ4Li40MDA2NTU4Njc1YTMyYTllMzdjOTkxYWYyYTI2ZDY3OGEzMGM3 NWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGlj cy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5jcHAKQEAgLTEs NiArMSw3IEBACiAvKgogICAgIENvcHlyaWdodCAoQykgMjAxMiBOb2tpYSBDb3Jwb3JhdGlvbiBh bmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKICAgICBDb3B5cmlnaHQgKEMpIDIwMTIgQ29tcGFu eSAxMDAsIEluYy4KKyAgICBDb3B5cmlnaHQgKEMpIDIwMTcgU29ueSBJbnRlcmFjdGl2ZSBFbnRl cnRhaW5tZW50IEluYy4KIAogICAgIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1z IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtMjMyLDggKzIzMyw4IEBAIHZv aWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpzZXRMYXllclN0YXRlKENvb3JkaW5hdGVkTGF5 ZXJJRCBpZCwgY29uc3QgQ29vcmRpCiAgICAgaWYgKGxheWVyU3RhdGUuc29saWRDb2xvckNoYW5n ZWQpCiAgICAgICAgIGxheWVyLT5zZXRTb2xpZENvbG9yKGxheWVyU3RhdGUuc29saWRDb2xvcik7 CiAKLSAgICBpZiAobGF5ZXJTdGF0ZS5kZWJ1Z0JvcmRlckNvbG9yQ2hhbmdlZCB8fCBsYXllclN0 YXRlLmRlYnVnQm9yZGVyV2lkdGhDaGFuZ2VkKQotICAgICAgICBsYXllci0+c2V0RGVidWdWaXN1 YWxzKGxheWVyU3RhdGUuc2hvd0RlYnVnQm9yZGVycywgbGF5ZXJTdGF0ZS5kZWJ1Z0JvcmRlckNv bG9yLCBsYXllclN0YXRlLmRlYnVnQm9yZGVyV2lkdGgsIGxheWVyU3RhdGUuc2hvd1JlcGFpbnRD b3VudGVyKTsKKyAgICBpZiAobGF5ZXJTdGF0ZS5kZWJ1Z1Zpc3VhbHNDaGFuZ2VkKQorICAgICAg ICBsYXllci0+c2V0RGVidWdWaXN1YWxzKGxheWVyU3RhdGUuZGVidWdWaXN1YWxzLnNob3dEZWJ1 Z0JvcmRlcnMsIGxheWVyU3RhdGUuZGVidWdWaXN1YWxzLmRlYnVnQm9yZGVyQ29sb3IsIGxheWVy U3RhdGUuZGVidWdWaXN1YWxzLmRlYnVnQm9yZGVyV2lkdGgsIGxheWVyU3RhdGUuZGVidWdWaXN1 YWxzLnNob3dSZXBhaW50Q291bnRlcik7CiAKICAgICBpZiAobGF5ZXJTdGF0ZS5yZXBsaWNhQ2hh bmdlZCkKICAgICAgICAgbGF5ZXItPnNldFJlcGxpY2FMYXllcihnZXRMYXllckJ5SURJZkV4aXN0 cyhsYXllclN0YXRlLnJlcGxpY2EpKTsK