140135 2015-01-06 11:37:25 -0800 [TexMap] m_layer member in GraphicsLayerTextureMapper is always non-null 2015-01-07 04:49:24 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan achristensen bfulgham cmarcelo commit-queue kondapallykalyan luiz mrobinson noam peavo yoon oldest_to_newest 1059080 0 zan 2015-01-06 11:37:25 -0800 [TexMap] m_layer member in GraphicsLayerTextureMapper is always non-null 1059088 1 244081 zan 2015-01-06 11:40:35 -0800 Created attachment 244081 Patch 1059095 2 bfulgham 2015-01-06 11:52:11 -0800 This looks fine to me. Alex, does this cause any problems with the WinCairo GL compositing stuff? 1059130 3 peavo 2015-01-06 13:08:42 -0800 (In reply to comment #2) > This looks fine to me. Alex, does this cause any problems with the WinCairo > GL compositing stuff? Haven't compiled or tested it, but WinCairo part looks good to me. 1059373 4 244081 zan 2015-01-07 04:49:15 -0800 Comment on attachment 244081 Patch Clearing flags on attachment: 244081 Committed r178033: <http://trac.webkit.org/changeset/178033> 1059374 5 zan 2015-01-07 04:49:24 -0800 All reviewed patches have been landed. Closing bug. 244081 2015-01-06 11:40:35 -0800 2015-01-07 04:49:15 -0800 Patch bug-140135-20150106114232.patch text/plain 15647 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDIxZmM5Yjc1ZDRiNTEz NTY0YzNhZmJkMDJhYjA3Yzc4NjI5YzNkZS4uMmQyM2Y4ZmM5NGI5MTNiNGZkN2VmMjg5MDA0ZDYx NWEzZTE4ZGMzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTAxLTA2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbVGV4TWFwXSBtX2xh eWVyIG1lbWJlciBpbiBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlciBpcyBhbHdheXMgbm9uLW51 bGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDEz NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbmNl IHRoZSBUZXh0dXJlTWFwcGVyTGF5ZXIgbWVtYmVyIGluIHRoZSBHcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlciBjbGFzcworICAgICAgICBpcyBhbHdheXMgbm9uLW51bGwsIHdlIGRvbid0IG5lZWQg dG8ga2VlcCBpdCBpbiBhIHN0ZDo6dW5pcXVlX3B0cjw+LgorCisgICAgICAgIEdyYXBoaWNzTGF5 ZXJUZXh0dXJlTWFwcGVyOjpsYXllcigpIG5vdyByZXR1cm5zIGEgcmVmZXJlbmNlIHRvIHRoZSBt X2xheWVyIG1lbWJlci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlcjo6R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIpOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0 ZUZvclRoaXNMYXllck9ubHkpOgorICAgICAgICAoV2ViQ29yZTo6dG9UZXh0dXJlTWFwcGVyTGF5 ZXJWZWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6 OmNvbW1pdExheWVyQ2hhbmdlcyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4 dHVyZU1hcHBlcjo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjp1cGRhdGVCYWNraW5nU3RvcmVJZk5lZWRlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0RmlsdGVycyk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyLmg6CisKIDIwMTUtMDEtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29t PgogCiAgICAgICAgIFJlc29sdmUgbWlycm9yaW5nIGFuZCB2YXJpYW50IGluIEZvbnQgaW5zdGVh ZCBvZiBGb250R2x5cGhzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggZGY5Zjg1ZDk4NGVmOTg3ZDI5NjI1 YTVlNDAyYWM1Mzc0OGU1ODU0Yy4uOGViODFlMTZmMGI0YjljNjA5NjEyMmFjNjY1NmY3OWJhM2Fj YTA4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTAxLTA2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbVGV4TWFwXSBtX2xh eWVyIG1lbWJlciBpbiBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlciBpcyBhbHdheXMgbm9uLW51 bGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDEz NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBo aWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpsYXllcigpIG5vdyByZXR1cm5zIGEgcmVmZXJlbmNlLAor ICAgICAgICBzbyB0aGUgY2FsbCBzaXRlcyBhcmUgdXBkYXRlZC4KKworICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKEFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Ojppbml0aWFsaXplKToKKyAgICAgICAgKEFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzdGFydGVkQW5pbWF0aW9uKToKKyAgICAgICAgKEFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Ojpjb21wb3NpdGVMYXllcnNUb0NvbnRleHQpOgor CiAyMDE0LTEyLTI5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAg ICAgICAgQW5vdGhlciBhdHRlbXB0IGF0IGZpeGluZyB0aGUgYnVpbGQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YmYzYjQ1Y2U5OGI1MzFkNWQ3YWNjYmU0ODc0OTU4MDI4YjlmZjkyZC4uYzUxNWQyMTI4ZGQ5OTI1 Y2Q2N2Q1YTlkYzE0MGRkYzlkZjlhODI3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisy MDE1LTAxLTA2ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAg ICBbVGV4TWFwXSBtX2xheWVyIG1lbWJlciBpbiBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlciBp cyBhbHdheXMgbm9uLW51bGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0MDEzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpsYXllcigpIG5vdyByZXR1cm5z IGEgcmVmZXJlbmNlLAorICAgICAgICBzbyB0aGUgY2FsbCBzaXRlcyBhcmUgdXBkYXRlZC4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6OmluaXRpYWxpemUpOgorICAgICAgICAo V2ViS2l0OjpMYXllclRyZWVIb3N0R3RrOjpsYXllckZsdXNoVGltZXJGaXJlZCk6CisgICAgICAg IChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6OmNvbXBvc2l0ZUxheWVyc1RvQ29udGV4dCk6CisK IDIwMTUtMDEtMDUgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGluc3BlY3RvciB2aWV3IHRvcCBpbnNldCBzaG91bGQgbm90IGluY2x1 ZGUgaGVpZ2h0IG9mIHdlYiB2aWV3IGJhbm5lcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXIuY3BwCmluZGV4IDkzNzNhOTBiMTliYWIzNWFjZTkzZTEzYTYxNWJjZWY2ODM3 MDg0ZmIuLjg2NWMzNWYyOGE5Zjc3NmVmN2RlMDUxMjVjZWMzZWQwZjE0NzBkMTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcApAQCAtNDAsNyArNDAsNiBAQCBz dGQ6OnVuaXF1ZV9wdHI8R3JhcGhpY3NMYXllcj4gR3JhcGhpY3NMYXllcjo6Y3JlYXRlKEdyYXBo aWNzTGF5ZXJGYWN0b3J5KiBmYWN0bwogCiBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6R3Jh cGhpY3NMYXllclRleHR1cmVNYXBwZXIoR3JhcGhpY3NMYXllckNsaWVudCYgY2xpZW50KQogICAg IDogR3JhcGhpY3NMYXllcihjbGllbnQpCi0gICAgLCBtX2xheWVyKHN0ZDo6bWFrZV91bmlxdWU8 VGV4dHVyZU1hcHBlckxheWVyPigpKQogICAgICwgbV9jb21wb3NpdGVkTmF0aXZlSW1hZ2VQdHIo MCkKICAgICAsIG1fY2hhbmdlTWFzayhOb0NoYW5nZXMpCiAgICAgLCBtX25lZWRzRGlzcGxheShm YWxzZSkKQEAgLTM2OCw3ICszNjcsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy OjpmbHVzaENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCkKIHsKICAgICBwcmVwYXJl QmFja2luZ1N0b3JlSWZOZWVkZWQoKTsKICAgICBjb21taXRMYXllckNoYW5nZXMoKTsKLSAgICBt X2xheWVyLT5zeW5jQW5pbWF0aW9ucygpOworICAgIG1fbGF5ZXIuc3luY0FuaW1hdGlvbnMoKTsK ICAgICB1cGRhdGVCYWNraW5nU3RvcmVJZk5lZWRlZCgpOwogfQogCkBAIC00MTMsNyArNDEyLDcg QEAgc3RhdGljIHZvaWQgdG9UZXh0dXJlTWFwcGVyTGF5ZXJWZWN0b3IoY29uc3QgVmVjdG9yPEdy YXBoaWNzTGF5ZXIqPiYgbGF5ZXJzLCBWZWMKIHsKICAgICB0ZXhtYXBMYXllcnMucmVzZXJ2ZUNh cGFjaXR5KGxheWVycy5zaXplKCkpOwogICAgIGZvciAoYXV0byogbGF5ZXIgOiBsYXllcnMpCi0g ICAgICAgIHRleG1hcExheWVycy5hcHBlbmQoZG93bmNhc3Q8R3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXI+KGxheWVyKS0+bGF5ZXIoKSk7CisgICAgICAgIHRleG1hcExheWVycy5hcHBlbmQoJmRv d25jYXN0PEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyPihsYXllciktPmxheWVyKCkpOwogfQog CiB2b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpjb21taXRMYXllckNoYW5nZXMoKQpA QCAtNDI0LDkzICs0MjMsOTMgQEAgdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6Y29t bWl0TGF5ZXJDaGFuZ2VzKCkKICAgICBpZiAobV9jaGFuZ2VNYXNrICYgQ2hpbGRyZW5DaGFuZ2Up IHsKICAgICAgICAgVmVjdG9yPFRleHR1cmVNYXBwZXJMYXllcio+IHRleHR1cmVNYXBwZXJMYXll ckNoaWxkcmVuOwogICAgICAgICB0b1RleHR1cmVNYXBwZXJMYXllclZlY3RvcihjaGlsZHJlbigp LCB0ZXh0dXJlTWFwcGVyTGF5ZXJDaGlsZHJlbik7Ci0gICAgICAgIG1fbGF5ZXItPnNldENoaWxk cmVuKHRleHR1cmVNYXBwZXJMYXllckNoaWxkcmVuKTsKKyAgICAgICAgbV9sYXllci5zZXRDaGls ZHJlbih0ZXh0dXJlTWFwcGVyTGF5ZXJDaGlsZHJlbik7CiAgICAgfQogCiAgICAgaWYgKG1fY2hh bmdlTWFzayAmIE1hc2tMYXllckNoYW5nZSkKLSAgICAgICAgbV9sYXllci0+c2V0TWFza0xheWVy KGRvd25jYXN0PEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyPihtYXNrTGF5ZXIoKSktPmxheWVy KCkpOworICAgICAgICBtX2xheWVyLnNldE1hc2tMYXllcigmZG93bmNhc3Q8R3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXI+KG1hc2tMYXllcigpKS0+bGF5ZXIoKSk7CiAKICAgICBpZiAobV9jaGFu Z2VNYXNrICYgUmVwbGljYUxheWVyQ2hhbmdlKQotICAgICAgICBtX2xheWVyLT5zZXRSZXBsaWNh TGF5ZXIoZG93bmNhc3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+KHJlcGxpY2FMYXllcigp KS0+bGF5ZXIoKSk7CisgICAgICAgIG1fbGF5ZXIuc2V0UmVwbGljYUxheWVyKCZkb3duY2FzdDxH cmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcj4ocmVwbGljYUxheWVyKCkpLT5sYXllcigpKTsKIAog ICAgIGlmIChtX2NoYW5nZU1hc2sgJiBQb3NpdGlvbkNoYW5nZSkKLSAgICAgICAgbV9sYXllci0+ c2V0UG9zaXRpb24ocG9zaXRpb24oKSk7CisgICAgICAgIG1fbGF5ZXIuc2V0UG9zaXRpb24ocG9z aXRpb24oKSk7CiAKICAgICBpZiAobV9jaGFuZ2VNYXNrICYgQW5jaG9yUG9pbnRDaGFuZ2UpCi0g ICAgICAgIG1fbGF5ZXItPnNldEFuY2hvclBvaW50KGFuY2hvclBvaW50KCkpOworICAgICAgICBt X2xheWVyLnNldEFuY2hvclBvaW50KGFuY2hvclBvaW50KCkpOwogCiAgICAgaWYgKG1fY2hhbmdl TWFzayAmIFNpemVDaGFuZ2UpCi0gICAgICAgIG1fbGF5ZXItPnNldFNpemUoc2l6ZSgpKTsKKyAg ICAgICAgbV9sYXllci5zZXRTaXplKHNpemUoKSk7CiAKICAgICBpZiAobV9jaGFuZ2VNYXNrICYg VHJhbnNmb3JtQ2hhbmdlKQotICAgICAgICBtX2xheWVyLT5zZXRUcmFuc2Zvcm0odHJhbnNmb3Jt KCkpOworICAgICAgICBtX2xheWVyLnNldFRyYW5zZm9ybSh0cmFuc2Zvcm0oKSk7CiAKICAgICBp ZiAobV9jaGFuZ2VNYXNrICYgQ2hpbGRyZW5UcmFuc2Zvcm1DaGFuZ2UpCi0gICAgICAgIG1fbGF5 ZXItPnNldENoaWxkcmVuVHJhbnNmb3JtKGNoaWxkcmVuVHJhbnNmb3JtKCkpOworICAgICAgICBt X2xheWVyLnNldENoaWxkcmVuVHJhbnNmb3JtKGNoaWxkcmVuVHJhbnNmb3JtKCkpOwogCiAgICAg aWYgKG1fY2hhbmdlTWFzayAmIFByZXNlcnZlczNEQ2hhbmdlKQotICAgICAgICBtX2xheWVyLT5z ZXRQcmVzZXJ2ZXMzRChwcmVzZXJ2ZXMzRCgpKTsKKyAgICAgICAgbV9sYXllci5zZXRQcmVzZXJ2 ZXMzRChwcmVzZXJ2ZXMzRCgpKTsKIAogICAgIGlmIChtX2NoYW5nZU1hc2sgJiBDb250ZW50c1Jl Y3RDaGFuZ2UpCi0gICAgICAgIG1fbGF5ZXItPnNldENvbnRlbnRzUmVjdChjb250ZW50c1JlY3Qo KSk7CisgICAgICAgIG1fbGF5ZXIuc2V0Q29udGVudHNSZWN0KGNvbnRlbnRzUmVjdCgpKTsKIAog ICAgIGlmIChtX2NoYW5nZU1hc2sgJiBNYXNrc1RvQm91bmRzQ2hhbmdlKQotICAgICAgICBtX2xh eWVyLT5zZXRNYXNrc1RvQm91bmRzKG1hc2tzVG9Cb3VuZHMoKSk7CisgICAgICAgIG1fbGF5ZXIu c2V0TWFza3NUb0JvdW5kcyhtYXNrc1RvQm91bmRzKCkpOwogCiAgICAgaWYgKG1fY2hhbmdlTWFz ayAmIERyYXdzQ29udGVudENoYW5nZSkKLSAgICAgICAgbV9sYXllci0+c2V0RHJhd3NDb250ZW50 KGRyYXdzQ29udGVudCgpKTsKKyAgICAgICAgbV9sYXllci5zZXREcmF3c0NvbnRlbnQoZHJhd3ND b250ZW50KCkpOwogCiAgICAgaWYgKG1fY2hhbmdlTWFzayAmIENvbnRlbnRzVmlzaWJsZUNoYW5n ZSkKLSAgICAgICAgbV9sYXllci0+c2V0Q29udGVudHNWaXNpYmxlKGNvbnRlbnRzQXJlVmlzaWJs ZSgpKTsKKyAgICAgICAgbV9sYXllci5zZXRDb250ZW50c1Zpc2libGUoY29udGVudHNBcmVWaXNp YmxlKCkpOwogCiAgICAgaWYgKG1fY2hhbmdlTWFzayAmIENvbnRlbnRzT3BhcXVlQ2hhbmdlKQot ICAgICAgICBtX2xheWVyLT5zZXRDb250ZW50c09wYXF1ZShjb250ZW50c09wYXF1ZSgpKTsKKyAg ICAgICAgbV9sYXllci5zZXRDb250ZW50c09wYXF1ZShjb250ZW50c09wYXF1ZSgpKTsKIAogICAg IGlmIChtX2NoYW5nZU1hc2sgJiBCYWNrZmFjZVZpc2liaWxpdHlDaGFuZ2UpCi0gICAgICAgIG1f bGF5ZXItPnNldEJhY2tmYWNlVmlzaWJpbGl0eShiYWNrZmFjZVZpc2liaWxpdHkoKSk7CisgICAg ICAgIG1fbGF5ZXIuc2V0QmFja2ZhY2VWaXNpYmlsaXR5KGJhY2tmYWNlVmlzaWJpbGl0eSgpKTsK IAogICAgIGlmIChtX2NoYW5nZU1hc2sgJiBPcGFjaXR5Q2hhbmdlKQotICAgICAgICBtX2xheWVy LT5zZXRPcGFjaXR5KG9wYWNpdHkoKSk7CisgICAgICAgIG1fbGF5ZXIuc2V0T3BhY2l0eShvcGFj aXR5KCkpOwogCiAgICAgaWYgKG1fY2hhbmdlTWFzayAmIEJhY2tncm91bmRDb2xvckNoYW5nZSkK LSAgICAgICAgbV9sYXllci0+c2V0U29saWRDb2xvcihtX3NvbGlkQ29sb3IpOworICAgICAgICBt X2xheWVyLnNldFNvbGlkQ29sb3IobV9zb2xpZENvbG9yKTsKIAogICAgIGlmIChtX2NoYW5nZU1h c2sgJiBGaWx0ZXJDaGFuZ2UpCi0gICAgICAgIG1fbGF5ZXItPnNldEZpbHRlcnMoZmlsdGVycygp KTsKKyAgICAgICAgbV9sYXllci5zZXRGaWx0ZXJzKGZpbHRlcnMoKSk7CiAKICAgICBpZiAobV9j aGFuZ2VNYXNrICYgQmFja2luZ1N0b3JlQ2hhbmdlKQotICAgICAgICBtX2xheWVyLT5zZXRCYWNr aW5nU3RvcmUobV9iYWNraW5nU3RvcmUpOworICAgICAgICBtX2xheWVyLnNldEJhY2tpbmdTdG9y ZShtX2JhY2tpbmdTdG9yZSk7CiAKICAgICBpZiAobV9jaGFuZ2VNYXNrICYgRGVidWdWaXN1YWxz Q2hhbmdlKQotICAgICAgICBtX2xheWVyLT5zZXREZWJ1Z1Zpc3VhbHMoaXNTaG93aW5nRGVidWdC b3JkZXIoKSwgZGVidWdCb3JkZXJDb2xvcigpLCBkZWJ1Z0JvcmRlcldpZHRoKCksIGlzU2hvd2lu Z1JlcGFpbnRDb3VudGVyKCkpOworICAgICAgICBtX2xheWVyLnNldERlYnVnVmlzdWFscyhpc1No b3dpbmdEZWJ1Z0JvcmRlcigpLCBkZWJ1Z0JvcmRlckNvbG9yKCksIGRlYnVnQm9yZGVyV2lkdGgo KSwgaXNTaG93aW5nUmVwYWludENvdW50ZXIoKSk7CiAKICAgICBpZiAobV9jaGFuZ2VNYXNrICYg UmVwYWludENvdW50Q2hhbmdlKQotICAgICAgICBtX2xheWVyLT5zZXRSZXBhaW50Q291bnQocmVw YWludENvdW50KCkpOworICAgICAgICBtX2xheWVyLnNldFJlcGFpbnRDb3VudChyZXBhaW50Q291 bnQoKSk7CiAKICAgICBpZiAobV9jaGFuZ2VNYXNrICYgQ29udGVudENoYW5nZSkKLSAgICAgICAg bV9sYXllci0+c2V0Q29udGVudHNMYXllcihwbGF0Zm9ybUxheWVyKCkpOworICAgICAgICBtX2xh eWVyLnNldENvbnRlbnRzTGF5ZXIocGxhdGZvcm1MYXllcigpKTsKIAogICAgIGlmIChtX2NoYW5n ZU1hc2sgJiBBbmltYXRpb25DaGFuZ2UpCi0gICAgICAgIG1fbGF5ZXItPnNldEFuaW1hdGlvbnMo bV9hbmltYXRpb25zKTsKKyAgICAgICAgbV9sYXllci5zZXRBbmltYXRpb25zKG1fYW5pbWF0aW9u cyk7CiAKICAgICBpZiAobV9jaGFuZ2VNYXNrICYgQW5pbWF0aW9uU3RhcnRlZCkKICAgICAgICAg Y2xpZW50KCkubm90aWZ5QW5pbWF0aW9uU3RhcnRlZCh0aGlzLCAiIiwgbV9hbmltYXRpb25TdGFy dFRpbWUpOwogCiAgICAgaWYgKG1fY2hhbmdlTWFzayAmIEZpeGVkVG9WaWV3cG9yQ2hhbmdlKQot ICAgICAgICBtX2xheWVyLT5zZXRGaXhlZFRvVmlld3BvcnQoZml4ZWRUb1ZpZXdwb3J0KCkpOwor ICAgICAgICBtX2xheWVyLnNldEZpeGVkVG9WaWV3cG9ydChmaXhlZFRvVmlld3BvcnQoKSk7CiAK ICAgICBpZiAobV9jaGFuZ2VNYXNrICYgSXNTY3JvbGxhYmxlQ2hhbmdlKQotICAgICAgICBtX2xh eWVyLT5zZXRJc1Njcm9sbGFibGUoaXNTY3JvbGxhYmxlKCkpOworICAgICAgICBtX2xheWVyLnNl dElzU2Nyb2xsYWJsZShpc1Njcm9sbGFibGUoKSk7CiAKICAgICBpZiAobV9jaGFuZ2VNYXNrICYg Q29tbWl0dGVkU2Nyb2xsT2Zmc2V0Q2hhbmdlKQotICAgICAgICBtX2xheWVyLT5kaWRDb21taXRT Y3JvbGxPZmZzZXQobV9jb21taXR0ZWRTY3JvbGxPZmZzZXQpOworICAgICAgICBtX2xheWVyLmRp ZENvbW1pdFNjcm9sbE9mZnNldChtX2NvbW1pdHRlZFNjcm9sbE9mZnNldCk7CiAKICAgICBtX2No YW5nZU1hc2sgPSBOb0NoYW5nZXM7CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBw ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZShjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiB7Ci0gICAg aWYgKCFtX2xheWVyLT50ZXh0dXJlTWFwcGVyKCkpCisgICAgaWYgKCFtX2xheWVyLnRleHR1cmVN YXBwZXIoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZmx1c2hDb21wb3NpdGluZ1N0YXRlRm9y VGhpc0xheWVyT25seSgpOwpAQCAtNTI1LDcgKzUyNCw3IEBAIHZvaWQgR3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZShjb25zdCBGbG9hdFJlY3QmIHJlY3Qp CiAKIHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnVwZGF0ZUJhY2tpbmdTdG9yZUlm TmVlZGVkKCkKIHsKLSAgICBUZXh0dXJlTWFwcGVyKiB0ZXh0dXJlTWFwcGVyID0gbV9sYXllci0+ dGV4dHVyZU1hcHBlcigpOworICAgIFRleHR1cmVNYXBwZXIqIHRleHR1cmVNYXBwZXIgPSBtX2xh eWVyLnRleHR1cmVNYXBwZXIoKTsKICAgICBpZiAoIXRleHR1cmVNYXBwZXIpCiAgICAgICAgIHJl dHVybjsKIApAQCAtNTk4LDcgKzU5Nyw3IEBAIHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBw ZXI6OnJlbW92ZUFuaW1hdGlvbihjb25zdCBTdHJpbmcmIGFuaW1hdGlvbk5hbWUpCiAKIGJvb2wg R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldEZpbHRlcnMoY29uc3QgRmlsdGVyT3BlcmF0 aW9ucyYgZmlsdGVycykKIHsKLSAgICBUZXh0dXJlTWFwcGVyKiB0ZXh0dXJlTWFwcGVyID0gbV9s YXllci0+dGV4dHVyZU1hcHBlcigpOworICAgIFRleHR1cmVNYXBwZXIqIHRleHR1cmVNYXBwZXIg PSBtX2xheWVyLnRleHR1cmVNYXBwZXIoKTsKICAgICAvLyBUZXh0dXJlTWFwcGVySW1hZ2VCdWZm ZXIgZG9lcyBub3Qgc3VwcG9ydCBDU1MgZmlsdGVycy4KICAgICBpZiAoIXRleHR1cmVNYXBwZXIg fHwgdGV4dHVyZU1hcHBlci0+YWNjZWxlcmF0aW9uTW9kZSgpID09IFRleHR1cmVNYXBwZXI6OlNv ZnR3YXJlTW9kZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXIuaAppbmRleCBjNGFkOWUzMzdjOTRjM2Q2MjgxM2Q1NjY1MTUyMGE1MzFj Y2UyY2M2Li43ZjBhMjI2MzU5OWMxYzIxZTE2Yjc3Y2Y1ZTg5MDgwMzllOWFlYmYyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaApAQCAtMzcsOCArMzcsOCBAQCBwdWJs aWM6CiAgICAgZXhwbGljaXQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIoR3JhcGhpY3NMYXll ckNsaWVudCYpOwogICAgIHZpcnR1YWwgfkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyKCk7CiAK LSAgICB2b2lkIHNldFNjcm9sbENsaWVudChUZXh0dXJlTWFwcGVyTGF5ZXI6OlNjcm9sbGluZ0Ns aWVudCogY2xpZW50KSB7IG1fbGF5ZXItPnNldFNjcm9sbENsaWVudChjbGllbnQpOyB9Ci0gICAg dm9pZCBzZXRJRCh1aW50MzJfdCBpZCkgeyBtX2xheWVyLT5zZXRJRChpZCk7IH0KKyAgICB2b2lk IHNldFNjcm9sbENsaWVudChUZXh0dXJlTWFwcGVyTGF5ZXI6OlNjcm9sbGluZ0NsaWVudCogY2xp ZW50KSB7IG1fbGF5ZXIuc2V0U2Nyb2xsQ2xpZW50KGNsaWVudCk7IH0KKyAgICB2b2lkIHNldElE KHVpbnQzMl90IGlkKSB7IG1fbGF5ZXIuc2V0SUQoaWQpOyB9CiAKICAgICAvLyBHcmFwaGljc0xh eWVyCiAgICAgdmlydHVhbCBib29sIHNldENoaWxkcmVuKGNvbnN0IFZlY3RvcjxHcmFwaGljc0xh eWVyKj4mKSBvdmVycmlkZTsKQEAgLTg2LDcgKzg2LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCBmbHVzaENvbXBvc2l0aW5nU3RhdGUoY29uc3QgRmxvYXRSZWN0Jikgb3ZlcnJpZGU7CiAg ICAgdmlydHVhbCB2b2lkIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKSBv dmVycmlkZTsKIAotICAgIFRleHR1cmVNYXBwZXJMYXllciogbGF5ZXIoKSBjb25zdCB7IHJldHVy biBtX2xheWVyLmdldCgpOyB9CisgICAgVGV4dHVyZU1hcHBlckxheWVyJiBsYXllcigpIHsgcmV0 dXJuIG1fbGF5ZXI7IH0KIAogICAgIHZvaWQgZGlkQ29tbWl0U2Nyb2xsT2Zmc2V0KGNvbnN0IElu dFNpemUmKTsKICAgICB2b2lkIHNldElzU2Nyb2xsYWJsZShib29sKTsKQEAgLTE2MCw3ICsxNjAs NyBAQCBwcml2YXRlOgogICAgIH07CiAgICAgdm9pZCBub3RpZnlDaGFuZ2UoQ2hhbmdlTWFzayk7 CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8VGV4dHVyZU1hcHBlckxheWVyPiBtX2xheWVyOworICAg IFRleHR1cmVNYXBwZXJMYXllciBtX2xheWVyOwogICAgIFJlZlB0cjxUZXh0dXJlTWFwcGVyVGls ZWRCYWNraW5nU3RvcmU+IG1fY29tcG9zaXRlZEltYWdlOwogICAgIE5hdGl2ZUltYWdlUHRyIG1f Y29tcG9zaXRlZE5hdGl2ZUltYWdlUHRyOwogICAgIFJlZlB0cjxUZXh0dXJlTWFwcGVyQmFja2lu Z1N0b3JlPiBtX2JhY2tpbmdTdG9yZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dl YkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9X ZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmNw cAppbmRleCBiNjgwMTMyMzljZjcwNTY4MTdhZjBmZGFmMWFjMjE0Y2FiMTMwMWQzLi5jNzk4NzRl ZmIyN2MxZTdhMjhmNmFlODBmZTc3OWQ4NDAwYWM4NjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dC5jcHAK KysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQuY3BwCkBAIC0xMDUsNyArMTA1LDcgQEAgdm9pZCBBY2NlbGVyYXRlZENvbXBv c2l0aW5nQ29udGV4dDo6aW5pdGlhbGl6ZSgpCiAgICAgbV9jb250ZXh0LT5tYWtlQ29udGV4dEN1 cnJlbnQoKTsKIAogICAgIG1fdGV4dHVyZU1hcHBlciA9IFRleHR1cmVNYXBwZXJHTDo6Y3JlYXRl KFRleHR1cmVNYXBwZXI6Ok9wZW5HTE1vZGUpOwotICAgIGRvd25jYXN0PEdyYXBoaWNzTGF5ZXJU ZXh0dXJlTWFwcGVyPigqbV9yb290TGF5ZXIpLmxheWVyKCktPnNldFRleHR1cmVNYXBwZXIobV90 ZXh0dXJlTWFwcGVyLmdldCgpKTsKKyAgICBkb3duY2FzdDxHcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlcj4oKm1fcm9vdExheWVyKS5sYXllcigpLnNldFRleHR1cmVNYXBwZXIobV90ZXh0dXJlTWFw cGVyLmdldCgpKTsKIAogICAgIHNjaGVkdWxlTGF5ZXJGbHVzaCgpOwogfQpAQCAtMTQxLDEwICsx NDEsMTAgQEAgYm9vbCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6cHJlcGFyZUZvclJl bmRlcmluZygpCiAKIGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnN0YXJ0ZWRB bmltYXRpb24oV2ViQ29yZTo6R3JhcGhpY3NMYXllciogbGF5ZXIpCiB7Ci0gICAgaWYgKCFsYXll ciB8fCAhZG93bmNhc3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+KCpsYXllcikubGF5ZXIo KSkKKyAgICBpZiAoIWxheWVyKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4g ZG93bmNhc3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+KCpsYXllcikubGF5ZXIoKS0+ZGVz Y2VuZGFudHNPclNlbGZIYXZlUnVubmluZ0FuaW1hdGlvbnMoKTsKKyAgICByZXR1cm4gZG93bmNh c3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+KCpsYXllcikubGF5ZXIoKS5kZXNjZW5kYW50 c09yU2VsZkhhdmVSdW5uaW5nQW5pbWF0aW9ucygpOwogfQogCiB2b2lkIEFjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0Ojpjb21wb3NpdGVMYXllcnNUb0NvbnRleHQoQ29tcG9zaXRlUHVycG9z ZSBwdXJwb3NlKQpAQCAtMTY1LDcgKzE2NSw3IEBAIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0NvbnRleHQ6OmNvbXBvc2l0ZUxheWVyc1RvQ29udGV4dChDb21wb3NpdGVQdXJwb3NlIHB1CiAg ICAgfQogCiAgICAgbV90ZXh0dXJlTWFwcGVyLT5iZWdpblBhaW50aW5nKCk7Ci0gICAgZG93bmNh c3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+KCptX3Jvb3RMYXllcikubGF5ZXIoKS0+cGFp bnQoKTsKKyAgICBkb3duY2FzdDxHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcj4oKm1fcm9vdExh eWVyKS5sYXllcigpLnBhaW50KCk7CiAgICAgbV9mcHNDb3VudGVyLnVwZGF0ZUZQU0FuZERpc3Bs YXkobV90ZXh0dXJlTWFwcGVyLmdldCgpKTsKICAgICBtX3RleHR1cmVNYXBwZXItPmVuZFBhaW50 aW5nKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9n dGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwCmluZGV4IGI2MmRlMTNjMjkwMjI4YmJlNWMyN2Yw OWQyNThiYmYwOTdhNDM1MjAuLmE2MDI4NDI1YjZjYWU0MDQ0N2E0NDQ0YjI5ZmZhMTkwOTM4MWU2 MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5 ZXJUcmVlSG9zdEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2d0ay9MYXllclRyZWVIb3N0R3RrLmNwcApAQCAtMTIzLDcgKzEyMyw3IEBAIHZvaWQgTGF5ZXJU cmVlSG9zdEd0azo6aW5pdGlhbGl6ZSgpCiAKICAgICBtX3RleHR1cmVNYXBwZXIgPSBUZXh0dXJl TWFwcGVyOjpjcmVhdGUoVGV4dHVyZU1hcHBlcjo6T3BlbkdMTW9kZSk7CiAgICAgc3RhdGljX2Nh c3Q8VGV4dHVyZU1hcHBlckdMKj4obV90ZXh0dXJlTWFwcGVyLmdldCgpKS0+c2V0RW5hYmxlRWRn ZURpc3RhbmNlQW50aWFsaWFzaW5nKHRydWUpOwotICAgIGRvd25jYXN0PEdyYXBoaWNzTGF5ZXJU ZXh0dXJlTWFwcGVyPigqbV9yb290TGF5ZXIpLmxheWVyKCktPnNldFRleHR1cmVNYXBwZXIobV90 ZXh0dXJlTWFwcGVyLmdldCgpKTsKKyAgICBkb3duY2FzdDxHcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlcj4oKm1fcm9vdExheWVyKS5sYXllcigpLnNldFRleHR1cmVNYXBwZXIobV90ZXh0dXJlTWFw cGVyLmdldCgpKTsKIAogICAgIC8vIEZJWE1FOiBDcmV0YWUgcGFnZSBvbHZlcmxheSBsYXllcnMu IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE0MzMuCiAKQEAgLTI2 OCw3ICsyNjgsNyBAQCB2b2lkIExheWVyVHJlZUhvc3RHdGs6OmxheWVyRmx1c2hUaW1lckZpcmVk KCkKIHsKICAgICBkb3VibGUgZmlyZVRpbWUgPSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUo KTsKICAgICBmbHVzaEFuZFJlbmRlckxheWVycygpOwotICAgIGlmIChtX2xheWVyRmx1c2hUaW1l ckNhbGxiYWNrLmlzU2NoZWR1bGVkKCkgfHwgIWRvd25jYXN0PEdyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyPigqbV9yb290TGF5ZXIpLmxheWVyKCktPmRlc2NlbmRhbnRzT3JTZWxmSGF2ZVJ1bm5p bmdBbmltYXRpb25zKCkpCisgICAgaWYgKG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2suaXNTY2hl ZHVsZWQoKSB8fCAhZG93bmNhc3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+KCptX3Jvb3RM YXllcikubGF5ZXIoKS5kZXNjZW5kYW50c09yU2VsZkhhdmVSdW5uaW5nQW5pbWF0aW9ucygpKQog ICAgICAgICByZXR1cm47CiAKICAgICBzdGF0aWMgY29uc3QgZG91YmxlIHRhcmdldEZyYW1lcmF0 ZSA9IDEgLyA2MC4wOwpAQCAtMzIxLDcgKzMyMSw3IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6 Y29tcG9zaXRlTGF5ZXJzVG9Db250ZXh0KENvbXBvc2l0ZVB1cnBvc2UgcHVycG9zZSkKICAgICB9 CiAKICAgICBtX3RleHR1cmVNYXBwZXItPmJlZ2luUGFpbnRpbmcoKTsKLSAgICBkb3duY2FzdDxH cmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcj4oKm1fcm9vdExheWVyKS5sYXllcigpLT5wYWludCgp OworICAgIGRvd25jYXN0PEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyPigqbV9yb290TGF5ZXIp LmxheWVyKCkucGFpbnQoKTsKICAgICBtX3RleHR1cmVNYXBwZXItPmVuZFBhaW50aW5nKCk7CiAK ICAgICBjb250ZXh0LT5zd2FwQnVmZmVycygpOwo=