137957 2014-10-22 06:51:37 -0700 [TexMap] Clean up virtual method declarations in GraphicsLayerTextureMapper 2014-10-23 04:17:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan cmarcelo commit-queue gyuyoung.kim kondapallykalyan luiz mrobinson noam oldest_to_newest 1043437 0 zan 2014-10-22 06:51:37 -0700 [TexMap] Clean up virtual method declarations in GraphicsLayerTextureMapper 1043438 1 240271 zan 2014-10-22 06:58:17 -0700 Created attachment 240271 Patch 1043442 2 240271 mrobinson 2014-10-22 07:51:03 -0700 Comment on attachment 240271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240271&action=review > Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h:35 > +class GraphicsLayerTextureMapper final : public GraphicsLayer, TextureMapperPlatformLayer::Client { Why is TextureMapperPlatformLayer::Client no longer public here? 1043453 3 240271 zan 2014-10-22 08:41:43 -0700 Comment on attachment 240271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240271&action=review >> Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h:35 >> +class GraphicsLayerTextureMapper final : public GraphicsLayer, TextureMapperPlatformLayer::Client { > > Why is TextureMapperPlatformLayer::Client no longer public here? There's no need for that -- there are no member variables that we would need access to (or at all) in that class, and the overriding methods in GraphicsLayerTextureMapper are also private. 1043454 4 mrobinson 2014-10-22 08:44:03 -0700 (In reply to comment #3) > Comment on attachment 240271 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240271&action=review > > >> Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h:35 > >> +class GraphicsLayerTextureMapper final : public GraphicsLayer, TextureMapperPlatformLayer::Client { > > > > Why is TextureMapperPlatformLayer::Client no longer public here? > > There's no need for that -- there are no member variables that we would need > access to (or at all) in that class, and the overriding methods in > GraphicsLayerTextureMapper are also private. Is it common in WebKit to use private inheritance? 1043456 5 240271 zan 2014-10-22 09:03:40 -0700 Comment on attachment 240271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240271&action=review >>>> Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h:35 >>>> +class GraphicsLayerTextureMapper final : public GraphicsLayer, TextureMapperPlatformLayer::Client { >>> >>> Why is TextureMapperPlatformLayer::Client no longer public here? >> >> There's no need for that -- there are no member variables that we would need access to (or at all) in that class, and the overriding methods in GraphicsLayerTextureMapper are also private. > > Is it common in WebKit to use private inheritance? I count 8 cases in WebCore, 14 in WebKit2. Not the most common pattern, but not shunned either. 1043742 6 240271 zan 2014-10-23 04:17:36 -0700 Comment on attachment 240271 Patch Clearing flags on attachment: 240271 Committed r175116: <http://trac.webkit.org/changeset/175116> 1043743 7 zan 2014-10-23 04:17:45 -0700 All reviewed patches have been landed. Closing bug. 240271 2014-10-22 06:58:17 -0700 2014-10-23 04:17:36 -0700 Patch bug-137957-20141022065852.patch text/plain 10499 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThlMDk0MWI2YmE5YTg5 OTkyNDdjNGYwOTc2MzZkNTk5MTBhY2MyNi4uODYyMWY0N2IzZWY2MzZhNjMxZDFhZWFiZTAzNGMx MTRhMWNhNjcwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTEwLTIyICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbVGV4TWFwXSBDbGVh biB1cCB2aXJ0dWFsIG1ldGhvZCBkZWNsYXJhdGlvbnMgaW4gR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz Nzk1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZGVkIG92ZXJyaWRlIG5vdGF0aW9uIHRvIHRoZSBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlciBt ZXRob2RzIHRoYXQgYXJlCisgICAgICAgIG92ZXJyaWRpbmcgdGhlIGJhc2UgbWV0aG9kcyBmcm9t IHRoZSBHcmFwaGljc0xheWVyIGNsYXNzIGFuZCBkb24ndCBoYXZlIGl0IHlldC4KKyAgICAgICAg QWxzbyByZW9yZGVyZWQgdGhlc2UgbWV0aG9kcyB0byBmb2xsb3cgdGhlIG9yZGVyIG9mIGRlY2xh cmF0aW9uIGluIHRoZQorICAgICAgICBHcmFwaGljc0xheWVyIGNsYXNzLgorCisgICAgICAgIFJl bW92ZWQgOjpzZXROYW1lKCkgYW5kIDo6d2lsbEJlRGVzdHJveWVkKCkgbWV0aG9kcyBzaW5jZSB0 aGV5IGp1c3QgY2FsbGVkCisgICAgICAgIHRoZSBiYXNlIGNsYXNzJyBtZXRob2RzLgorCisgICAg ICAgIEFsc28gcmVtb3ZlZCB0aGUgOjpzb2xpZENvbG9yKCkgYW5kIDo6Y2hhbmdlTWFzaygpIG1l dGhvZHMuIFRoZSBmaXJzdCBvbmUgd2FzCisgICAgICAgIG9ubHkgY2FsbGVkIGluIG9uZSBwbGFj ZSB3aGljaCBjYW4gcmVmZXJlbmNlIHRoZSBtX3NvbGlkQ29sb3IgbWVtYmVyIGRpcmVjdGx5LAor ICAgICAgICBhbmQgdGhlIHNlY29uZCBvbmUgd2Fzbid0IHVzZWQgYXQgYWxsLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpjb21taXRM YXllckNoYW5nZXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclRleHR1cmVNYXBw ZXI6OnNldE5hbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXI6OndpbGxCZURlc3Ryb3llZCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmg6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c29saWRDb2xvcik6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6dXNlc0Nv bnRlbnRzTGF5ZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXI6OnBsYXRmb3JtTGF5ZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OmNoYW5nZU1hc2spOiBEZWxldGVkLgorCiAyMDE0 LTEwLTIxICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmUgbW9y ZSBpT1MgYnVpbGQgZml4IGFmdGVyIHIxNzUwMTMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJU ZXh0dXJlTWFwcGVyLmNwcAppbmRleCBjZWU1ZDI2ZGI2MjIzMjdmOGI4NDA1ODdjYjczOWYyZDJi NDZkZmI3Li40MjQ2YmJmNTgwNTdjMDQ4MTM1NWI0MzFlZTI4Yzk0ZTU1NGFmNmZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTY3LDExICs2Nyw2IEBA IHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6Om5vdGlmeUNoYW5nZShDaGFuZ2VNYXNr IGNoYW5nZU1hc2spCiAgICAgICAgIGNsaWVudCgpLm5vdGlmeUZsdXNoUmVxdWlyZWQodGhpcyk7 CiB9CiAKLXZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldE5hbWUoY29uc3QgU3Ry aW5nJiBuYW1lKQotewotICAgIEdyYXBoaWNzTGF5ZXI6OnNldE5hbWUobmFtZSk7Ci19Ci0KIEdy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjp+R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIoKQog ewogICAgIGlmIChtX2NvbnRlbnRzTGF5ZXIpCkBAIC04MCwxMSArNzUsNiBAQCBHcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlcjo6fkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyKCkKICAgICB3aWxs QmVEZXN0cm95ZWQoKTsKIH0KIAotdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6d2ls bEJlRGVzdHJveWVkKCkKLXsKLSAgICBHcmFwaGljc0xheWVyOjp3aWxsQmVEZXN0cm95ZWQoKTsK LX0KLQogdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0TmVlZHNEaXNwbGF5KCkK IHsKICAgICBpZiAoIWRyYXdzQ29udGVudCgpKQpAQCAtNDg5LDcgKzQ3OSw3IEBAIHZvaWQgR3Jh cGhpY3NMYXllclRleHR1cmVNYXBwZXI6OmNvbW1pdExheWVyQ2hhbmdlcygpCiAgICAgICAgIG1f bGF5ZXItPnNldE9wYWNpdHkob3BhY2l0eSgpKTsKIAogICAgIGlmIChtX2NoYW5nZU1hc2sgJiBC YWNrZ3JvdW5kQ29sb3JDaGFuZ2UpCi0gICAgICAgIG1fbGF5ZXItPnNldFNvbGlkQ29sb3Ioc29s aWRDb2xvcigpKTsKKyAgICAgICAgbV9sYXllci0+c2V0U29saWRDb2xvcihtX3NvbGlkQ29sb3Ip OwogCiAgICAgaWYgKG1fY2hhbmdlTWFzayAmIEZpbHRlckNoYW5nZSkKICAgICAgICAgbV9sYXll ci0+c2V0RmlsdGVycyhmaWx0ZXJzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIuaAppbmRleCA5MDBmOTIwYjMyOGJkNWMzMTMyN2Y3NjYwOGJiMDQ5N2Y2YmIyMjI5Li4y ZDJiNWNmY2Y2NGJhYjYxMjdjOTQyMTlmMzZlYTViNDRkNjIxNzJlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3Jh cGhpY3NMYXllclRleHR1cmVNYXBwZXIuaApAQCAtMzIsNyArMzIsNyBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKLWNsYXNzIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyIDogcHVibGljIEdy YXBoaWNzTGF5ZXIsIHB1YmxpYyBUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllcjo6Q2xpZW50IHsK K2NsYXNzIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyIGZpbmFsIDogcHVibGljIEdyYXBoaWNz TGF5ZXIsIFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyOjpDbGllbnQgewogcHVibGljOgogICAg IGV4cGxpY2l0IEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyKEdyYXBoaWNzTGF5ZXJDbGllbnQm KTsKICAgICB2aXJ0dWFsIH5HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcigpOwpAQCAtNDAsNTAg KzQwLDUxIEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFNjcm9sbENsaWVudChUZXh0dXJlTWFwcGVy TGF5ZXI6OlNjcm9sbGluZ0NsaWVudCogY2xpZW50KSB7IG1fbGF5ZXItPnNldFNjcm9sbENsaWVu dChjbGllbnQpOyB9CiAgICAgdm9pZCBzZXRJRCh1aW50MzJfdCBpZCkgeyBtX2xheWVyLT5zZXRJ RChpZCk7IH0KIAotICAgIC8vIHJlaW1wcyBmcm9tIEdyYXBoaWNzTGF5ZXIuaAotICAgIHZpcnR1 YWwgdm9pZCBzZXROZWVkc0Rpc3BsYXkoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNO ZWVkc0Rpc3BsYXkoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNEaXNwbGF5SW5SZWN0KGNv bnN0IEZsb2F0UmVjdCYsIFNob3VsZENsaXBUb0xheWVyID0gQ2xpcFRvTGF5ZXIpOwotICAgIHZp cnR1YWwgYm9vbCBzZXRDaGlsZHJlbihjb25zdCBWZWN0b3I8R3JhcGhpY3NMYXllcio+Jik7Ci0g ICAgdmlydHVhbCB2b2lkIGFkZENoaWxkKEdyYXBoaWNzTGF5ZXIqKTsKLSAgICB2aXJ0dWFsIHZv aWQgYWRkQ2hpbGRBdEluZGV4KEdyYXBoaWNzTGF5ZXIqLCBpbnQgaW5kZXgpOwotICAgIHZpcnR1 YWwgdm9pZCBhZGRDaGlsZEFib3ZlKEdyYXBoaWNzTGF5ZXIqIGxheWVyLCBHcmFwaGljc0xheWVy KiBzaWJsaW5nKTsKLSAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRCZWxvdyhHcmFwaGljc0xheWVy KiBsYXllciwgR3JhcGhpY3NMYXllciogc2libGluZyk7Ci0gICAgdmlydHVhbCBib29sIHJlcGxh Y2VDaGlsZChHcmFwaGljc0xheWVyKiBvbGRDaGlsZCwgR3JhcGhpY3NMYXllciogbmV3Q2hpbGQp OwotICAgIHZpcnR1YWwgdm9pZCBzZXRNYXNrTGF5ZXIoR3JhcGhpY3NMYXllciogbGF5ZXIpOwot ICAgIHZpcnR1YWwgdm9pZCBzZXRQb3NpdGlvbihjb25zdCBGbG9hdFBvaW50JiBwKTsKLSAgICB2 aXJ0dWFsIHZvaWQgc2V0QW5jaG9yUG9pbnQoY29uc3QgRmxvYXRQb2ludDNEJiBwKTsKLSAgICB2 aXJ0dWFsIHZvaWQgc2V0U2l6ZShjb25zdCBGbG9hdFNpemUmIHNpemUpOwotICAgIHZpcnR1YWwg dm9pZCBzZXRUcmFuc2Zvcm0oY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHQpOwotICAgIHZp cnR1YWwgdm9pZCBzZXRDaGlsZHJlblRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJp eCYgdCk7Ci0gICAgdmlydHVhbCB2b2lkIHNldFByZXNlcnZlczNEKGJvb2wgYik7Ci0gICAgdmly dHVhbCB2b2lkIHNldE1hc2tzVG9Cb3VuZHMoYm9vbCBiKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0 RHJhd3NDb250ZW50KGJvb2wgYik7Ci0gICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVmlzaWJs ZShib29sKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNPcGFxdWUoYm9vbCBiKTsKLSAg ICB2aXJ0dWFsIHZvaWQgc2V0QmFja2ZhY2VWaXNpYmlsaXR5KGJvb2wgYik7Ci0gICAgdmlydHVh bCB2b2lkIHNldE9wYWNpdHkoZmxvYXQgb3BhY2l0eSk7Ci0gICAgdmlydHVhbCB2b2lkIHNldENv bnRlbnRzUmVjdChjb25zdCBGbG9hdFJlY3QmKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0UmVwbGlj YXRlZEJ5TGF5ZXIoR3JhcGhpY3NMYXllciopOwotICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50 c1RvSW1hZ2UoSW1hZ2UqKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNUb1NvbGlkQ29s b3IoY29uc3QgQ29sb3ImKTsKLSAgICBDb2xvciBzb2xpZENvbG9yKCkgY29uc3QgeyByZXR1cm4g bV9zb2xpZENvbG9yOyB9Ci0gICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVG9QbGF0Zm9ybUxh eWVyKFBsYXRmb3JtTGF5ZXIqLCBDb250ZW50c0xheWVyUHVycG9zZSk7CisgICAgLy8gR3JhcGhp Y3NMYXllcgorICAgIHZpcnR1YWwgYm9vbCBzZXRDaGlsZHJlbihjb25zdCBWZWN0b3I8R3JhcGhp Y3NMYXllcio+Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGFkZENoaWxkKEdyYXBoaWNz TGF5ZXIqKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRBdEluZGV4KEdyYXBo aWNzTGF5ZXIqLCBpbnQgaW5kZXgpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBhZGRDaGls ZEFib3ZlKEdyYXBoaWNzTGF5ZXIqLCBHcmFwaGljc0xheWVyKiBzaWJsaW5nKSBvdmVycmlkZTsK KyAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRCZWxvdyhHcmFwaGljc0xheWVyKiwgR3JhcGhpY3NM YXllciogc2libGluZykgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIHJlcGxhY2VDaGlsZChH cmFwaGljc0xheWVyKiBvbGRDaGlsZCwgR3JhcGhpY3NMYXllciogbmV3Q2hpbGQpIG92ZXJyaWRl OworCisgICAgdmlydHVhbCB2b2lkIHNldE1hc2tMYXllcihHcmFwaGljc0xheWVyKikgb3ZlcnJp ZGU7CisgICAgdmlydHVhbCB2b2lkIHNldFJlcGxpY2F0ZWRCeUxheWVyKEdyYXBoaWNzTGF5ZXIq KSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UG9zaXRpb24oY29uc3QgRmxvYXRQb2lu dCYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBzZXRBbmNob3JQb2ludChjb25zdCBGbG9h dFBvaW50M0QmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2l6ZShjb25zdCBGbG9h dFNpemUmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0VHJhbnNmb3JtKGNvbnN0IFRy YW5zZm9ybWF0aW9uTWF0cml4Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHNldENoaWxk cmVuVHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4Jikgb3ZlcnJpZGU7CisgICAg dmlydHVhbCB2b2lkIHNldFByZXNlcnZlczNEKGJvb2wpIG92ZXJyaWRlOworICAgIHZpcnR1YWwg dm9pZCBzZXRNYXNrc1RvQm91bmRzKGJvb2wpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBz ZXREcmF3c0NvbnRlbnQoYm9vbCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHNldENvbnRl bnRzVmlzaWJsZShib29sKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNP cGFxdWUoYm9vbCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHNldEJhY2tmYWNlVmlzaWJp bGl0eShib29sKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0T3BhY2l0eShmbG9hdCkg b3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIHNldEZpbHRlcnMoY29uc3QgRmlsdGVyT3BlcmF0 aW9ucyYpIG92ZXJyaWRlOworCisgICAgdmlydHVhbCB2b2lkIHNldE5lZWRzRGlzcGxheSgpIG92 ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBzZXROZWVkc0Rpc3BsYXlJblJlY3QoY29uc3QgRmxv YXRSZWN0JiwgU2hvdWxkQ2xpcFRvTGF5ZXIgPSBDbGlwVG9MYXllcikgb3ZlcnJpZGU7CisgICAg dmlydHVhbCB2b2lkIHNldENvbnRlbnRzTmVlZHNEaXNwbGF5KCkgb3ZlcnJpZGU7CisgICAgdmly dHVhbCB2b2lkIHNldENvbnRlbnRzUmVjdChjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlkZTsKKwor ICAgIHZpcnR1YWwgYm9vbCBhZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmLCBj b25zdCBGbG9hdFNpemUmLCBjb25zdCBBbmltYXRpb24qLCBjb25zdCBTdHJpbmcmLCBkb3VibGUp IG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBwYXVzZUFuaW1hdGlvbihjb25zdCBTdHJpbmcm LCBkb3VibGUpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCByZW1vdmVBbmltYXRpb24oY29u c3QgU3RyaW5nJikgb3ZlcnJpZGU7CisKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNUb0lt YWdlKEltYWdlKikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVG9Tb2xp ZENvbG9yKGNvbnN0IENvbG9yJikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHNldENvbnRl bnRzVG9QbGF0Zm9ybUxheWVyKFBsYXRmb3JtTGF5ZXIqLCBDb250ZW50c0xheWVyUHVycG9zZSkg b3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIHVzZXNDb250ZW50c0xheWVyKCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gbV9jb250ZW50c0xheWVyOyB9CisgICAgdmlydHVhbCBQbGF0Zm9ybUxh eWVyKiBwbGF0Zm9ybUxheWVyKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9jb250ZW50c0xh eWVyOyB9CisKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd0RlYnVnQm9yZGVyKGJvb2wpIG92ZXJy aWRlOwogICAgIHZpcnR1YWwgdm9pZCBzZXREZWJ1Z0JvcmRlcihjb25zdCBDb2xvciYsIGZsb2F0 IHdpZHRoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd1JlcGFpbnRDb3VudGVy KGJvb2wpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBmbHVzaENvbXBvc2l0aW5nU3RhdGUo Y29uc3QgRmxvYXRSZWN0Jik7Ci0gICAgdmlydHVhbCB2b2lkIGZsdXNoQ29tcG9zaXRpbmdTdGF0 ZUZvclRoaXNMYXllck9ubHkoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0TmFtZShjb25zdCBTdHJp bmcmIG5hbWUpOwotICAgIHZpcnR1YWwgYm9vbCB1c2VzQ29udGVudHNMYXllcigpIGNvbnN0IHsg cmV0dXJuIG1fY29udGVudHNMYXllcjsgfQotICAgIHZpcnR1YWwgUGxhdGZvcm1MYXllciogcGxh dGZvcm1MYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudHNMYXllcjsgfQotCi0gICAgaW5s aW5lIGludCBjaGFuZ2VNYXNrKCkgY29uc3QgeyByZXR1cm4gbV9jaGFuZ2VNYXNrOyB9CiAKLSAg ICB2aXJ0dWFsIGJvb2wgYWRkQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiwgY29u c3QgRmxvYXRTaXplJiwgY29uc3QgQW5pbWF0aW9uKiwgY29uc3QgU3RyaW5nJiwgZG91YmxlKTsK LSAgICB2aXJ0dWFsIHZvaWQgcGF1c2VBbmltYXRpb24oY29uc3QgU3RyaW5nJiwgZG91YmxlKTsK LSAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlQW5pbWF0aW9uKGNvbnN0IFN0cmluZyYpOwotICAgIHZv aWQgc2V0QW5pbWF0aW9ucyhjb25zdCBHcmFwaGljc0xheWVyQW5pbWF0aW9ucyYpOworICAgIHZp cnR1YWwgdm9pZCBmbHVzaENvbXBvc2l0aW5nU3RhdGUoY29uc3QgRmxvYXRSZWN0Jikgb3ZlcnJp ZGU7CisgICAgdmlydHVhbCB2b2lkIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9u bHkoKSBvdmVycmlkZTsKIAogICAgIFRleHR1cmVNYXBwZXJMYXllciogbGF5ZXIoKSBjb25zdCB7 IHJldHVybiBtX2xheWVyLmdldCgpOyB9CiAKQEAgLTkxLDggKzkyLDYgQEAgcHVibGljOgogICAg IHZvaWQgc2V0SXNTY3JvbGxhYmxlKGJvb2wpOwogICAgIGJvb2wgaXNTY3JvbGxhYmxlKCkgY29u c3QgeyByZXR1cm4gbV9pc1Njcm9sbGFibGU7IH0KIAotICAgIHZpcnR1YWwgYm9vbCBzZXRGaWx0 ZXJzKGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmKTsKLQogICAgIHZvaWQgc2V0Rml4ZWRUb1ZpZXdw b3J0KGJvb2wpOwogICAgIGJvb2wgZml4ZWRUb1ZpZXdwb3J0KCkgY29uc3QgeyByZXR1cm4gbV9m aXhlZFRvVmlld3BvcnQ7IH0KIApAQCAtMTAwLDEwICs5OSwxNCBAQCBwdWJsaWM6CiAgICAgZmxv YXQgZGVidWdCb3JkZXJXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fZGVidWdCb3JkZXJXaWR0aDsg fQogICAgIHZvaWQgc2V0UmVwYWludENvdW50KGludCk7CiAKKyAgICB2b2lkIHNldEFuaW1hdGlv bnMoY29uc3QgR3JhcGhpY3NMYXllckFuaW1hdGlvbnMmKTsKICAgICBib29sIHN0YXJ0ZWRBbmlt YXRpb24oKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0ZWRBbmltYXRpb247IH0KIAogcHJpdmF0ZToK LSAgICB2aXJ0dWFsIHZvaWQgd2lsbEJlRGVzdHJveWVkKCk7CisKKyAgICAvLyBUZXh0dXJlTWFw cGVyUGxhdGZvcm1MYXllcjo6Q2xpZW50CisgICAgdmlydHVhbCB2b2lkIHBsYXRmb3JtTGF5ZXJX aWxsQmVEZXN0cm95ZWQoKSBvdmVycmlkZSB7IHNldENvbnRlbnRzVG9QbGF0Zm9ybUxheWVyKDAs IE5vQ29udGVudHNMYXllcik7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0UGxhdGZvcm1MYXllck5l ZWRzRGlzcGxheSgpIG92ZXJyaWRlIHsgc2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKTsgfQogCiAg ICAgdm9pZCBjb21taXRMYXllckNoYW5nZXMoKTsKICAgICB2b2lkIHVwZGF0ZURlYnVnQm9yZGVy QW5kUmVwYWludENvdW50KCk7CkBAIC0xMTEsOSArMTE0LDYgQEAgcHJpdmF0ZToKICAgICB2b2lk IHByZXBhcmVCYWNraW5nU3RvcmVJZk5lZWRlZCgpOwogICAgIGJvb2wgc2hvdWxkSGF2ZUJhY2tp bmdTdG9yZSgpIGNvbnN0OwogCi0gICAgdmlydHVhbCB2b2lkIHBsYXRmb3JtTGF5ZXJXaWxsQmVE ZXN0cm95ZWQoKSBvdmVycmlkZSB7IHNldENvbnRlbnRzVG9QbGF0Zm9ybUxheWVyKDAsIE5vQ29u dGVudHNMYXllcik7IH0KLSAgICB2aXJ0dWFsIHZvaWQgc2V0UGxhdGZvcm1MYXllck5lZWRzRGlz cGxheSgpIG92ZXJyaWRlIHsgc2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKTsgfQotCiAgICAgLy8g VGhpcyBzZXQgb2YgZmxhZ3MgaGVscCB1cyBkZWZlciB3aGljaCBwcm9wZXJ0aWVzIG9mIHRoZSBs YXllciBoYXZlIGJlZW4KICAgICAvLyBtb2RpZmllZCBieSB0aGUgY29tcG9zaXRvciwgc28gd2Ug Y2FuIGtub3cgd2hhdCB0byBsb29rIGZvciBpbiB0aGUgbmV4dCBmbHVzaC4KICAgICBlbnVtIENo YW5nZU1hc2sgewo=