45335 2010-09-07 16:38:26 -0700 Scrollbars fail to render in composited iframes. 2010-09-09 17:03:19 -0700 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser abarth aroben cmarrin eric nduca vangelis webkit.review.bot oldest_to_newest 275391 0 simon.fraser 2010-09-07 16:38:26 -0700 On Windows, scrollbars don't render in iframes that fall into compositing layers. For example, see LayoutTests/compositing/iframes/composited-parent-iframe.html 275417 1 nduca 2010-09-07 17:08:18 -0700 Tying to chrome bug: http://code.google.com/p/chromium/issues/detail?id=54758 275419 2 nduca 2010-09-07 17:09:40 -0700 Or rather, that's just a potentially related bug. :) 275499 3 simon.fraser 2010-09-07 18:17:09 -0700 It looks like the ScrollbarThemeWIn is drawing the scrollbar using the HDC from the window, rather than the compositing layer. 276746 4 67095 simon.fraser 2010-09-09 14:08:12 -0700 Created attachment 67095 Patch 276755 5 67095 aroben 2010-09-09 14:16:06 -0700 Comment on attachment 67095 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67095&action=prettypatch It would be nice to split this into two patches: one to add and use LocalWindowsContext, and one to fix get/releaseWindowsContext to work when there's no HDC. You also need to patch the releaseWindowsContext implementation in GraphicsContextCairoWin.cpp. > WebCore/platform/graphics/GraphicsContext.h:360 > + class LocalWindowsContext { It seems a little unfortunate to put this in GraphicsContext.h, since very few files will use this class but lots and lots of files will use GraphicsContext. Putting it in its own header file would drastically reduce the number of files that have to recompile when we change this class. Should this class be Noncopyable? > WebCore/platform/graphics/GraphicsContext.h:369 > + LocalWindowsContext(GraphicsContext* graphicsContext, const IntRect& rect, bool supportAlphaBlend = true, bool mayCreateBitmap = true) > + : m_graphicsContext(graphicsContext) > + , m_hdc(0) > + , m_rect(rect) > + , m_supportAlphaBlend(supportAlphaBlend) > + , m_mayCreateBitmap(mayCreateBitmap) > + { > + m_hdc = m_graphicsContext->getWindowsContext(m_rect, m_supportAlphaBlend, m_mayCreateBitmap); We usually try not to set members twice in constructors. You could either use the parameters to call getWindowsContext, or move m_hdc after the other members and use the members to call getWindowsContext. The code changes seem fine, so r+. But do consider these comments. 276837 6 simon.fraser 2010-09-09 16:32:22 -0700 http://trac.webkit.org/changeset/67125 276857 7 webkit.review.bot 2010-09-09 17:03:19 -0700 http://trac.webkit.org/changeset/67125 might have broken Qt Windows 32-bit Release The following changes are on the blame list: http://trac.webkit.org/changeset/67123 http://trac.webkit.org/changeset/67124 http://trac.webkit.org/changeset/67125 67095 2010-09-09 14:08:12 -0700 2010-09-09 14:16:06 -0700 Patch bug-45335-20100909140811.patch text/plain 18297 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDZlNjU3ZTY4Yzk1NWU5MmVmY2UzMmE0MzFjYzVlYWFiOGNiZTMwNi4uZDE2NmY0NzU3ODk5YzEw ZGY1ZjM3MDYxNTZiMTc2NWE4YzdhZjk3NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxMC0wOS0wOSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTY3JvbGxiYXJzIGZhaWwgdG8gcmVuZGVyIGlu IGNvbXBvc2l0ZWQgaWZyYW1lcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ1MzM1CisKKyAgICAgICAgQWRkIGEgc3RhY2stYmFzZWQgY2xhc3MsIExv Y2FsV2luZG93c0NvbnRleHQsIHdoaWNoIGRvZXMgYSBnZXRXaW5kb3dzQ29udGV4dC8KKyAgICAg ICAgcmVsZWFzZVdpbmRvd3NDb250ZXh0IGF1dG9tYXRpY2FsbHkuCisKKyAgICAgICAgQWxzbyBm aXggZ2V0V2luZG93c0NvbnRleHQgdG8gY3JlYXRlIGEgYml0bWFwIGNvbnRleHQgaWYgbWF5Q3Jl YXRlQml0bWFwCisgICAgICAgIGlzIHRydWUsIGFuZCBpZiB0aGUgY29udGV4dCdzIEhEQyBpcyBu dWxsLiBUaGlzIGZpeGVzIHNjcm9sbGJhciByZW5kZXJpbmcKKyAgICAgICAgaW4gY29tcG9zaXRp bmcgbGF5ZXJzLgorCisgICAgICAgIFVzZSBMb2NhbFdpbmRvd3NDb250ZXh0IGluIHBsYWNlcyB3 aGVyZSB3ZSBoYWQgYmFyZSBnZXRXaW5kb3dzQ29udGV4dCgpIGNhbGxzLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQ6OkxvY2FsV2luZG93c0NvbnRleHQ6OkxvY2FsV2luZG93c0NvbnRleHQp OgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpMb2NhbFdpbmRvd3NDb250ZXh0 Ojp+TG9jYWxXaW5kb3dzQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OkxvY2FsV2luZG93c0NvbnRleHQ6OmhkYyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL0dyYXBoaWNzQ29udGV4dENHV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dDo6cmVsZWFzZVdpbmRvd3NDb250ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6Z2V0V2luZG93c0NvbnRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3dpbi9JY29uV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okljb246OnBhaW50KToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tU aW1lV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6cGFpbnQp OgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9TY3JvbGxiYXJUaGVtZVdpbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZVdpbjo6cGFpbnRUcmFja1BpZWNlKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lV2luOjpwYWludEJ1dHRvbik6CisgICAgICAgICogcGx1 Z2lucy93aW4vUGx1Z2luVmlld1dpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3 OjpwYWludFdpbmRvd2VkUGx1Z2luSW50b0NvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1 Z2luVmlldzo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpkcmF3Q29udHJvbCk6CisKIDIwMTAtMDktMDggIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl bC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0 LmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IGMz YjIwYTk4YjdkNGE5N2E4MmNhNTgxODkzZjJiNDcyNDJlZDk4ODMuLjJiMGJlMWQ3MDIzZmQwZGRm YmE4ZmJmYTY0ZGU0NWZiODU0NWE5OGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuaApAQCAtMzU3LDYgKzM1NywzMyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIEhEQyBnZXRXaW5kb3dzQ29udGV4dChjb25zdCBJbnRSZWN0JiwgYm9vbCBzdXBw b3J0QWxwaGFCbGVuZCA9IHRydWUsIGJvb2wgbWF5Q3JlYXRlQml0bWFwID0gdHJ1ZSk7IC8vIFRo ZSBwYXNzZWQgaW4gcmVjdCBpcyB1c2VkIHRvIGNyZWF0ZSBhIGJpdG1hcCBmb3IgY29tcG9zaXRp bmcgaW5zaWRlIHRyYW5zcGFyZW5jeSBsYXllcnMuCiAgICAgICAgIHZvaWQgcmVsZWFzZVdpbmRv d3NDb250ZXh0KEhEQywgY29uc3QgSW50UmVjdCYsIGJvb2wgc3VwcG9ydEFscGhhQmxlbmQgPSB0 cnVlLCBib29sIG1heUNyZWF0ZUJpdG1hcCA9IHRydWUpOyAgICAvLyBUaGUgcGFzc2VkIGluIEhE QyBzaG91bGQgYmUgdGhlIG9uZSBoYW5kZWQgYmFjayBieSBnZXRXaW5kb3dzQ29udGV4dC4KIAor ICAgICAgICBjbGFzcyBMb2NhbFdpbmRvd3NDb250ZXh0IHsKKyAgICAgICAgcHVibGljOgorICAg ICAgICAgICAgTG9jYWxXaW5kb3dzQ29udGV4dChHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29u dGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCwgYm9vbCBzdXBwb3J0QWxwaGFCbGVuZCA9IHRydWUs IGJvb2wgbWF5Q3JlYXRlQml0bWFwID0gdHJ1ZSkKKyAgICAgICAgICAgICAgICA6IG1fZ3JhcGhp Y3NDb250ZXh0KGdyYXBoaWNzQ29udGV4dCkKKyAgICAgICAgICAgICAgICAsIG1faGRjKDApCisg ICAgICAgICAgICAgICAgLCBtX3JlY3QocmVjdCkKKyAgICAgICAgICAgICAgICAsIG1fc3VwcG9y dEFscGhhQmxlbmQoc3VwcG9ydEFscGhhQmxlbmQpCisgICAgICAgICAgICAgICAgLCBtX21heUNy ZWF0ZUJpdG1hcChtYXlDcmVhdGVCaXRtYXApCisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgbV9oZGMgPSBtX2dyYXBoaWNzQ29udGV4dC0+Z2V0V2luZG93c0NvbnRleHQobV9yZWN0LCBt X3N1cHBvcnRBbHBoYUJsZW5kLCBtX21heUNyZWF0ZUJpdG1hcCk7CisgICAgICAgICAgICB9CisK KyAgICAgICAgICAgIH5Mb2NhbFdpbmRvd3NDb250ZXh0KCkKKyAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICBtX2dyYXBoaWNzQ29udGV4dC0+cmVsZWFzZVdpbmRvd3NDb250ZXh0KG1faGRj LCBtX3JlY3QsIG1fc3VwcG9ydEFscGhhQmxlbmQsIG1fbWF5Q3JlYXRlQml0bWFwKTsKKyAgICAg ICAgICAgIH0KKworICAgICAgICAgICAgSERDIGhkYygpIGNvbnN0IHsgcmV0dXJuIG1faGRjOyB9 CisKKyAgICAgICAgcHJpdmF0ZToKKyAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dCogbV9ncmFw aGljc0NvbnRleHQ7CisgICAgICAgICAgICBIREMgbV9oZGM7CisgICAgICAgICAgICBJbnRSZWN0 IG1fcmVjdDsKKyAgICAgICAgICAgIGJvb2wgbV9zdXBwb3J0QWxwaGFCbGVuZDsKKyAgICAgICAg ICAgIGJvb2wgbV9tYXlDcmVhdGVCaXRtYXA7CisgICAgICAgIH07CisKICAgICAgICAgLy8gV2hl biBzZXQgdG8gdHJ1ZSwgY2hpbGQgd2luZG93cyBzaG91bGQgYmUgcmVuZGVyZWQgaW50byB0aGlz IGNvbnRleHQKICAgICAgICAgLy8gcmF0aGVyIHRoYW4gYWxsb3dpbmcgdGhlbSBqdXN0IHRvIHJl bmRlciB0byB0aGUgc2NyZWVuLiBEZWZhdWx0cyB0bwogICAgICAgICAvLyBmYWxzZS4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29udGV4dENHV2lu LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29udGV4dENHV2lu LmNwcAppbmRleCA3YjY1ZTk2NzcwODExMzY0MzQzZDkyNDBiODQxMjUyODAyNDE5NTY4Li45YTk2 ZjBmOTY2Njk4ZWI4YzdiMzJhYTc0ZjlkZGZiZWIxNWY1OWM1IDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0Q0dXaW4uY3BwCkBAIC03 OSw3ICs3OSw3IEBAIEdyYXBoaWNzQ29udGV4dDo6R3JhcGhpY3NDb250ZXh0KEhEQyBoZGMsIGJv b2wgaGFzQWxwaGEpCiAvLyBzdWl0YWJsZSBmb3IgYWxsIGNsaWVudHM/CiB2b2lkIEdyYXBoaWNz Q29udGV4dDo6cmVsZWFzZVdpbmRvd3NDb250ZXh0KEhEQyBoZGMsIGNvbnN0IEludFJlY3QmIGRz dFJlY3QsIGJvb2wgc3VwcG9ydEFscGhhQmxlbmQsIGJvb2wgbWF5Q3JlYXRlQml0bWFwKQogewot ICAgIGlmIChtYXlDcmVhdGVCaXRtYXAgJiYgaGRjICYmIGluVHJhbnNwYXJlbmN5TGF5ZXIoKSkg eworICAgIGlmIChtYXlDcmVhdGVCaXRtYXAgJiYgaGRjICYmICghbV9kYXRhLT5tX2hkYyB8fCBp blRyYW5zcGFyZW5jeUxheWVyKCkpKSB7CiAgICAgICAgIGlmIChkc3RSZWN0LmlzRW1wdHkoKSkK ICAgICAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93aW4vR3JhcGhpY3NDb250ZXh0V2luLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL0dyYXBoaWNzQ29udGV4dFdpbi5jcHAKaW5kZXggMTYxYjljNjVjOWZhMTFkMzIwZWRk ZDJiMjdhYWZkMWUzODUyODYwNC4uZjE5NTNlNDJjMTI2NjEyOGE3NzRiNzFmZjk0OGI1NzRhMjli NTE0YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3ND b250ZXh0V2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGlj c0NvbnRleHRXaW4uY3BwCkBAIC0xMDEsNyArMTAxLDcgQEAgR3JhcGhpY3NDb250ZXh0OjpXaW5k b3dzQml0bWFwKiBHcmFwaGljc0NvbnRleHQ6OmNyZWF0ZVdpbmRvd3NCaXRtYXAoSW50U2l6ZSBz aXoKIEhEQyBHcmFwaGljc0NvbnRleHQ6OmdldFdpbmRvd3NDb250ZXh0KGNvbnN0IEludFJlY3Qm IGRzdFJlY3QsIGJvb2wgc3VwcG9ydEFscGhhQmxlbmQsIGJvb2wgbWF5Q3JlYXRlQml0bWFwKQog ewogICAgIC8vIEZJWE1FOiBTaG91bGQgYSBiaXRtYXAgYmUgY3JlYXRlZCBhbHNvIHdoZW4gYSBz aGFkb3cgaXMgc2V0PwotICAgIGlmIChtYXlDcmVhdGVCaXRtYXAgJiYgaW5UcmFuc3BhcmVuY3lM YXllcigpKSB7CisgICAgaWYgKG1heUNyZWF0ZUJpdG1hcCAmJiAoIW1fZGF0YS0+bV9oZGMgfHwg aW5UcmFuc3BhcmVuY3lMYXllcigpKSkgewogICAgICAgICBpZiAoZHN0UmVjdC5pc0VtcHR5KCkp CiAgICAgICAgICAgICByZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93aW4vSWNvbldpbi5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9J Y29uV2luLmNwcAppbmRleCBjYzkzNDNhYzgwMjExYjJmNWZiM2IxNTA2MzY4ZTNjMzMxMDViNWYw Li43MGFlM2QyZDVmYTNmYjg5Y2ZlZjc2MTdlYmQ5ODBjNjg1N2Y2ZmI3IDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9JY29uV2luLmNwcAorKysgYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9JY29uV2luLmNwcApAQCAtOTAsMTEgKzkwLDggQEAgdm9pZCBJ Y29uOjpwYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHIpCiAj aWYgT1MoV0lOQ0UpCiAgICAgY29udGV4dC0+ZHJhd0ljb24obV9oSWNvbiwgciwgRElfTk9STUFM KTsKICNlbHNlCi0gICAgSERDIGhkYyA9IGNvbnRleHQtPmdldFdpbmRvd3NDb250ZXh0KHIpOwot Ci0gICAgRHJhd0ljb25FeChoZGMsIHIueCgpLCByLnkoKSwgbV9oSWNvbiwgci53aWR0aCgpLCBy LmhlaWdodCgpLCAwLCAwLCBESV9OT1JNQUwpOwotCi0gICAgY29udGV4dC0+cmVsZWFzZVdpbmRv d3NDb250ZXh0KGhkYywgcik7CisgICAgR3JhcGhpY3NDb250ZXh0OjpMb2NhbFdpbmRvd3NDb250 ZXh0IHdpbmRvd0NvbnRleHQoY29udGV4dCwgcik7CisgICAgRHJhd0ljb25FeCh3aW5kb3dDb250 ZXh0LmhkYygpLCByLngoKSwgci55KCksIG1faEljb24sIHIud2lkdGgoKSwgci5oZWlnaHQoKSwg MCwgMCwgRElfTk9STUFMKTsKICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVXaW4uY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lV2lu LmNwcAppbmRleCAzNGYxMTM1ZmJmNDNkYjk5MzhkZmM3ZGY4ZGZiZDJjMjQ2ZjIwOGFiLi5jMzdm NWQ1ZDkxNjQzNTY5ZmMzY2I0OWY0NzdjOWUxYTEyNWQ3NGVmIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVXaW4uY3Bw CisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1 aWNrVGltZVdpbi5jcHAKQEAgLTYwMCw2ICs2MDAsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZTo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBwLCBjb25zdCBJbnRSZWN0JiByKQogCiAgICAgYm9v bCB1c2luZ1RlbXBCaXRtYXAgPSBmYWxzZTsKICAgICBPd25QdHI8R3JhcGhpY3NDb250ZXh0OjpX aW5kb3dzQml0bWFwPiBiaXRtYXA7CisgICAgLy8gRklYTUU6IHVzZSBMb2NhbFdpbmRvd3NDb250 ZXh0LgogICAgIEhEQyBoZGMgPSBwLT5nZXRXaW5kb3dzQ29udGV4dChyKTsKICAgICBpZiAoIWhk YykgewogICAgICAgICAvLyBUaGUgZ3JhcGhpY3MgY29udGV4dCBkb2Vzbid0IGhhdmUgYW4gYXNz b2NpYXRlZCBIREMgc28gY3JlYXRlIGEgdGVtcG9yYXJ5CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL3dpbi9TY3JvbGxiYXJUaGVtZVdpbi5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3dpbi9T Y3JvbGxiYXJUaGVtZVdpbi5jcHAKaW5kZXggYThkMzc0YTBmZWNmOWZlOTBkOTIyNzk5ZTE0NzBj YzhlNTUwYzA4OC4uNDI5MWEzNDY1M2E0OWRhMmEwMTkwNDFmYjMxNDlhNTUwMmEzNGEwNSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS93aW4vU2Nyb2xsYmFyVGhlbWVXaW4uY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vd2luL1Njcm9sbGJhclRoZW1lV2luLmNwcApAQCAtMjQwLDE0ICsy NDAsMTcgQEAgdm9pZCBTY3JvbGxiYXJUaGVtZVdpbjo6cGFpbnRUcmFja1BpZWNlKEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgU2Nyb2xsYmFyKiBzY3IKICAgICBib29sIGFscGhhQmxlbmQgPSBm YWxzZTsKICAgICBpZiAoc2Nyb2xsYmFyVGhlbWUpCiAgICAgICAgIGFscGhhQmxlbmQgPSBJc1Ro ZW1lQmFja2dyb3VuZFBhcnRpYWxseVRyYW5zcGFyZW50KHNjcm9sbGJhclRoZW1lLCBwYXJ0LCBz dGF0ZSk7Ci0gICAgSERDIGhkYyA9IGNvbnRleHQtPmdldFdpbmRvd3NDb250ZXh0KHJlY3QsIGFs cGhhQmxlbmQpOworCisgICAgR3JhcGhpY3NDb250ZXh0OjpMb2NhbFdpbmRvd3NDb250ZXh0IHdp bmRvd3NDb250ZXh0KGNvbnRleHQsIHJlY3QsIGFscGhhQmxlbmQpOwogICAgIFJFQ1QgdGhlbWVS ZWN0KHJlY3QpOworCiAgICAgaWYgKHNjcm9sbGJhclRoZW1lKQotICAgICAgICBEcmF3VGhlbWVC YWNrZ3JvdW5kKHNjcm9sbGJhclRoZW1lLCBoZGMsIHBhcnQsIHN0YXRlLCAmdGhlbWVSZWN0LCAw KTsKKyAgICAgICAgRHJhd1RoZW1lQmFja2dyb3VuZChzY3JvbGxiYXJUaGVtZSwgd2luZG93c0Nv bnRleHQuaGRjKCksIHBhcnQsIHN0YXRlLCAmdGhlbWVSZWN0LCAwKTsKICAgICBlbHNlIHsKICAg ICAgICAgRFdPUkQgY29sb3IzREZhY2UgPSA6OkdldFN5c0NvbG9yKENPTE9SXzNERkFDRSk7CiAg ICAgICAgIERXT1JEIGNvbG9yU2Nyb2xsYmFyID0gOjpHZXRTeXNDb2xvcihDT0xPUl9TQ1JPTExC QVIpOwogICAgICAgICBEV09SRCBjb2xvcldpbmRvdyA9IDo6R2V0U3lzQ29sb3IoQ09MT1JfV0lO RE9XKTsKKyAgICAgICAgSERDIGhkYyA9IHdpbmRvd3NDb250ZXh0LmhkYygpOwogICAgICAgICBp ZiAoKGNvbG9yM0RGYWNlICE9IGNvbG9yU2Nyb2xsYmFyKSAmJiAoY29sb3JXaW5kb3cgIT0gY29s b3JTY3JvbGxiYXIpKQogICAgICAgICAgICAgOjpGaWxsUmVjdChoZGMsICZ0aGVtZVJlY3QsIEhC UlVTSChDT0xPUl9TQ1JPTExCQVIrMSkpOwogICAgICAgICBlbHNlIHsKQEAgLTI2NSw3ICsyNjgs NiBAQCB2b2lkIFNjcm9sbGJhclRoZW1lV2luOjpwYWludFRyYWNrUGllY2UoR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXIqIHNjcgogICAgICAgICAgICAgOjpEZWxldGVPYmplY3Qo cGF0dGVybkJpdG1hcCk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgY29udGV4dC0+cmVsZWFzZVdp bmRvd3NDb250ZXh0KGhkYywgcmVjdCwgYWxwaGFCbGVuZCk7CiB9CiAKIHZvaWQgU2Nyb2xsYmFy VGhlbWVXaW46OnBhaW50QnV0dG9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgU2Nyb2xsYmFy KiBzY3JvbGxiYXIsIGNvbnN0IEludFJlY3QmIHJlY3QsIFNjcm9sbGJhclBhcnQgcGFydCkKQEAg LTMwOCwxNCArMzEwLDEzIEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVXaW46OnBhaW50QnV0dG9uKEdy YXBoaWNzQ29udGV4dCogY29udGV4dCwgU2Nyb2xsYmFyKiBzY3JvbGxiCiAgICAgYm9vbCBhbHBo YUJsZW5kID0gZmFsc2U7CiAgICAgaWYgKHNjcm9sbGJhclRoZW1lKQogICAgICAgICBhbHBoYUJs ZW5kID0gSXNUaGVtZUJhY2tncm91bmRQYXJ0aWFsbHlUcmFuc3BhcmVudChzY3JvbGxiYXJUaGVt ZSwgU1BfQlVUVE9OLCB4cFN0YXRlKTsKLSAgICBIREMgaGRjID0gY29udGV4dC0+Z2V0V2luZG93 c0NvbnRleHQocmVjdCwgYWxwaGFCbGVuZCk7CiAKKyAgICBHcmFwaGljc0NvbnRleHQ6OkxvY2Fs V2luZG93c0NvbnRleHQgd2luZG93c0NvbnRleHQoY29udGV4dCwgcmVjdCwgYWxwaGFCbGVuZCk7 CiAgICAgUkVDVCB0aGVtZVJlY3QocmVjdCk7CiAgICAgaWYgKHNjcm9sbGJhclRoZW1lKQotICAg ICAgICBEcmF3VGhlbWVCYWNrZ3JvdW5kKHNjcm9sbGJhclRoZW1lLCBoZGMsIFNQX0JVVFRPTiwg eHBTdGF0ZSwgJnRoZW1lUmVjdCwgMCk7CisgICAgICAgIERyYXdUaGVtZUJhY2tncm91bmQoc2Ny b2xsYmFyVGhlbWUsIHdpbmRvd3NDb250ZXh0LmhkYygpLCBTUF9CVVRUT04sIHhwU3RhdGUsICZ0 aGVtZVJlY3QsIDApOwogICAgIGVsc2UKLSAgICAgICAgOjpEcmF3RnJhbWVDb250cm9sKGhkYywg JnRoZW1lUmVjdCwgREZDX1NDUk9MTCwgY2xhc3NpY1N0YXRlKTsKLSAgICBjb250ZXh0LT5yZWxl YXNlV2luZG93c0NvbnRleHQoaGRjLCByZWN0LCBhbHBoYUJsZW5kKTsKKyAgICAgICAgOjpEcmF3 RnJhbWVDb250cm9sKHdpbmRvd3NDb250ZXh0LmhkYygpLCAmdGhlbWVSZWN0LCBERkNfU0NST0xM LCBjbGFzc2ljU3RhdGUpOwogfQogCiBzdGF0aWMgSW50UmVjdCBncmlwcGVyUmVjdChpbnQgdGhp Y2tuZXNzLCBjb25zdCBJbnRSZWN0JiB0aHVtYlJlY3QpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs dWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3BwIGIvV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5W aWV3V2luLmNwcAppbmRleCA4ZGJiMDRiMmM0N2Q5MDllMWZhZjdiYmM2NTI3OTBiNzdiMjk0NDYy Li42MzAyNzkwNmUzODUxYmY2ZGMwZjFhMzRmMjNkOGFlZjE1MDA5OTA2IDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3BwCisrKyBiL1dlYkNvcmUvcGx1Z2lu cy93aW4vUGx1Z2luVmlld1dpbi5jcHAKQEAgLTU2Myw3ICs1NjMsNyBAQCB2b2lkIFBsdWdpblZp ZXc6OnBhaW50V2luZG93ZWRQbHVnaW5JbnRvQ29udGV4dChHcmFwaGljc0NvbnRleHQqIGNvbnRl eHQsIGNvbnN0CiAgICAgQVNTRVJUKHBhcmVudCgpLT5pc0ZyYW1lVmlldygpKTsKICAgICBJbnRQ b2ludCBsb2NhdGlvbkluV2luZG93ID0gc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4ocGFyZW50KCkp LT5jb250ZW50c1RvV2luZG93KGZyYW1lUmVjdCgpLmxvY2F0aW9uKCkpOwogCi0gICAgSERDIGhk YyA9IGNvbnRleHQtPmdldFdpbmRvd3NDb250ZXh0KGZyYW1lUmVjdCgpLCBmYWxzZSk7CisgICAg R3JhcGhpY3NDb250ZXh0OjpMb2NhbFdpbmRvd3NDb250ZXh0IHdpbmRvd3NDb250ZXh0KGNvbnRl eHQsIGZyYW1lUmVjdCgpLCBmYWxzZSk7CiAKICNpZiBQTEFURk9STShDQUlSTykKICAgICAvLyBN dXN0IGZsdXNoIGRyYXdpbmdzIHVwIHRvIHRoaXMgcG9pbnQgdG8gdGhlIGJhY2tpbmcgbWV0YWZp bGUsIG90aGVyd2lzZSB0aGUKQEAgLTU3Myw2ICs1NzMsNyBAQCB2b2lkIFBsdWdpblZpZXc6OnBh aW50V2luZG93ZWRQbHVnaW5JbnRvQ29udGV4dChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNv bnN0CiAgICAgY2Fpcm9fc2hvd19wYWdlKGN0eCk7CiAjZW5kaWYKIAorICAgIEhEQyBoZGMgPSB3 aW5kb3dzQ29udGV4dC5oZGMoKTsKICAgICBYRk9STSBvcmlnaW5hbFRyYW5zZm9ybTsKICAgICBH ZXRXb3JsZFRyYW5zZm9ybShoZGMsICZvcmlnaW5hbFRyYW5zZm9ybSk7CiAKQEAgLTU4Nyw4ICs1 ODgsNiBAQCB2b2lkIFBsdWdpblZpZXc6OnBhaW50V2luZG93ZWRQbHVnaW5JbnRvQ29udGV4dChH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0CiAgICAgcGFpbnRJbnRvVHJhbnNmb3JtZWRD b250ZXh0KGhkYyk7CiAKICAgICBTZXRXb3JsZFRyYW5zZm9ybShoZGMsICZvcmlnaW5hbFRyYW5z Zm9ybSk7Ci0KLSAgICBjb250ZXh0LT5yZWxlYXNlV2luZG93c0NvbnRleHQoaGRjLCBmcmFtZVJl Y3QoKSwgZmFsc2UpOwogI2VuZGlmCiB9CiAKQEAgLTYxNyw3ICs2MTYsNyBAQCB2b2lkIFBsdWdp blZpZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVj dCkKIAogICAgIEFTU0VSVChwYXJlbnQoKS0+aXNGcmFtZVZpZXcoKSk7CiAgICAgSW50UmVjdCBy ZWN0SW5XaW5kb3cgPSBzdGF0aWNfY2FzdDxGcmFtZVZpZXcqPihwYXJlbnQoKSktPmNvbnRlbnRz VG9XaW5kb3coZnJhbWVSZWN0KCkpOwotICAgIEhEQyBoZGMgPSBjb250ZXh0LT5nZXRXaW5kb3dz Q29udGV4dChyZWN0SW5XaW5kb3csIG1faXNUcmFuc3BhcmVudCk7CisgICAgR3JhcGhpY3NDb250 ZXh0OjpMb2NhbFdpbmRvd3NDb250ZXh0IHdpbmRvd3NDb250ZXh0KGNvbnRleHQsIHJlY3RJbldp bmRvdywgbV9pc1RyYW5zcGFyZW50KTsKIAogICAgIC8vIE9uIFNhZmFyaS9XaW5kb3dzIHdpdGhv dXQgdHJhbnNwYXJlbmN5IGxheWVycyB0aGUgR3JhcGhpY3NDb250ZXh0IHJldHVybnMgdGhlIEhE QwogICAgIC8vIG9mIHRoZSB3aW5kb3cgYW5kIHRoZSBwbHVnaW4gZXhwZWN0cyB0aGF0IHRoZSBw YXNzZWQgaW4gREMgaGFzIHdpbmRvdyBjb29yZGluYXRlcy4KQEAgLTYyNiwxNiArNjI1LDE0IEBA IHZvaWQgUGx1Z2luVmlldzo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJ bnRSZWN0JiByZWN0KQogI2lmICFQTEFURk9STShRVCkgJiYgIU9TKFdJTkNFKQogICAgIGlmICgh Y29udGV4dC0+aW5UcmFuc3BhcmVuY3lMYXllcigpKSB7CiAgICAgICAgIFhGT1JNIHRyYW5zZm9y bTsKLSAgICAgICAgR2V0V29ybGRUcmFuc2Zvcm0oaGRjLCAmdHJhbnNmb3JtKTsKKyAgICAgICAg R2V0V29ybGRUcmFuc2Zvcm0od2luZG93c0NvbnRleHQuaGRjKCksICZ0cmFuc2Zvcm0pOwogICAg ICAgICB0cmFuc2Zvcm0uZUR4ID0gMDsKICAgICAgICAgdHJhbnNmb3JtLmVEeSA9IDA7Ci0gICAg ICAgIFNldFdvcmxkVHJhbnNmb3JtKGhkYywgJnRyYW5zZm9ybSk7CisgICAgICAgIFNldFdvcmxk VHJhbnNmb3JtKHdpbmRvd3NDb250ZXh0LmhkYygpLCAmdHJhbnNmb3JtKTsKICAgICB9CiAjZW5k aWYKIAotICAgIHBhaW50SW50b1RyYW5zZm9ybWVkQ29udGV4dChoZGMpOwotCi0gICAgY29udGV4 dC0+cmVsZWFzZVdpbmRvd3NDb250ZXh0KGhkYywgZnJhbWVSZWN0KCksIG1faXNUcmFuc3BhcmVu dCk7CisgICAgcGFpbnRJbnRvVHJhbnNmb3JtZWRDb250ZXh0KHdpbmRvd3NDb250ZXh0LmhkYygp KTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3OjpoYW5kbGVLZXlib2FyZEV2ZW50KEtleWJvYXJkRXZl bnQqIGV2ZW50KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4u Y3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCmluZGV4IDQ1OTY1ZTZl YmI4M2NkYmE3NmEzN2Y5MmUzYjNmNmYwZjlhY2MzZjMuLjdkZWRlY2FjN2Y5M2U3NTY2NjZlZmFm MTMyNTJiY2FiZDk1NDc3ZGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lV2luLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAKQEAg LTU1OCwxMSArNTU4LDEyIEBAIHN0YXRpYyB2b2lkIGRyYXdDb250cm9sKEdyYXBoaWNzQ29udGV4 dCogY29udGV4dCwgUmVuZGVyT2JqZWN0KiBvLCBIQU5ETEUgdGhlbWUsCiAgICAgYm9vbCBhbHBo YUJsZW5kID0gZmFsc2U7CiAgICAgaWYgKHRoZW1lKQogICAgICAgICBhbHBoYUJsZW5kID0gSXNU aGVtZUJhY2tncm91bmRQYXJ0aWFsbHlUcmFuc3BhcmVudCh0aGVtZSwgdGhlbWVEYXRhLm1fcGFy dCwgdGhlbWVEYXRhLm1fc3RhdGUpOwotICAgIEhEQyBoZGMgPSBjb250ZXh0LT5nZXRXaW5kb3dz Q29udGV4dChyLCBhbHBoYUJsZW5kKTsKKyAgICBHcmFwaGljc0NvbnRleHQ6OkxvY2FsV2luZG93 c0NvbnRleHQgd2luZG93c0NvbnRleHQoY29udGV4dCwgciwgYWxwaGFCbGVuZCk7CiAgICAgUkVD VCB3aWRnZXRSZWN0ID0gcjsKICAgICBpZiAodGhlbWUpCi0gICAgICAgIERyYXdUaGVtZUJhY2tn cm91bmQodGhlbWUsIGhkYywgdGhlbWVEYXRhLm1fcGFydCwgdGhlbWVEYXRhLm1fc3RhdGUsICZ3 aWRnZXRSZWN0LCBOVUxMKTsKKyAgICAgICAgRHJhd1RoZW1lQmFja2dyb3VuZCh0aGVtZSwgd2lu ZG93c0NvbnRleHQuaGRjKCksIHRoZW1lRGF0YS5tX3BhcnQsIHRoZW1lRGF0YS5tX3N0YXRlLCAm d2lkZ2V0UmVjdCwgMCk7CiAgICAgZWxzZSB7CisgICAgICAgIEhEQyBoZGMgPSB3aW5kb3dzQ29u dGV4dC5oZGMoKTsKICAgICAgICAgaWYgKHRoZW1lRGF0YS5tX3BhcnQgPT0gVEZQX1RFWFRGSUVM RCkgewogICAgICAgICAgICAgOjpEcmF3RWRnZShoZGMsICZ3aWRnZXRSZWN0LCBFREdFX1NVTktF TiwgQkZfUkVDVCB8IEJGX0FESlVTVCk7CiAgICAgICAgICAgICBpZiAodGhlbWVEYXRhLm1fc3Rh dGUgPT0gVFNfRElTQUJMRUQgfHwgdGhlbWVEYXRhLm1fc3RhdGUgPT0gIFRGU19SRUFET05MWSkK QEAgLTYwOCw3ICs2MDksNiBAQCBzdGF0aWMgdm9pZCBkcmF3Q29udHJvbChHcmFwaGljc0NvbnRl eHQqIGNvbnRleHQsIFJlbmRlck9iamVjdCogbywgSEFORExFIHRoZW1lLAogICAgICAgICAgICAg OjpEcmF3RnJhbWVDb250cm9sKGhkYywgJndpZGdldFJlY3QsIHRoZW1lRGF0YS5tX3BhcnQsIHRo ZW1lRGF0YS5tX3N0YXRlKTsKICAgICAgICAgfQogICAgIH0KLSAgICBjb250ZXh0LT5yZWxlYXNl V2luZG93c0NvbnRleHQoaGRjLCByLCBhbHBoYUJsZW5kKTsKIH0KIAogYm9vbCBSZW5kZXJUaGVt ZVdpbjo6cGFpbnRCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIGksIGNv bnN0IEludFJlY3QmIHIpCmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1dlYktp dC93aW4vQ2hhbmdlTG9nCmluZGV4IDkxZDBiN2ZiYjRmYmZkNDI0MDI4NzUyMWIzOTg3ZDcxNDQz ZWJjODYuLmJkZjJmMjA2Y2IzYjgzNTQxYzgxODBiZGU2ZjRjNTE1NWUzYmI2MzkgMTAwNjQ0Ci0t LSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMTAtMDktMDkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2Nyb2xsYmFycyBmYWlsIHRvIHJlbmRlciBpbiBjb21wb3NpdGVkIGlmcmFtZXMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTMzNQorCisgICAgICAg IFVzZSBMb2NhbFdpbmRvd3NDb250ZXh0IHdoZW4gcGFpbnRpbmcgc2Nyb2xsYmFycy4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJD aHJvbWVDbGllbnQ6OnBhaW50Q3VzdG9tU2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNocm9tZUNs aWVudDo6cGFpbnRDdXN0b21TY3JvbGxDb3JuZXIpOgorCiAyMDEwLTA5LTA4ICBQZXRlciBLYXN0 aW5nICA8cGthc3RpbmdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBOb3QgcmV2aWV3ZWQsIGJ1aWxk IGZpeC4KZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xp ZW50LmNwcCBiL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApp bmRleCBkNWFlYTI1N2U1MWM1YjFkNjIwNjVjYzFkOTFkMWY4MzFmODNmODhhLi5jMTY4MTc2ZGU5 NjJjYTE3MTYwYjg0MDYwNGE0ODk1ODRhMTg3Mzk1IDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL1dl YkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKKysrIGIvV2ViS2l0L3dpbi9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCkBAIC03MDUsMTAgKzcwNSw5IEBAIGJvb2wgV2Vi Q2hyb21lQ2xpZW50OjpwYWludEN1c3RvbVNjcm9sbGJhcihHcmFwaGljc0NvbnRleHQqIGNvbnRl eHQsIGNvbnN0IEZsb2F0CiAgICAgICAgIHdlYlN0YXRlIHw9IFdlYlByZXNzZWRTY3JvbGxiYXJT dGF0ZTsKICAgICAKICAgICBSRUNUIHdlYlJlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KHJlY3QpOwot ICAgIEhEQyBoREMgPSBjb250ZXh0LT5nZXRXaW5kb3dzQ29udGV4dCh3ZWJSZWN0KTsKLSAgICBI UkVTVUxUIGhyID0gZGVsZWdhdGUtPnBhaW50Q3VzdG9tU2Nyb2xsYmFyKG1fd2ViVmlldywgaERD LCB3ZWJSZWN0LCB3ZWJTaXplLCB3ZWJTdGF0ZSwgd2ViUHJlc3NlZFBhcnQsIAorICAgIEdyYXBo aWNzQ29udGV4dDo6TG9jYWxXaW5kb3dzQ29udGV4dCB3aW5kb3dzQ29udGV4dChjb250ZXh0LCB3 ZWJSZWN0KTsKKyAgICBIUkVTVUxUIGhyID0gZGVsZWdhdGUtPnBhaW50Q3VzdG9tU2Nyb2xsYmFy KG1fd2ViVmlldywgd2luZG93c0NvbnRleHQuaGRjKCksIHdlYlJlY3QsIHdlYlNpemUsIHdlYlN0 YXRlLCB3ZWJQcmVzc2VkUGFydCwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdmVydGljYWwsIHZhbHVlLCBwcm9wb3J0aW9uLCB3ZWJQ YXJ0cyk7Ci0gICAgY29udGV4dC0+cmVsZWFzZVdpbmRvd3NDb250ZXh0KGhEQywgd2ViUmVjdCk7 CiAgICAgcmV0dXJuIFNVQ0NFRURFRChocik7CiB9CiAKQEAgLTcyMiw5ICs3MjEsOCBAQCBib29s IFdlYkNocm9tZUNsaWVudDo6cGFpbnRDdXN0b21TY3JvbGxDb3JuZXIoR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBjb25zdCBGbAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBSRUNUIHdl YlJlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KHJlY3QpOwotICAgIEhEQyBoREMgPSBjb250ZXh0LT5n ZXRXaW5kb3dzQ29udGV4dCh3ZWJSZWN0KTsKLSAgICBIUkVTVUxUIGhyID0gZGVsZWdhdGUtPnBh aW50Q3VzdG9tU2Nyb2xsQ29ybmVyKG1fd2ViVmlldywgaERDLCB3ZWJSZWN0KTsKLSAgICBjb250 ZXh0LT5yZWxlYXNlV2luZG93c0NvbnRleHQoaERDLCB3ZWJSZWN0KTsKKyAgICBHcmFwaGljc0Nv bnRleHQ6OkxvY2FsV2luZG93c0NvbnRleHQgd2luZG93c0NvbnRleHQoY29udGV4dCwgd2ViUmVj dCk7CisgICAgSFJFU1VMVCBociA9IGRlbGVnYXRlLT5wYWludEN1c3RvbVNjcm9sbENvcm5lciht X3dlYlZpZXcsIHdpbmRvd3NDb250ZXh0LmhkYygpLCB3ZWJSZWN0KTsKICAgICByZXR1cm4gU1VD Q0VFREVEKGhyKTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCA3M2E2ZjdkYWIxYzNhY2NlZjVlNTRhNjhhY2E3NTI5ZGViZWJmMTA3 Li44NDg1ZGY2ZGUxM2MxNzdlMTc3OGNmYmE4YjdkZDhlMDUzNzQyOTU5IDEwMDY0NAotLS0gYS9X ZWJLaXQyL0NoYW5nZUxvZworKysgYi9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDEwLTA5LTA5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNjcm9sbGJhcnMg ZmFpbCB0byByZW5kZXIgaW4gY29tcG9zaXRlZCBpZnJhbWVzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUzMzUKKworICAgICAgICBVc2UgTG9jYWxX aW5kb3dzQ29udGV4dCB3aGVuIHBhaW50aW5nIHRoZSBwbHVnaW4uCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvd2luL05ldHNjYXBlUGx1Z2luV2luLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtUGFpbnQpOgorCiAyMDEwLTA5LTA4 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRG9uJ3Qg aW5jbHVkZSB0aGUgc3RkIG5hbWVzcGFjZSBpbiBhIGhlYWRlci4gVGhpcyBob3BlZnVsbHkgZml4 ZXMgdGhlIFdpbmRvd3MgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS93aW4vTmV0c2NhcGVQbHVnaW5XaW4uY3BwIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUvd2luL05ldHNjYXBlUGx1Z2luV2luLmNwcAppbmRleCA2MWEz NGI1MTA2NDVhZWRjNTM4MDc2ZWUzMDRiMTcxMzlmNTI3M2E1Li5hYmZlM2FhZDE2MWVhYjBiMjll NzJkOWFiMmViOGY3NGZjZDZhYjNiIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS93aW4vTmV0c2NhcGVQbHVnaW5XaW4uY3BwCisrKyBiL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3dpbi9OZXRzY2FwZVBsdWdpbldpbi5jcHAKQEAgLTQ5 LDEwICs0OSwxMCBAQCB2b2lkIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybVBhaW50KEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGlydAogICAgIH0KIAogICAgIC8vIEZJ WE1FOiBTdXBwb3J0IHRyYW5zcGFyZW50IHBsdWdpbnMuCi0gICAgSERDIGhkYyA9IGNvbnRleHQt PmdldFdpbmRvd3NDb250ZXh0KGRpcnR5UmVjdCwgZmFsc2UpOworICAgIEdyYXBoaWNzQ29udGV4 dDo6TG9jYWxXaW5kb3dzQ29udGV4dCB3aW5kb3dzQ29udGV4dChjb250ZXh0LCBkaXJ0eVJlY3Qs IGZhbHNlKTsKIAogICAgIG1fbnBXaW5kb3cudHlwZSA9IE5QV2luZG93VHlwZURyYXdhYmxlOwot ICAgIG1fbnBXaW5kb3cud2luZG93ID0gaGRjOworICAgIG1fbnBXaW5kb3cud2luZG93ID0gd2lu ZG93c0NvbnRleHQuaGRjKCk7CiAKICAgICBXSU5ET1dQT1Mgd2luZG93cG9zID0geyAwLCAwLCAw LCAwLCAwLCAwLCAwIH07CiAKQEAgLTczLDEzICs3MywxMCBAQCB2b2lkIE5ldHNjYXBlUGx1Z2lu OjpwbGF0Zm9ybVBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYg ZGlydAogICAgIFJFQ1QgZGlydHlXaW5SZWN0ID0gZGlydHlSZWN0OwogCiAgICAgbnBFdmVudC5l dmVudCA9IFdNX1BBSU5UOwotICAgIG5wRXZlbnQud1BhcmFtID0gcmVpbnRlcnByZXRfY2FzdDx1 aW50cHRyX3Q+KGhkYyk7CisgICAgbnBFdmVudC53UGFyYW0gPSByZWludGVycHJldF9jYXN0PHVp bnRwdHJfdD4od2luZG93c0NvbnRleHQuaGRjKCkpOwogICAgIG5wRXZlbnQubFBhcmFtID0gcmVp bnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KCZkaXJ0eVdpblJlY3QpOwogCiAgICAgTlBQX0hhbmRs ZUV2ZW50KCZucEV2ZW50KTsKLQotICAgIC8vIEZJWE1FOiBTdXBwb3J0IHRyYW5zcGFyZW50IHBs dWdpbnMuCi0gICAgY29udGV4dC0+cmVsZWFzZVdpbmRvd3NDb250ZXh0KGhkYywgZGlydHlSZWN0 LCBmYWxzZSk7CiB9CiAKIE5QRXZlbnQgdG9OUChjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCkK