133646 2014-06-09 10:14:14 -0700 REGRESSION (r169681): Three tests are broken 2015-08-18 08:44:45 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 133612 1 ap ap commit-queue esprehn+autocc glenn kondapallykalyan zalan oldest_to_newest 1014123 0 ap 2014-06-09 10:14:14 -0700 <http://trac.webkit.org/changeset/169681> broke three tests on Mountain Lion and Mavericks: compositing/geometry/ancestor-overflow-change.html compositing/layer-creation/overlap-animation-container.html platform/mac-wk2/tiled-drawing/fixed/absolute-inside-fixed.html 1014125 1 232709 ap 2014-06-09 10:20:37 -0700 Created attachment 232709 proposed fix 1014126 2 commit-queue 2014-06-09 10:22:55 -0700 Attachment 232709 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderThemeMac.h:125: Missing space before { [whitespace/braces] [5] ERROR: Source/WebCore/rendering/RenderThemeMac.h:166: Missing space before { [whitespace/braces] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1014160 3 232709 thorton 2014-06-09 11:38:26 -0700 Comment on attachment 232709 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=232709&action=review > Source/WebCore/rendering/RenderThemeMac.mm:305 > +int RenderThemeMac::platformFocusRingMaxWidth() const should we rename this to be platformFocusRingMinWidth, since it is max'd with the actual width? 1014164 4 ap 2014-06-09 11:45:06 -0700 Committed <http://trac.webkit.org/r169699> 1118519 5 zalan 2015-08-18 08:44:45 -0700 FYI: http://trac.webkit.org/changeset/188577 232709 2014-06-09 10:20:37 -0700 2014-06-09 11:38:26 -0700 proposed fix FocusRing.txt text/plain 16860 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTY5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE0LTA2LTA5ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxNjk2 ODEpOiBUaHJlZSB0ZXN0cyBhcmUgYnJva2VuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM2NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICByMTY5NjgxIHJlbW92ZWQgcGxhdGZvcm1Gb2N1c1JpbmdNYXhX aWR0aCgpIG92ZXJyaWRlLCB3aGljaCByZXR1cm5lZCBlaXRoZXIgMCBvciA5CisgICAgICAgIG9u IE1hYy4gQnV0IHRoZSBjcm9zcy1wbGF0Zm9ybSBkZWZhdWx0IGlzIDMsIHNvIHRoaXMgY2hhbmdl ZCBNYWMgYmVoYXZpb3IuCisKKyAgICAgICAgSSdtIG5vdCBlbnRpcmVseSBzdXJlIHdoeSB0aGUg Y3Jvc3MtcGxhdGZvcm0gZGVmYXVsdCBpcyAzIChpdCB3YXMgYWxzbyBhZGRlZCBpbiByMTY4Mzk3 KSwKKyAgICAgICAgYnV0IHJlc3RvcmluZyB0aGUgb3ZlcnJpZGUgdG8gcmV0dXJuIDAgZml4ZXMg dGVzdCBjYXNlcy4KKworICAgICAgICBXaGlsZSBhdCBpdCwgYWxzbyBhZGRlZCBmaW5hbC9vdmVy cmlkZSwgYW5kIHJlbW92ZWQgc29tZSBmdW5jdGlvbnMgdGhhdCB3ZXJlIG9ubHkKKyAgICAgICAg bmVlZGVkIGJ5IHN1YmNsYXNzZXMsIHdoaWNoIHdlIG5vdyBoYXZlIG5vbmUuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRo ZW1lTWFjOjpzdXBwb3J0c0NvbnRyb2xUaW50cyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUaGVtZU1hYzo6c2Nyb2xsYmFyQ29udHJvbFNpemVGb3JQYXJ0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjpzdXBwb3J0c1NlbGVjdGlvbkZvcmVn cm91bmRDb2xvcnMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6 OnN1cHBvcnRzQ2xvc2VkQ2FwdGlvbmluZyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZU1hYzo6dXBkYXRlQWN0aXZlU3RhdGUpOiBEZWxldGVkLgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l TWFjOjpwbGF0Zm9ybUZvY3VzUmluZ01heFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lTWFjOjpzZXRQb3B1cEJ1dHRvbkNlbGxTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZU1hYzo6cGFpbnRTbGlkZXJUaHVtYik6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZU1hYzo6c2V0U2VhcmNoQ2VsbFN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lTWFjOjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lTWFjOjpwYWludFNlYXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjpwYWludFNlYXJjaEZpZWxkUmVz dWx0c0J1dHRvbik6CisKIDIwMTQtMDYtMDkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSBHYXBzIGJlbG93IGFuZCB0byB0aGUgcmlnaHQgb2YgdGhlIHZp ZGVvIGNvbnRyb2xzIG9uIGRldm91ci5jb20KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZU1hYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZU1hYy5oCShyZXZpc2lvbiAxNjk2OTApCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMuaAkod29ya2luZyBjb3B5KQpAQCAtMzksNDkgKzM5LDUw IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFJlbmRlclByb2dyZXNzOwogY2xhc3MgUmVu ZGVyU3R5bGU7CiAKLWNsYXNzIFJlbmRlclRoZW1lTWFjIDogcHVibGljIFJlbmRlclRoZW1lIHsK K2NsYXNzIFJlbmRlclRoZW1lTWFjIGZpbmFsIDogcHVibGljIFJlbmRlclRoZW1lIHsKIHB1Ymxp YzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxSZW5kZXJUaGVtZT4gY3JlYXRlKCk7CiAKICAgICAv LyBBIG1ldGhvZCBhc2tpbmcgaWYgdGhlIGNvbnRyb2wgY2hhbmdlcyBpdHMgdGludCB3aGVuIHRo ZSB3aW5kb3cgaGFzIGZvY3VzIG9yIG5vdC4KLSAgICB2aXJ0dWFsIGJvb2wgY29udHJvbFN1cHBv cnRzVGludHMoY29uc3QgUmVuZGVyT2JqZWN0JikgY29uc3Q7CisgICAgdmlydHVhbCBib29sIGNv bnRyb2xTdXBwb3J0c1RpbnRzKGNvbnN0IFJlbmRlck9iamVjdCYpIGNvbnN0IG92ZXJyaWRlOwog CiAgICAgLy8gQSBnZW5lcmFsIG1ldGhvZCBhc2tpbmcgaWYgYW55IGNvbnRyb2wgdGludGluZyBp cyBzdXBwb3J0ZWQgYXQgYWxsLgotICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0NvbnRyb2xUaW50 cygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNDb250 cm9sVGludHMoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAKICAgICB2aXJ0dWFs IHZvaWQgYWRqdXN0UmVwYWludFJlY3QoY29uc3QgUmVuZGVyT2JqZWN0JiwgSW50UmVjdCYpIG92 ZXJyaWRlOwogCi0gICAgdmlydHVhbCBib29sIGlzQ29udHJvbFN0eWxlZChjb25zdCBSZW5kZXJT dHlsZSosIGNvbnN0IEJvcmRlckRhdGEmLCBjb25zdCBGaWxsTGF5ZXImLCBjb25zdCBDb2xvciYg YmFja2dyb3VuZENvbG9yKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgaXNDb250cm9sU3R5bGVk KGNvbnN0IFJlbmRlclN0eWxlKiwgY29uc3QgQm9yZGVyRGF0YSYsIGNvbnN0IEZpbGxMYXllciYs IGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IpIGNvbnN0IG92ZXJyaWRlOwogCi0gICAgdmly dHVhbCBDb2xvciBwbGF0Zm9ybUFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpIGNvbnN0 OwotICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1JbmFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRD b2xvcigpIGNvbnN0OwotICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1BY3RpdmVMaXN0Qm94U2Vs ZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29uc3Q7Ci0gICAgdmlydHVhbCBDb2xvciBwbGF0Zm9y bUFjdGl2ZUxpc3RCb3hTZWxlY3Rpb25Gb3JlZ3JvdW5kQ29sb3IoKSBjb25zdDsKLSAgICB2aXJ0 dWFsIENvbG9yIHBsYXRmb3JtSW5hY3RpdmVMaXN0Qm94U2VsZWN0aW9uQmFja2dyb3VuZENvbG9y KCkgY29uc3Q7Ci0gICAgdmlydHVhbCBDb2xvciBwbGF0Zm9ybUluYWN0aXZlTGlzdEJveFNlbGVj dGlvbkZvcmVncm91bmRDb2xvcigpIGNvbnN0OwotICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1G b2N1c1JpbmdDb2xvcigpIGNvbnN0OworICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1BY3RpdmVT ZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIENv bG9yIHBsYXRmb3JtSW5hY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCBvdmVy cmlkZTsKKyAgICB2aXJ0dWFsIENvbG9yIHBsYXRmb3JtQWN0aXZlTGlzdEJveFNlbGVjdGlvbkJh Y2tncm91bmRDb2xvcigpIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZv cm1BY3RpdmVMaXN0Qm94U2VsZWN0aW9uRm9yZWdyb3VuZENvbG9yKCkgY29uc3Qgb3ZlcnJpZGU7 CisgICAgdmlydHVhbCBDb2xvciBwbGF0Zm9ybUluYWN0aXZlTGlzdEJveFNlbGVjdGlvbkJhY2tn cm91bmRDb2xvcigpIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1J bmFjdGl2ZUxpc3RCb3hTZWxlY3Rpb25Gb3JlZ3JvdW5kQ29sb3IoKSBjb25zdCBvdmVycmlkZTsK KyAgICB2aXJ0dWFsIENvbG9yIHBsYXRmb3JtRm9jdXNSaW5nQ29sb3IoKSBjb25zdCBvdmVycmlk ZTsKKyAgICB2aXJ0dWFsIGludCBwbGF0Zm9ybUZvY3VzUmluZ01heFdpZHRoKCkgY29uc3Qgb3Zl cnJpZGU7CiAKLSAgICB2aXJ0dWFsIFNjcm9sbGJhckNvbnRyb2xTaXplIHNjcm9sbGJhckNvbnRy b2xTaXplRm9yUGFydChDb250cm9sUGFydCkgeyByZXR1cm4gU21hbGxTY3JvbGxiYXI7IH0KKyAg ICB2aXJ0dWFsIFNjcm9sbGJhckNvbnRyb2xTaXplIHNjcm9sbGJhckNvbnRyb2xTaXplRm9yUGFy dChDb250cm9sUGFydCkgb3ZlcnJpZGUgeyByZXR1cm4gU21hbGxTY3JvbGxiYXI7IH0KIAotICAg IHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNvbG9yc0RpZENoYW5nZSgpOworICAgIHZpcnR1YWwgdm9p ZCBwbGF0Zm9ybUNvbG9yc0RpZENoYW5nZSgpIG92ZXJyaWRlOwogCiAgICAgLy8gU3lzdGVtIGZv bnRzLgotICAgIHZpcnR1YWwgdm9pZCBzeXN0ZW1Gb250KENTU1ZhbHVlSUQsIEZvbnREZXNjcmlw dGlvbiYpIGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCBzeXN0ZW1Gb250KENTU1ZhbHVlSUQsIEZv bnREZXNjcmlwdGlvbiYpIGNvbnN0IG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCBpbnQgbWluaW11 bU1lbnVMaXN0U2l6ZShSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIHZpcnR1YWwgaW50IG1pbmlt dW1NZW51TGlzdFNpemUoUmVuZGVyU3R5bGUqKSBjb25zdCBvdmVycmlkZTsKIAotICAgIHZpcnR1 YWwgdm9pZCBhZGp1c3RTbGlkZXJUaHVtYlNpemUoUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29u c3Q7CisgICAgdmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJTdHlsZSos IEVsZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKIAogI2lmIEVOQUJMRShEQVRBTElTVF9FTEVNRU5U KQogICAgIHZpcnR1YWwgSW50U2l6ZSBzbGlkZXJUaWNrU2l6ZSgpIGNvbnN0IG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgaW50IHNsaWRlclRpY2tPZmZzZXRGcm9tVHJhY2tDZW50ZXIoKSBjb25zdCBv dmVycmlkZTsKICNlbmRpZgogCi0gICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdM ZWZ0KFJlbmRlclN0eWxlKikgY29uc3Q7Ci0gICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBh ZGRpbmdSaWdodChSZW5kZXJTdHlsZSopIGNvbnN0OwotICAgIHZpcnR1YWwgaW50IHBvcHVwSW50 ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3Q7Ci0gICAgdmlydHVhbCBpbnQgcG9w dXBJbnRlcm5hbFBhZGRpbmdCb3R0b20oUmVuZGVyU3R5bGUqKSBjb25zdDsKLSAgICB2aXJ0dWFs IFBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplIHBvcHVwTWVudVNpemUoY29uc3QgUmVuZGVy U3R5bGUqLCBJbnRSZWN0JikgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBh ZGRpbmdMZWZ0KFJlbmRlclN0eWxlKikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBpbnQg cG9wdXBJbnRlcm5hbFBhZGRpbmdSaWdodChSZW5kZXJTdHlsZSopIGNvbnN0IG92ZXJyaWRlOwor ICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29u c3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdCb3R0b20o UmVuZGVyU3R5bGUqKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFBvcHVwTWVudVN0eWxl OjpQb3B1cE1lbnVTaXplIHBvcHVwTWVudVNpemUoY29uc3QgUmVuZGVyU3R5bGUqLCBJbnRSZWN0 JikgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRDYXBzTG9ja0luZGlj YXRvcihjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0 Jikgb3ZlcnJpZGU7CiAKQEAgLTg5LDI1ICs5MCwyNCBAQCBwdWJsaWM6CiAKICNpZiBFTkFCTEUo TUVURVJfRUxFTUVOVCkKICAgICB2aXJ0dWFsIEludFNpemUgbWV0ZXJTaXplRm9yQm91bmRzKGNv bnN0IFJlbmRlck1ldGVyKiwgY29uc3QgSW50UmVjdCYpIGNvbnN0IG92ZXJyaWRlOwotICAgIHZp cnR1YWwgYm9vbCBwYWludE1ldGVyKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5m byYsIGNvbnN0IEludFJlY3QmKTsKLSAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNNZXRlcihDb250 cm9sUGFydCkgY29uc3Q7CisgICAgdmlydHVhbCBib29sIHBhaW50TWV0ZXIoY29uc3QgUmVuZGVy T2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpIG92ZXJyaWRlOworICAg IHZpcnR1YWwgYm9vbCBzdXBwb3J0c01ldGVyKENvbnRyb2xQYXJ0KSBjb25zdCBvdmVycmlkZTsK ICNlbmRpZgogCiAjaWYgRU5BQkxFKFBST0dSRVNTX0VMRU1FTlQpCiAgICAgLy8gUmV0dXJucyB0 aGUgcmVwZWF0IGludGVydmFsIG9mIHRoZSBhbmltYXRpb24gZm9yIHRoZSBwcm9ncmVzcyBiYXIu Ci0gICAgdmlydHVhbCBkb3VibGUgYW5pbWF0aW9uUmVwZWF0SW50ZXJ2YWxGb3JQcm9ncmVzc0Jh cihSZW5kZXJQcm9ncmVzcyopIGNvbnN0OworICAgIHZpcnR1YWwgZG91YmxlIGFuaW1hdGlvblJl cGVhdEludGVydmFsRm9yUHJvZ3Jlc3NCYXIoUmVuZGVyUHJvZ3Jlc3MqKSBjb25zdCBvdmVycmlk ZTsKICAgICAvLyBSZXR1cm5zIHRoZSBkdXJhdGlvbiBvZiB0aGUgYW5pbWF0aW9uIGZvciB0aGUg cHJvZ3Jlc3MgYmFyLgotICAgIHZpcnR1YWwgZG91YmxlIGFuaW1hdGlvbkR1cmF0aW9uRm9yUHJv Z3Jlc3NCYXIoUmVuZGVyUHJvZ3Jlc3MqKSBjb25zdDsKKyAgICB2aXJ0dWFsIGRvdWJsZSBhbmlt YXRpb25EdXJhdGlvbkZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzKikgY29uc3Qgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCBJbnRSZWN0IHByb2dyZXNzQmFyUmVjdEZvckJvdW5kcyhjb25zdCBS ZW5kZXJPYmplY3QmLCBjb25zdCBJbnRSZWN0JikgY29uc3Qgb3ZlcnJpZGU7CiAjZW5kaWYKIAot ICAgIHZpcnR1YWwgQ29sb3Igc3lzdGVtQ29sb3IoQ1NTVmFsdWVJRCkgY29uc3Q7CisgICAgdmly dHVhbCBDb2xvciBzeXN0ZW1Db2xvcihDU1NWYWx1ZUlEKSBjb25zdCBvdmVycmlkZTsKICAgICAv LyBDb250cm9scyBjb2xvciB2YWx1ZXMgcmV0dXJuZWQgZnJvbSBwbGF0Zm9ybUZvY3VzUmluZ0Nv bG9yKCkuIHN5c3RlbUNvbG9yKCkgd2lsbCBiZSB1c2VkIHdoZW4gZmFsc2UuCi0gICAgdmlydHVh bCBib29sIHVzZXNUZXN0TW9kZUZvY3VzUmluZ0NvbG9yKCkgY29uc3Q7Ci0gICAgLy8gQSB2aWV3 IGFzc29jaWF0ZWQgdG8gdGhlIGNvbnRhaW5lZCBkb2N1bWVudC4gU3ViY2xhc3NlcyBtYXkgbm90 IGhhdmUgc3VjaCBhIHZpZXcgYW5kIHJldHVybiBhIGZha2UuCisgICAgYm9vbCB1c2VzVGVzdE1v ZGVGb2N1c1JpbmdDb2xvcigpIGNvbnN0OworICAgIC8vIEEgdmlldyBhc3NvY2lhdGVkIHRvIHRo ZSBjb250YWluZWQgZG9jdW1lbnQuCiAgICAgTlNWaWV3KiBkb2N1bWVudFZpZXdGb3IoY29uc3Qg UmVuZGVyT2JqZWN0JikgY29uc3Q7CiAKLQogcHJvdGVjdGVkOgogICAgIFJlbmRlclRoZW1lTWFj KCk7CiAgICAgdmlydHVhbCB+UmVuZGVyVGhlbWVNYWMoKTsKQEAgLTEyMiw1MyArMTIyLDUzIEBA IHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIFN0cmluZyBpbWFnZUNvbnRyb2xzU3R5bGVTaGVldCgp IGNvbnN0IG92ZXJyaWRlOwogI2VuZGlmCiAKLSAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNTZWxl Y3Rpb25Gb3JlZ3JvdW5kQ29sb3JzKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0 dWFsIGJvb2wgc3VwcG9ydHNTZWxlY3Rpb25Gb3JlZ3JvdW5kQ29sb3JzKCkgY29uc3QgIG92ZXJy aWRleyByZXR1cm4gZmFsc2U7IH0KIAotICAgIHZpcnR1YWwgYm9vbCBwYWludFRleHRGaWVsZChj b25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBGbG9hdFJlY3QmKTsK LSAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0VGV4dEZpZWxkU3R5bGUoU3R5bGVSZXNvbHZlciosIFJl bmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBwYWludFRleHRG aWVsZChjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBGbG9hdFJl Y3QmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0VGV4dEZpZWxkU3R5bGUoU3R5 bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0IG92ZXJyaWRlOwogCi0g ICAgdmlydHVhbCBib29sIHBhaW50VGV4dEFyZWEoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3Qg UGFpbnRJbmZvJiwgY29uc3QgRmxvYXRSZWN0Jik7Ci0gICAgdmlydHVhbCB2b2lkIGFkanVzdFRl eHRBcmVhU3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0 OworICAgIHZpcnR1YWwgYm9vbCBwYWludFRleHRBcmVhKGNvbnN0IFJlbmRlck9iamVjdCYsIGNv bnN0IFBhaW50SW5mbyYsIGNvbnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwg dm9pZCBhZGp1c3RUZXh0QXJlYVN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSosIEVs ZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgYm9vbCBwYWludE1lbnVMaXN0 KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsK LSAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0TWVudUxpc3RTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVu ZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Q7CisgICAgdmlydHVhbCBib29sIHBhaW50TWVudUxp c3QoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYp IG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RNZW51TGlzdFN0eWxlKFN0eWxlUmVz b2x2ZXIqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKIAotICAgIHZp cnR1YWwgYm9vbCBwYWludE1lbnVMaXN0QnV0dG9uRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyT2Jq ZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgRmxvYXRSZWN0Jik7Ci0gICAgdmlydHVhbCB2 b2lkIGFkanVzdE1lbnVMaXN0QnV0dG9uU3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxl KiwgRWxlbWVudCopIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBwYWludE1lbnVMaXN0QnV0dG9u RGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3Qg RmxvYXRSZWN0Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGFkanVzdE1lbnVMaXN0QnV0 dG9uU3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0IG92 ZXJyaWRlOwogCiAjaWYgRU5BQkxFKFBST0dSRVNTX0VMRU1FTlQpCi0gICAgdmlydHVhbCB2b2lk IGFkanVzdFByb2dyZXNzQmFyU3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxl bWVudCopIGNvbnN0OwotICAgIHZpcnR1YWwgYm9vbCBwYWludFByb2dyZXNzQmFyKGNvbnN0IFJl bmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKKyAgICB2aXJ0 dWFsIHZvaWQgYWRqdXN0UHJvZ3Jlc3NCYXJTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5 bGUqLCBFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIHBhaW50UHJv Z3Jlc3NCYXIoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50 UmVjdCYpIG92ZXJyaWRlOwogI2VuZGlmCiAKLSAgICB2aXJ0dWFsIGJvb2wgcGFpbnRTbGlkZXJU cmFjayhjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0 Jik7Ci0gICAgdmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRyYWNrU3R5bGUoU3R5bGVSZXNvbHZl ciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBwYWlu dFNsaWRlclRyYWNrKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0 IEludFJlY3QmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2xpZGVyVHJhY2tT dHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Qgb3ZlcnJp ZGU7CiAKLSAgICB2aXJ0dWFsIGJvb2wgcGFpbnRTbGlkZXJUaHVtYihjb25zdCBSZW5kZXJPYmpl Y3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7Ci0gICAgdmlydHVhbCB2b2lk IGFkanVzdFNsaWRlclRodW1iU3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxl bWVudCopIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBwYWludFNsaWRlclRodW1iKGNvbnN0IFJl bmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlkZTsK KyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2xpZGVyVGh1bWJTdHlsZShTdHlsZVJlc29sdmVyKiwg UmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0dWFsIGJv b2wgcGFpbnRTZWFyY2hGaWVsZChjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8m LCBjb25zdCBJbnRSZWN0Jik7Ci0gICAgdmlydHVhbCB2b2lkIGFkanVzdFNlYXJjaEZpZWxkU3R5 bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OworICAgIHZp cnR1YWwgYm9vbCBwYWludFNlYXJjaEZpZWxkKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBh aW50SW5mbyYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRq dXN0U2VhcmNoRmllbGRTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50 KikgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2VhcmNoRmllbGRD YW5jZWxCdXR0b25TdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50Kikg Y29uc3Q7Ci0gICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGRDYW5jZWxCdXR0b24oY29u c3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOworICAg IHZpcnR1YWwgdm9pZCBhZGp1c3RTZWFyY2hGaWVsZENhbmNlbEJ1dHRvblN0eWxlKFN0eWxlUmVz b2x2ZXIqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0 dWFsIGJvb2wgcGFpbnRTZWFyY2hGaWVsZENhbmNlbEJ1dHRvbihjb25zdCBSZW5kZXJPYmplY3Qm LCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jikgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0 dWFsIHZvaWQgYWRqdXN0U2VhcmNoRmllbGREZWNvcmF0aW9uUGFydFN0eWxlKFN0eWxlUmVzb2x2 ZXIqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdDsKLSAgICB2aXJ0dWFsIGJvb2wgcGFp bnRTZWFyY2hGaWVsZERlY29yYXRpb25QYXJ0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBh aW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2VhcmNo RmllbGREZWNvcmF0aW9uUGFydFN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSosIEVs ZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgcGFpbnRTZWFyY2hGaWVs ZERlY29yYXRpb25QYXJ0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNv bnN0IEludFJlY3QmKSBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RTZWFyY2hG aWVsZFJlc3VsdHNEZWNvcmF0aW9uUGFydFN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHls ZSosIEVsZW1lbnQqKSBjb25zdDsKLSAgICB2aXJ0dWFsIGJvb2wgcGFpbnRTZWFyY2hGaWVsZFJl c3VsdHNEZWNvcmF0aW9uUGFydChjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8m LCBjb25zdCBJbnRSZWN0Jik7CisgICAgdmlydHVhbCB2b2lkIGFkanVzdFNlYXJjaEZpZWxkUmVz dWx0c0RlY29yYXRpb25QYXJ0U3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxl bWVudCopIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgYm9vbCBwYWludFNlYXJjaEZpZWxk UmVzdWx0c0RlY29yYXRpb25QYXJ0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5m byYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RT ZWFyY2hGaWVsZFJlc3VsdHNCdXR0b25TdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUq LCBFbGVtZW50KikgY29uc3Q7Ci0gICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGRSZXN1 bHRzQnV0dG9uKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IElu dFJlY3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9u U3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0IG92ZXJy aWRlOworICAgIHZpcnR1YWwgYm9vbCBwYWludFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRvbihjb25z dCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jikgb3ZlcnJp ZGU7CiAKICNpZiBFTkFCTEUoVklERU8pCi0gICAgdmlydHVhbCBib29sIHN1cHBvcnRzQ2xvc2Vk Q2FwdGlvbmluZygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIGJvb2wgc3Vw cG9ydHNDbG9zZWRDYXB0aW9uaW5nKCkgY29uc3QgIG92ZXJyaWRleyByZXR1cm4gdHJ1ZTsgfQog I2VuZGlmCiAKLSAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU2hvd1BsYWNlaG9sZGVyV2hlbkZvY3Vz ZWQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU2hvd1BsYWNlaG9sZGVyV2hlbkZv Y3VzZWQoKSBjb25zdCBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgYm9vbCBwYWludFNuYXBzaG90 dGVkUGx1Z2luT3ZlcmxheShjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBj b25zdCBJbnRSZWN0Jik7CisgICAgdmlydHVhbCBib29sIHBhaW50U25hcHNob3R0ZWRQbHVnaW5P dmVybGF5KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJl Y3QmKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIFN0cmluZyBmaWxlTGlzdE5h bWVGb3JXaWR0aChjb25zdCBGaWxlTGlzdCosIGNvbnN0IEZvbnQmLCBpbnQgd2lkdGgsIGJvb2wg bXVsdGlwbGVGaWxlc0FsbG93ZWQpIGNvbnN0IG92ZXJyaWRlOwpAQCAtMTkxLDggKzE5MSw2IEBA IHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVFbmFibGVkU3RhdGUoTlNDZWxsKiwgY29uc3QgUmVu ZGVyT2JqZWN0Jik7CiAgICAgdm9pZCB1cGRhdGVGb2N1c2VkU3RhdGUoTlNDZWxsKiwgY29uc3Qg UmVuZGVyT2JqZWN0Jik7CiAgICAgdm9pZCB1cGRhdGVQcmVzc2VkU3RhdGUoTlNDZWxsKiwgY29u c3QgUmVuZGVyT2JqZWN0Jik7Ci0gICAgLy8gQW4gb3B0aW9uYWwgaG9vayBmb3Igc3ViY2xhc3Nl cyB0byB1cGRhdGUgdGhlIGNvbnRyb2wgdGludCBvZiBOU0NlbGwuCi0gICAgdmlydHVhbCB2b2lk IHVwZGF0ZUFjdGl2ZVN0YXRlKE5TQ2VsbCosIGNvbnN0IFJlbmRlck9iamVjdCYpIHsgfQogCiAg ICAgLy8gSGVscGVycyBmb3IgYWRqdXN0aW5nIGFwcGVhcmFuY2UgYW5kIGZvciBwYWludGluZwog CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCShyZXZp c2lvbiAxNjk2OTApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMu bW0JKHdvcmtpbmcgY29weSkKQEAgLTMwMiw2ICszMDIsMTEgQEAgQ29sb3IgUmVuZGVyVGhlbWVN YWM6OnBsYXRmb3JtRm9jdXNSaW5nQwogICAgIHJldHVybiBzeXN0ZW1Db2xvcihDU1NWYWx1ZVdl YmtpdEZvY3VzUmluZ0NvbG9yKTsKIH0KIAoraW50IFJlbmRlclRoZW1lTWFjOjpwbGF0Zm9ybUZv Y3VzUmluZ01heFdpZHRoKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMDsKK30KKwogQ29sb3IgUmVu ZGVyVGhlbWVNYWM6OnBsYXRmb3JtSW5hY3RpdmVMaXN0Qm94U2VsZWN0aW9uQmFja2dyb3VuZENv bG9yKCkgY29uc3QKIHsKICAgICByZXR1cm4gcGxhdGZvcm1JbmFjdGl2ZVNlbGVjdGlvbkJhY2tn cm91bmRDb2xvcigpOwpAQCAtMTQzNCw3ICsxNDM5LDYgQEAgdm9pZCBSZW5kZXJUaGVtZU1hYzo6 c2V0UG9wdXBCdXR0b25DZWxsUwogICAgIHNldENvbnRyb2xTaXplKHBvcHVwQnV0dG9uLCBwb3B1 cEJ1dHRvblNpemVzKCksIHIuc2l6ZSgpLCBvLnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKTsKIAog ICAgIC8vIFVwZGF0ZSB0aGUgdmFyaW91cyBzdGF0ZXMgd2UgcmVzcG9uZCB0by4KLSAgICB1cGRh dGVBY3RpdmVTdGF0ZShwb3B1cEJ1dHRvbiwgbyk7CiAgICAgdXBkYXRlQ2hlY2tlZFN0YXRlKHBv cHVwQnV0dG9uLCBvKTsKICAgICB1cGRhdGVFbmFibGVkU3RhdGUocG9wdXBCdXR0b24sIG8pOwog ICAgIHVwZGF0ZVByZXNzZWRTdGF0ZShwb3B1cEJ1dHRvbiwgbyk7CkBAIC0xNTE3LDcgKzE1MjEs NiBAQCBib29sIFJlbmRlclRoZW1lTWFjOjpwYWludFNsaWRlclRodW1iKGNvCiAgICAgTG9jYWxD dXJyZW50R3JhcGhpY3NDb250ZXh0IGxvY2FsQ29udGV4dChwYWludEluZm8uY29udGV4dCk7CiAK ICAgICAvLyBVcGRhdGUgdGhlIHZhcmlvdXMgc3RhdGVzIHdlIHJlc3BvbmQgdG8uCi0gICAgdXBk YXRlQWN0aXZlU3RhdGUoc2xpZGVyVGh1bWJDZWxsLCBvKTsKICAgICB1cGRhdGVFbmFibGVkU3Rh dGUoc2xpZGVyVGh1bWJDZWxsLCBvKTsKICAgICAgICAgRWxlbWVudCogZm9jdXNEZWxlZ2F0ZSA9 IChvLm5vZGUoKSAmJiBvLm5vZGUoKS0+aXNFbGVtZW50Tm9kZSgpKSA/IHRvRWxlbWVudChvLm5v ZGUoKSktPmZvY3VzRGVsZWdhdGUoKSA6IDA7CiAgICAgaWYgKGZvY3VzRGVsZWdhdGUpCkBAIC0x NjA2LDcgKzE2MDksNiBAQCB2b2lkIFJlbmRlclRoZW1lTWFjOjpzZXRTZWFyY2hDZWxsU3RhdGUo CiAgICAgW3NlYXJjaCBzZXRDb250cm9sU2l6ZTpjb250cm9sU2l6ZUZvckZvbnQoJm8uc3R5bGUo KSldOwogCiAgICAgLy8gVXBkYXRlIHRoZSB2YXJpb3VzIHN0YXRlcyB3ZSByZXNwb25kIHRvLgot ICAgIHVwZGF0ZUFjdGl2ZVN0YXRlKHNlYXJjaCwgbyk7CiAgICAgdXBkYXRlRW5hYmxlZFN0YXRl KHNlYXJjaCwgbyk7CiAgICAgdXBkYXRlRm9jdXNlZFN0YXRlKHNlYXJjaCwgbyk7CiB9CkBAIC0x NjcyLDEwICsxNjc0LDggQEAgYm9vbCBSZW5kZXJUaGVtZU1hYzo6cGFpbnRTZWFyY2hGaWVsZENh bgogCiAgICAgTlNTZWFyY2hGaWVsZENlbGwqIHNlYXJjaCA9IHRoaXMtPnNlYXJjaCgpOwogCi0g ICAgaWYgKCFpbnB1dC0+aXNEaXNhYmxlZEZvcm1Db250cm9sKCkgJiYgKGlucHV0LT5pc1RleHRG b3JtQ29udHJvbCgpICYmICF0b0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50KGlucHV0KS0+aXNS ZWFkT25seSgpKSkgewotICAgICAgICB1cGRhdGVBY3RpdmVTdGF0ZShbc2VhcmNoIGNhbmNlbEJ1 dHRvbkNlbGxdLCBvKTsKKyAgICBpZiAoIWlucHV0LT5pc0Rpc2FibGVkRm9ybUNvbnRyb2woKSAm JiAoaW5wdXQtPmlzVGV4dEZvcm1Db250cm9sKCkgJiYgIXRvSFRNTFRleHRGb3JtQ29udHJvbEVs ZW1lbnQoaW5wdXQpLT5pc1JlYWRPbmx5KCkpKQogICAgICAgICB1cGRhdGVQcmVzc2VkU3RhdGUo W3NlYXJjaCBjYW5jZWxCdXR0b25DZWxsXSwgbyk7Ci0gICAgfQogICAgIGVsc2UgaWYgKFtbc2Vh cmNoIGNhbmNlbEJ1dHRvbkNlbGxdIGlzSGlnaGxpZ2h0ZWRdKQogICAgICAgICBbW3NlYXJjaCBj YW5jZWxCdXR0b25DZWxsXSBzZXRIaWdobGlnaHRlZDpOT107CiAKQEAgLTE3NjgsOCArMTc2OCw2 IEBAIGJvb2wgUmVuZGVyVGhlbWVNYWM6OnBhaW50U2VhcmNoRmllbGRSZXMKICAgICBpZiAoW3Nl YXJjaCBzZWFyY2hNZW51VGVtcGxhdGVdICE9IG5pbCkKICAgICAgICAgW3NlYXJjaCBzZXRTZWFy Y2hNZW51VGVtcGxhdGU6bmlsXTsKIAotICAgIHVwZGF0ZUFjdGl2ZVN0YXRlKFtzZWFyY2ggc2Vh cmNoQnV0dG9uQ2VsbF0sIG8pOwotCiAgICAgRmxvYXRSZWN0IGxvY2FsQm91bmRzID0gW3NlYXJj aCBzZWFyY2hCdXR0b25SZWN0Rm9yQm91bmRzOk5TUmVjdChpbnB1dC0+cmVuZGVyQm94KCktPnBp eGVsU25hcHBlZEJvcmRlckJveFJlY3QoKSldOwogICAgIGxvY2FsQm91bmRzID0gY29udmVydFRv UGFpbnRpbmdSZWN0KCppbnB1dC0+cmVuZGVyZXIoKSwgbywgbG9jYWxCb3VuZHMsIHIpOwogCkBA IC0xODAwLDggKzE3OTgsNiBAQCBib29sIFJlbmRlclRoZW1lTWFjOjpwYWludFNlYXJjaEZpZWxk UmVzCiAKICAgICBOU1NlYXJjaEZpZWxkQ2VsbCogc2VhcmNoID0gdGhpcy0+c2VhcmNoKCk7CiAK LSAgICB1cGRhdGVBY3RpdmVTdGF0ZShbc2VhcmNoIHNlYXJjaEJ1dHRvbkNlbGxdLCBvKTsKLQog ICAgIGlmICghW3NlYXJjaCBzZWFyY2hNZW51VGVtcGxhdGVdKQogICAgICAgICBbc2VhcmNoIHNl dFNlYXJjaE1lbnVUZW1wbGF0ZTpzZWFyY2hNZW51VGVtcGxhdGUoKV07CiAK